Fix static analysis

- Remove PHPStan workarounds and require fixed PHPCS version
- PHAN doesn't hard depend on AST anymore in recent versions

Author: mmoll

.travis.yml

@@ -23,8 +23,7 @@ cache:
 before_script:
   - if [ "${DEPENDENCIES}" = "lowest" ]; then composer update --prefer-lowest --prefer-dist --no-interaction --no-progress; fi;
   - if [ "${DEPENDENCIES}" = "highest" ]; then composer update --prefer-dist --no-interaction --no-progress; fi;
-  - if [ "${DEPENDENCIES}" = "highest" ]; then pecl install -f ast-1.0.5; fi; # Install AST extension, as phan requires it
-  - if [ "${DEPENDENCIES}" = "highest" ]; then composer require phan/phan --dev; fi; # Install phan, now that we have the AST extension
+  - if [ "${DEPENDENCIES}" = "highest" ]; then pecl install -f ast-1.0.5; fi; # Install AST extension, as phan uses it
 
 script:
   - xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd MO4/ruleset.xml # validate MO4's ruleset XML

MO4/Sniffs/Commenting/PropertyCommentSniff.php

@@ -160,7 +160,7 @@ protected function processTokenWithinScope(
             $isCommentOneLiner
                 = $tokens[$commentStart]['line'] === $tokens[$commentEnd]['line'];
 
-            $length         = (int) ($commentEnd - $commentStart + 1);
+            $length         = ($commentEnd - $commentStart + 1);
             $tokensAsString = $phpcsFile->getTokensAsString(
                 $commentStart,
                 $length

MO4/Sniffs/Formatting/AlphabeticalUseStatementsSniff.php

@@ -182,7 +182,6 @@ private function getUseImport(File $phpcsFile, int $stackPtr)
             return false;
         }
 
-        $start  = (int) $start;
         $end    = (int) $phpcsFile->findNext($importTokens, $start, null, true);
         $import = $phpcsFile->getTokensAsString($start, ($end - $start));
 
@@ -307,21 +306,21 @@ private function findNewDestination(
                 $line = $prevLine;
             }
 
-            $prevPtr = $phpcsFile->findPrevious(T_USE, ((int) $ptr - 1));
+            $prevPtr = $phpcsFile->findPrevious(T_USE, ($ptr - 1));
             if ($prevPtr === false) {
                 break;
             }
 
             $prevLine = $tokens[$prevPtr]['line'];
             // phpcs:disable
             /** @var array<string> $prevImportArr */
-            $prevImportArr = $this->getUseImport($phpcsFile, (int) $prevPtr);
+            $prevImportArr = $this->getUseImport($phpcsFile, $prevPtr);
             // phpcs:enable
         } while ($prevLine === ($line - 1)
             && ($this->compareString($prevImportArr['content'], $import) > 0)
         );
 
-        return (int) $ptr;
+        return $ptr;
 
     }//end findNewDestination()
 

MO4/Sniffs/Formatting/UnnecessaryNamespaceUsageSniff.php

@@ -90,8 +90,6 @@ public function process(File $phpcsFile, $stackPtr): void
         $nsSep = $phpcsFile->findNext($scanTokens, ($stackPtr + 1));
 
         while ($nsSep !== false) {
-            $nsSep = (int) $nsSep;
-
             $classNameEnd = (int) $phpcsFile->findNext(
                 $this->classNameTokens,
                 $nsSep,
@@ -145,8 +143,6 @@ public function process(File $phpcsFile, $stackPtr): void
                         continue;
                     }
 
-                    $docCommentStringPtr = (int) $docCommentStringPtr;
-
                     $docLine = $tokens[$docCommentStringPtr]['content'];
 
                     $docLineTokens = PregLibrary::mo4_preg_split(
@@ -219,7 +215,7 @@ protected function getUseStatements(
         while ($useTokenPtr !== false) {
             $classNameStart = (int) $phpcsFile->findNext(
                 PHP_CodeSniffer_Tokens::$emptyTokens,
-                ((int) $useTokenPtr + 1),
+                ($useTokenPtr + 1),
                 $end,
                 true
             );
@@ -244,7 +240,7 @@ protected function getUseStatements(
 
             $aliasNamePtr = $phpcsFile->findPrevious(
                 PHP_CodeSniffer_Tokens::$emptyTokens,
-                ((int) $useEnd - 1),
+                ($useEnd - 1),
                 null,
                 true
             );
@@ -254,7 +250,7 @@ protected function getUseStatements(
 
             $className = $this->getFullyQualifiedClassName($className);
             $useStatements[$className] = $tokens[$aliasNamePtr]['content'];
-            $i = ((int) $useEnd + 1);
+            $i = ($useEnd + 1);
 
             if ($tokens[$useEnd]['code'] === T_COMMA) {
                 $useTokenPtr = $i;
@@ -291,8 +287,6 @@ protected function getNamespace(File $phpcsFile, int $start, int $end): string
             return '';
         }
 
-        $namespaceStart = (int) $namespaceStart;
-
         $namespaceEnd = (int) $phpcsFile->findNext(
             $this->classNameTokens,
             ($namespaceStart + 1),

composer.json

@@ -22,6 +22,7 @@
         "source": "https://github.com/mayflower/mo4-coding-standard"
     },
     "require-dev": {
+        "phan/phan": "^2.4.8",
         "phpstan/phpdoc-parser": "^0.4.1",
         "phpstan/phpstan": "^0.12.2",
         "phpstan/phpstan-strict-rules": "^0.12",
@@ -32,6 +33,6 @@
         "dealerdirect/phpcodesniffer-composer-installer": "^0.5",
         "escapestudios/symfony2-coding-standard": "^3.10.0",
         "slevomat/coding-standard": "^6.0.2",
-        "squizlabs/php_codesniffer": "^3.5.3"
+        "squizlabs/php_codesniffer": "^3.5.4"
     }
 }