Merge pull request #264 from simPod/req-8

chore(deps): require slevomat/coding-standard v8 and squizlabs/php_codesniffer v3.7
doctrine · Jun 23, 2022 · 094a121 · 094a121
2 parents 1f059bb + fd9171d
commit 094a121
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -90,7 +90,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.1"
           - "7.2"
           - "7.3"
           - "7.4"
@@ -128,7 +127,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.1"
+          - "7.2"
           - "7.4"
           - "8.0"
           - "8.1"

diff --git a/composer.json b/composer.json
@@ -21,10 +21,10 @@
         {"name": "Steve Müller", "email": "st.mueller@dzh-online.de"}
     ],
     "require": {
-        "php": "^7.1 || ^8.0",
+        "php": "^7.2 || ^8.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
-        "slevomat/coding-standard": "^7.0.0",
-        "squizlabs/php_codesniffer": "^3.6.0"
+        "slevomat/coding-standard": "^8",
+        "squizlabs/php_codesniffer": "^3.7"
     },
     "config": {
         "sort-packages": true

diff --git a/lib/Doctrine/ruleset.xml b/lib/Doctrine/ruleset.xml
@@ -133,6 +133,8 @@
     </rule>
     <!-- Require usage of ::class instead of __CLASS__, get_class(), get_class($this), get_called_class() and get_parent_class() -->
     <rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference"/>
+    <!-- https://github.com/slevomat/coding-standard#slevomatcodingstandardclassespropertydeclaration- -->
+    <rule ref="SlevomatCodingStandard.Classes.PropertyDeclaration"/>
     <!-- Forbid uses of multiple traits separated by comma -->
     <rule ref="SlevomatCodingStandard.Classes.TraitUseDeclaration"/>
     <!-- Require no spaces before trait use, between trait uses and one space after trait uses -->
@@ -408,7 +410,6 @@
             </property>
         </properties>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHintSpacing"/>
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
         <properties>
             <property name="traversableTypeHints" type="array">

diff --git a/tests/expected_report.txt b/tests/expected_report.txt
@@ -28,7 +28,7 @@ tests/input/not_spacing.php                           8       0
 tests/input/null_coalesce_equal_operator.php          1       0
 tests/input/null_coalesce_operator.php                3       0
 tests/input/optimized-functions.php                   1       0
-tests/input/PropertyTypeHintSpacing.php               6       0
+tests/input/PropertyDeclaration.php                   6       0
 tests/input/return_type_on_closures.php               21      0
 tests/input/return_type_on_methods.php                17      0
 tests/input/semicolon_spacing.php                     3       0

diff --git a/tests/fixed/PropertyTypeHintSpacing.php → tests/fixed/PropertyDeclaration.php b/tests/fixed/PropertyTypeHintSpacing.php → tests/fixed/PropertyDeclaration.php
@@ -4,7 +4,7 @@
 
 namespace Spacing;
 
-final class PropertyTypeHintSpacing
+final class PropertyDeclaration
 {
     public bool $boolPropertyWithDefaultValue = false;
     public string $stringProperty;

diff --git a/tests/input/PropertyTypeHintSpacing.php → tests/input/PropertyDeclaration.php b/tests/input/PropertyTypeHintSpacing.php → tests/input/PropertyDeclaration.php
@@ -4,7 +4,7 @@
 
 namespace Spacing;
 
-final class PropertyTypeHintSpacing
+final class PropertyDeclaration
 {
     public bool $boolPropertyWithDefaultValue  = false;
     public string  $stringProperty;

diff --git a/tests/php74-compatibility.patch b/tests/php74-compatibility.patch
@@ -22,7 +22,7 @@ index fd5432c..233e24d 100644
 +tests/input/null_coalesce_equal_operator.php          5       0
  tests/input/null_coalesce_operator.php                3       0
  tests/input/optimized-functions.php                   1       0
- tests/input/PropertyTypeHintSpacing.php               6       0
+ tests/input/PropertyDeclaration.php                   6       0
 @@ -39,15 +39,15 @@ tests/input/superfluous-naming.php                    11      0
  tests/input/test-case.php                             8       0
  tests/input/trailing_comma_on_array.php               1       0

diff --git a/tests/php80-compatibility.patch b/tests/php80-compatibility.patch
@@ -24,7 +24,7 @@ index c644926..d0f0a44 100644
  tests/input/null_coalesce_operator.php                3       0
 +tests/input/null_safe_operator.php                    1       0
  tests/input/optimized-functions.php                   1       0
- tests/input/PropertyTypeHintSpacing.php               6       0
+ tests/input/PropertyDeclaration.php                   6       0
  tests/input/return_type_on_closures.php               21      0
 @@ -39,15 +40,15 @@ tests/input/superfluous-naming.php                    11      0
  tests/input/test-case.php                             8       0

diff --git a/tests/php81-compatibility.patch b/tests/php81-compatibility.patch
@@ -24,7 +24,7 @@ index c644926..d0f0a44 100644
  tests/input/null_coalesce_operator.php                3       0
 +tests/input/null_safe_operator.php                    1       0
  tests/input/optimized-functions.php                   1       0
- tests/input/PropertyTypeHintSpacing.php               6       0
+ tests/input/PropertyDeclaration.php                   6       0
  tests/input/return_type_on_closures.php               21      0
 @@ -39,15 +40,15 @@ tests/input/superfluous-naming.php                    11      0
  tests/input/test-case.php                             8       0