Update Slevomat CS

peckadesign · Nov 4, 2021 · e7f3293 · e7f3293
1 parent 2918a7c
commit e7f3293
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 63 deletions.
diff --git a/.github/workflows/php-package-ci.yml b/.github/workflows/php-package-ci.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ 7.1, 7.2, 7.3, 7.4, 8.0 ]
+        php: [ 7.4, 8.0 ]
     steps:
       - uses: actions/checkout@v2
       - uses: shivammathur/setup-php@v2

diff --git a/Makefile b/Makefile
@@ -7,7 +7,6 @@ run-tests:
 	./vendor/bin/phpcs --standard=src/PeckaCodingStandardStrict/ruleset.xml tests/Success/
 	./vendor/bin/phpcs --standard=src/PeckaCodingStandard/ruleset.xml tests/Failure/Arrays/TrailingArrayComma.php | tests/errorNumber.sh 1
 	./vendor/bin/phpcs --standard=src/PeckaCodingStandard/ruleset.xml tests/Failure/Classes/ClassConstantVisibility.php | tests/errorNumber.sh 1
-	./vendor/bin/phpcs --standard=src/PeckaCodingStandard/ruleset.xml tests/Failure/Classes/UnusedPrivateElements.php | tests/errorNumber.sh 2
 	./vendor/bin/phpcs --standard=src/PeckaCodingStandard/ruleset.xml tests/Failure/Classes/PropertySpacing.php | tests/errorNumber.sh 2
 	./vendor/bin/phpcs --standard=src/PeckaCodingStandard/ruleset.xml tests/Failure/Classes/MethodSpacingSniff.php | tests/errorNumber.sh 2
 	./vendor/bin/phpcs --standard=src/PeckaCodingStandard/ruleset.xml tests/Failure/Classes/ClassMemberSpacing.php | tests/errorNumber.sh 1

diff --git a/composer.json b/composer.json
@@ -2,9 +2,9 @@
     "name": "pd/coding-standard",
     "description": "Coding standard pro PeckaDesign",
     "require": {
-        "php": "7.* || 8.*",
+        "php": "7.4.* || 8.*",
         "squizlabs/php_codesniffer": "3.*",
-        "slevomat/coding-standard": "6.4.*",
+        "slevomat/coding-standard": "7.0.*",
         "escapestudios/symfony2-coding-standard": "3.*"
     },
     "license": "MIT",

diff --git a/src/PeckaCodingStandard/ruleset.xml b/src/PeckaCodingStandard/ruleset.xml
@@ -10,7 +10,6 @@
 	<rule ref="Generic.Classes.DuplicateClassName"/>
 	<rule ref="Squiz.Classes.LowercaseClassKeywords"/>
 	<rule ref="SlevomatCodingStandard.Classes.ClassConstantVisibility"/>
-	<rule ref="SlevomatCodingStandard.Classes.UnusedPrivateElements"/>
 	<rule ref="SlevomatCodingStandard.Classes.PropertySpacing">
 		<properties>
 			<property name="minLinesCountBeforeWithComment" value="1"/>

diff --git a/src/PeckaCodingStandardStrict/ruleset.xml b/src/PeckaCodingStandardStrict/ruleset.xml
@@ -11,7 +11,11 @@
 	<rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators"/>
 
 	<!-- TypeHints -->
-	<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes"/>
+	<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
+		<properties>
+			<property name="declareOnFirstLine" value="1" />
+		</properties>
+	</rule>
 	<rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint"/>
 
 	<!-- Namespaces -->

diff --git a/tests/Failure/Classes/ClassMemberSpacing.php b/tests/Failure/Classes/ClassMemberSpacing.php
@@ -4,7 +4,7 @@ final class ClassMemberSpacing
 {
 
 	/**
-	 * @var int
+	 * @var int|string
 	 */
 	private $number;
 

diff --git a/tests/Failure/Classes/UnusedPrivateElements.php b/tests/Failure/Classes/UnusedPrivateElements.php
diff --git a/tests/Success/Classes/ClassMemberSpacing.php b/tests/Success/Classes/ClassMemberSpacing.php
@@ -1,12 +1,11 @@
 <?php declare(strict_types = 1);
 
+namespace PdTests\Success\Classes;
+
 final class ClassMemberSpacing
 {
 
-	/**
-	 * @var int|string
-	 */
-	private $number;
+	private int $number;
 
 
 	public function getNumber(): int

diff --git a/tests/Success/Classes/PropertySpacing.php b/tests/Success/Classes/PropertySpacing.php
@@ -5,14 +5,8 @@
 class PropertySpacing
 {
 
-	/**
-	 * @var int|string
-	 */
-	public $element;
+	public int $element;
 
-	/**
-	 * @var int|string
-	 */
-	public $element2;
+	public int|string $element2;
 
 }
diff --git a/tests/Success/Classes/UnusedPrivateElements.php b/tests/Success/Classes/UnusedPrivateElements.php