Fix GitHub actions (#39)

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

@@ -15,7 +15,7 @@ jobs:
       - name: Run PHP CS Fixer
         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: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4

.github/workflows/run-tests.yml

@@ -32,12 +32,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ~/.composer/cache/files
-          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:

.gitignore

@@ -14,6 +14,7 @@ coverage
 .php_cs
 .php_cs.cache
 psalm.xml
+.php-cs-fixer.cache
 
 .idea
 

.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,
+        '@PSR12' => 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,
@@ -31,7 +28,7 @@
         'phpdoc_var_without_name' => true,
         'class_attributes_separation' => [
             'elements' => [
-                'method',
+                'method' => 'one',
             ],
         ],
         'method_argument_space' => [

tests/Examples/FlaggedEnum.php

@@ -12,9 +12,9 @@
  */
 final class FlaggedEnum extends BaseFlaggedEnum
 {
-    const ReadComments = 1 << 0;
+    public const ReadComments = 1 << 0;
 
-    const WriteComments = 1 << 1;
+    public const WriteComments = 1 << 1;
 
-    const EditComments = 1 << 2;
+    public const EditComments = 1 << 2;
 }

tests/Examples/IntegerEnum.php

@@ -11,9 +11,9 @@
  */
 class IntegerEnum extends Enum
 {
-    const Administrator = 0;
+    public const Administrator = 0;
 
-    const Moderator = 1;
+    public const Moderator = 1;
 
-    const Subscriber = 2;
+    public const Subscriber = 2;
 }

tests/Examples/StringEnum.php

@@ -11,9 +11,9 @@
  */
 class StringEnum extends Enum
 {
-    const Administrator = 'administrator';
+    public const Administrator = 'administrator';
 
-    const Moderator = 'moderator';
+    public const Moderator = 'moderator';
 
-    const Subscriber = 'subscriber';
+    public const Subscriber = 'subscriber';
 }