Merge pull request #23 from leviy/upgrade-slevomat-coding-standard

Upgrade the slevomat/coding-standard package

Author: nicwortel

composer.json

@@ -11,10 +11,10 @@
     ],
     "require": {
         "php": "^7.1",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2",
         "escapestudios/symfony2-coding-standard": "^3.6",
         "phpmd/phpmd": "^2.6",
-        "slevomat/coding-standard": "^5.0",
+        "slevomat/coding-standard": "^6.0",
         "squizlabs/php_codesniffer": "^3.4"
     },
     "autoload": {

src/LEVIY/ruleset.xml

@@ -64,12 +64,9 @@
 
     <!-- Use PHP native type hints whenever possible. Use docblocks only when
     the use of native type hints is impossible. -->
-    <rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration">
-        <properties>
-            <property name="allAnnotationsAreUseful" value="true"/>
-            <property name="enableEachParameterAndReturnInspection" value="true"/>
-        </properties>
-    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint"/>
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint"/>
+    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint"/>
 
     <!-- Ensure that arguments with a default type of null are marked nullable -->
     <rule ref="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue"/>

tests/expected.log

@@ -30,9 +30,10 @@ PHPCBF CAN FIX THE 2 MARKED SNIFF VIOLATIONS AUTOMATICALLY
 
 FILE: tests/incorrect/type-hints.php
 ------------------------------------------------------------------------------------------------------------------------
-FOUND 17 ERRORS AFFECTING 14 LINES
+FOUND 18 ERRORS AFFECTING 15 LINES
 ------------------------------------------------------------------------------------------------------------------------
-  9 | ERROR | [x] Function doesNotNeedDocumentationComment() does not need documentation comment.
+  5 | ERROR | [x] Function doesNotNeedDocumentationComment() has useless @param annotation for parameter $input.
+  7 | ERROR | [x] Function doesNotNeedDocumentationComment() has useless @return annotation.
  16 | ERROR | [x] Function uselessReturnAnnotation() has useless @return annotation.
  23 | ERROR | [x] Function uselessParamAnnotation() has useless @param annotation for parameter $string.
  35 | ERROR | [x] Function uselessAnnotationsWithUsefulComment() has useless @param annotation for parameter $string.
@@ -56,7 +57,7 @@ FOUND 17 ERRORS AFFECTING 14 LINES
  76 | ERROR | [x] Expected "int" but found "integer" in @param annotation.
  78 | ERROR | [x] Expected "bool" but found "boolean" in @return annotation.
 ------------------------------------------------------------------------------------------------------------------------
-PHPCBF CAN FIX THE 13 MARKED SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX THE 14 MARKED SNIFF VIOLATIONS AUTOMATICALLY
 ------------------------------------------------------------------------------------------------------------------------