Merge pull request #3 from rdohms/task/up-to-9

Upgrade to Doctrine Standard 9
rdohms · Oct 13, 2021 · 3daad6e · 3daad6e
2 parents 4c53a5c + fa2fb1a
commit 3daad6e
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 62 deletions.
diff --git a/.github/workflows/check-cs-checker.yml b/.github/workflows/check-cs-checker.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [8.x, 7.4]
+        php: [8.x]
 
     steps:
       - name: Checkout code
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [8.x, 7.4]
+        php: [8.x]
 
     steps:
       - name: Checkout code

diff --git a/composer.json b/composer.json
@@ -5,6 +5,6 @@
     "license": "MIT",
     "require": {
         "php": "^7.2 || ^8",
-        "doctrine/coding-standard": "^8"
+        "doctrine/coding-standard": "^9"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/tests/expected_report.txt b/tests/expected_report.txt
@@ -3,16 +3,16 @@ PHP CODE SNIFFER REPORT SUMMARY
 ----------------------------------------------------------------------
 FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
-tests/input/concatenation_spacing.php                 56      0
+tests/input/concatenation_spacing.php                 55      0
 tests/input/example-class.php                         36      0
-tests/input/not_spacing.php                           8       0
-tests/input/return_type_on_closures.php               28      0
-tests/input/return_type_on_methods.php                14      0
-tests/input/test-case.php                             8       0
+tests/input/not_spacing.php                           7       0
+tests/input/return_type_on_closures.php               27      0
+tests/input/return_type_on_methods.php                13      0
+tests/input/test-case.php                             7       0
 ----------------------------------------------------------------------
-A TOTAL OF 150 ERRORS AND 0 WARNINGS WERE FOUND IN 6 FILES
+A TOTAL OF 145 ERRORS AND 0 WARNINGS WERE FOUND IN 6 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 139 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 134 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/tests/fixed/concatenation_spacing.php b/tests/fixed/concatenation_spacing.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 $string = 'Standards' . 'are awesome';

diff --git a/tests/fixed/example-class.php b/tests/fixed/example-class.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Example;
@@ -33,10 +34,7 @@ class Example implements IteratorAggregate
 
     private bool $baz;
 
-    /**
-     * @var ControlStructureSniff|int|string|null
-     */
-    private $baxBax;
+    private ControlStructureSniff|int|string|null $baxBax = null;
 
     public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
     {

diff --git a/tests/fixed/not_spacing.php b/tests/fixed/not_spacing.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 $test = 1;

diff --git a/tests/fixed/return_type_on_closures.php b/tests/fixed/return_type_on_closures.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 static function (): void {

diff --git a/tests/fixed/return_type_on_methods.php b/tests/fixed/return_type_on_methods.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Blah;

diff --git a/tests/fixed/test-case.php b/tests/fixed/test-case.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Fancy;