Merge pull request #6 from mediact/feature/compatibility-phpcs-33

2.0.3 Compatibility fixes for PHPCS 3.3

Author: michielfb

composer.json

@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": "^5.4.0 || ^7.0",
-        "squizlabs/php_codesniffer": "^3.3",
+        "squizlabs/php_codesniffer": "~3.3.0",
         "phpmd/phpmd": "^2.0"
     },
     "require-dev": {

src/MediactCommon/Sniffs/Php7/ReturnTypeSniff.php

@@ -170,6 +170,6 @@ protected function findActualReturnType(
         $functionStart
     ) {
         $properties = $file->getMethodProperties($functionStart);
-        return $properties['return_type'];
+        return ltrim($properties['return_type'], '?');
     }
 }

src/MediactCommon/ruleset.xml

@@ -20,6 +20,8 @@
         <exclude name="Squiz.Arrays.ArrayDeclaration.NoCommaAfterLast"/>
         <exclude name="Squiz.Arrays.ArrayDeclaration.CloseBraceNotAligned"/>
         <exclude name="Squiz.Arrays.ArrayDeclaration.MultiLineNotAllowed"/>
+        <exclude name="Squiz.Arrays.ArrayDeclaration.NoComma"/>
+        <exclude name="Squiz.Arrays.ArrayDeclaration.DoubleArrowNotAligned"/>
     </rule>
 
     <!-- Code analysis -->
@@ -39,6 +41,8 @@
         <exclude name="Generic.Commenting.DocComment.ContentBeforeClose"/>
         <exclude name="Generic.Commenting.DocComment.MissingShort"/>
         <exclude name="Generic.Commenting.DocComment.SpacingBeforeTags"/>
+        <exclude name="Generic.Commenting.DocComment.ParamNotFirst" />
+        <exclude name="Generic.Commenting.DocComment.TagValueIndent" />
     </rule>
     <rule ref="Squiz.Commenting.FunctionComment">
         <exclude name="Squiz.Commenting.FunctionComment.MissingParamComment"/>