nitpicks

Author: freekmurze

.github/workflows/php-cs-fixer.yml

@@ -13,7 +13,7 @@ jobs:
             -   name: Fix style
                 uses: docker://oskarstark/php-cs-fixer-ga
                 with:
-                    args: --config=.php_cs.dist --allow-risky=yes
+                    args: --config=.php_cs.dist.php --allow-risky=yes
 
             -   name: Extract branch name
                 shell: bash

.gitignore

@@ -10,3 +10,5 @@ phpunit.xml
 psalm.xml
 testbench.yaml
 vendor
+.php-cs-fixer.cache
+

.php_cs.dist .php_cs.dist.php

@@ -1,9 +1,6 @@
 <?php
 
 $finder = Symfony\Component\Finder\Finder::create()
-    ->notPath('bootstrap/*')
-    ->notPath('storage/*')
-    ->notPath('resources/view/mail/*')
     ->in([
         __DIR__ . '/src',
         __DIR__ . '/tests',
@@ -13,14 +10,14 @@
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'no_unused_imports' => true,
         'not_operator_with_successor_space' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'phpdoc_scalar' => true,
         'unary_operator_spaces' => true,
         'binary_operator_spaces' => true,
@@ -29,11 +26,6 @@
         ],
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_var_without_name' => true,
-        'class_attributes_separation' => [
-            'elements' => [
-                'method',
-            ],
-        ],
         'method_argument_space' => [
             'on_multiline' => 'ensure_fully_multiline',
             'keep_multiple_spaces_after_comma' => true,

src/Exceptions/InvalidFeedItem.php

@@ -11,7 +11,7 @@ class InvalidFeedItem extends Exception
 
     public static function notFeedable($subject): self
     {
-        return (new static('Object doesn\'t implement `Spatie\Feed\Feedable`'))->withSubject($subject);
+        return (new static('Object does not implement `Spatie\Feed\Feedable`'))->withSubject($subject);
     }
 
     public static function notAFeedItem($subject): self

src/Feed.php

@@ -95,11 +95,10 @@ protected function lastUpdated(): string
             ->sortBy(fn ($feedItem) => $feedItem->updated)
             ->last()->updated;
 
-        if ($this->format === 'rss') {
-            return $updatedAt->toRssString();
-        }
 
-        return $updatedAt->toRfc3339String();
+        return $this->format === 'rss'
+            ? $updatedAt->toRssString()
+            : $updatedAt->toRfc3339String();
     }
 
 }