PHP Linting Tweaks

PHP syntax checking was being weird so I spent some time to make some
corrections. The problem was I was just using the wrong protocal, PEAR
when I've been coding to the PSR12 standard. Easy fix.
pull/84/head
Ro 2 years ago
parent 77eb8dd1a8
commit 7890715ea6
No known key found for this signature in database
GPG Key ID: FF5888875DC19043

@ -1,6 +1,8 @@
<?php <?php
return (new PhpCsFixer\Config()) $config = new PhpCsFixer\Config();
return $config
->setRiskyAllowed(true)
->setRules([ ->setRules([
'@PSR12' => true, '@PSR12' => true,
'array_indentation' => true, 'array_indentation' => true,
@ -20,7 +22,7 @@ return (new PhpCsFixer\Config())
'multiline_whitespace_before_semicolons' => [ 'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line', 'strategy' => 'no_multi_line',
], ],
'single_quote' => true, 'single_quote' => false,
'binary_operator_spaces' => [ 'binary_operator_spaces' => [
'default' => 'single_space', 'default' => 'single_space',
@ -50,7 +52,6 @@ return (new PhpCsFixer\Config())
'extra', 'extra',
'parenthesis_brace_block', 'parenthesis_brace_block',
'throw', 'throw',
] ]
], ],
'no_multiline_whitespace_around_double_arrow' => true, 'no_multiline_whitespace_around_double_arrow' => true,
@ -68,5 +69,6 @@ return (new PhpCsFixer\Config())
'ordered_imports' => [ 'ordered_imports' => [
'sort_algorithm' => 'none', 'sort_algorithm' => 'none',
], ],
//Other rules here...
]) ])
->setLineEnding("\n"); ->setLineEnding("\n");

@ -3,7 +3,6 @@
namespace brain\utility; namespace brain\utility;
use Carbon\Carbon; use Carbon\Carbon;
use brain\data\Settings;
class Maintenance class Maintenance
{ {

@ -2,12 +2,13 @@
namespace brain\utility; namespace brain\utility;
use function _\filter;
use function _\find;
use brain\data\Book; use brain\data\Book;
use brain\data\Settings; use brain\data\Settings;
use Mni\FrontYAML\Parser; use Mni\FrontYAML\Parser;
use function _\filter;
use function _\find;
class Sorting class Sorting
{ {
private static $p_tags = []; private static $p_tags = [];
@ -16,6 +17,7 @@ class Sorting
public function __construct() public function __construct()
{ {
} }
public static function tags() public static function tags()
{ {
$pages = (new Book('../content/pages'))->getContents(); $pages = (new Book('../content/pages'))->getContents();
@ -36,6 +38,7 @@ class Sorting
return self::$p_tags; return self::$p_tags;
} }
private static function tagPages($tag, $pages) private static function tagPages($tag, $pages)
{ {
$tagged = []; $tagged = [];
@ -52,6 +55,7 @@ class Sorting
return $tagged; return $tagged;
} }
public static function archive() public static function archive()
{ {
$pages = (new Book('../content/pages'))->getContents(); $pages = (new Book('../content/pages'))->getContents();
@ -64,10 +68,13 @@ class Sorting
if (!find($years, ['year' => trim($date[0])])) { if (!find($years, ['year' => trim($date[0])])) {
$findPages = filter($pages, ['createdYear' => trim($date[0])]); $findPages = filter($pages, ['createdYear' => trim($date[0])]);
// var_dump($findPages); // var_dump($findPages);
array_push($years, [ array_push(
$years,
[
'year' => trim($date[0]), 'year' => trim($date[0]),
'count' => count($findPages), 'count' => count($findPages),
]); ]
);
} }
} }
foreach ($years as $year) { foreach ($years as $year) {
@ -77,12 +84,15 @@ class Sorting
foreach ($filtered as $obj) { foreach ($filtered as $obj) {
$month = date('m', date($obj['rawCreated'])); $month = date('m', date($obj['rawCreated']));
if (!find($sorted, ['month' => $month])) { if (!find($sorted, ['month' => $month])) {
$perMonth = filter($pages, [ $perMonth = filter(
$pages,
[
'path' => $year['year'] . '/' . $month, 'path' => $year['year'] . '/' . $month,
'deleted' => false, 'deleted' => false,
'published' => true, 'published' => true,
'layout' => 'page', 'layout' => 'page',
]); ]
);
array_push($sorted, [ array_push($sorted, [
'month' => $month, 'month' => $month,
'full_month' => date('F', date($obj['rawCreated'])), 'full_month' => date('F', date($obj['rawCreated'])),
@ -99,6 +109,7 @@ class Sorting
return self::$p_archive; return self::$p_archive;
} }
public static function page($page) public static function page($page)
{ {
$config = new Settings(); $config = new Settings();

Loading…
Cancel
Save