Merge pull request #377 from sensiolabs-de/tools-update

update tools
qossmic · Sep 21, 2020 · f8c402e · f8c402e
2 parents 04b2d49 + b26d483
commit f8c402e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^2.16.3" installed="2.16.3" location="./tools/php-cs-fixer" copy="true"/>
-  <phar name="phpunit" version="^8.5.6" installed="8.5.6" location="./tools/phpunit.phar" copy="true"/>
-  <phar name="phpstan" version="^0.12.29" installed="0.12.29" location="./tools/phpstan" copy="true"/>
-  <phar name="psalm" version="^3.12.2" installed="3.12.2" location="./tools/psalm" copy="true"/>
-  <phar name="humbug/box" version="^3.8.4" installed="3.8.4" location="./tools/box" copy="true"/>
+  <phar name="php-cs-fixer" version="^2.16.3" installed="2.16.4" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="phpunit" version="^8.5.6" installed="8.5.8" location="./tools/phpunit.phar" copy="true"/>
+  <phar name="phpstan" version="^0.12.29" installed="0.12.43" location="./tools/phpstan" copy="true"/>
+  <phar name="psalm" version="^3.12.2" installed="3.16.0" location="./tools/psalm" copy="true"/>
+  <phar name="humbug/box" version="^3.8.4" installed="3.8.5" location="./tools/box" copy="true"/>
 </phive>
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -4,4 +4,4 @@ parameters:
     level: max
     paths: [src]
     ignoreErrors:
-        - '/Parameter #1 $id of method Fhaculty\Graph\Graph::createVertex() expects int|null, string given./'
+        - '/Parameter #1 \$id of method Fhaculty\\Graph\\Graph\:\:createVertex\(\) expects int\|null, string given\./'
diff --git a/src/AstRunner/AstParser/NikicPhpParser/ClassReferenceVisitor.php b/src/AstRunner/AstParser/NikicPhpParser/ClassReferenceVisitor.php
@@ -43,7 +43,7 @@ public function enterNode(Node $node)
             return null;
         }
 
-        if (isset($node->namespacedName) && $node->namespacedName instanceof Node\Name) {
+        if (isset($node->namespacedName)) {
             $className = $node->namespacedName->toCodeString();
         } elseif ($node->name instanceof Node\Identifier) {
             $className = $node->name->toString();

diff --git a/src/AstRunner/AstParser/NikicPhpParser/NikicPhpParser.php b/src/AstRunner/AstParser/NikicPhpParser/NikicPhpParser.php
@@ -111,7 +111,7 @@ static function (Node $node): bool {
         $classLikeNodes = $findingVisitor->getFoundNodes();
 
         foreach ($classLikeNodes as $classLikeNode) {
-            if (isset($classLikeNode->namespacedName) && $classLikeNode->namespacedName instanceof Node\Name) {
+            if (isset($classLikeNode->namespacedName)) {
                 $className = $classLikeNode->namespacedName->toString();
             } else {
                 $className = (string) $classLikeNode->name;

diff --git a/src/Collector/MethodCollector.php b/src/Collector/MethodCollector.php
@@ -24,13 +24,13 @@ public function getType(): string
 
     public function satisfy(
         array $configuration,
-        AstClassReference $classReference,
+        AstClassReference $astClassReference,
         AstMap $astMap,
         Registry $collectorRegistry
     ): bool {
         $pattern = $this->getPattern($configuration);
 
-        $classLike = $this->nikicPhpParser->getAstForClassReference($classReference);
+        $classLike = $this->nikicPhpParser->getAstForClassReference($astClassReference);
 
         if (null === $classLike) {
             return false;

diff --git a/src/OutputFormatter/XMLOutputFormatter.php b/src/OutputFormatter/XMLOutputFormatter.php
@@ -39,11 +39,11 @@ public function enabledByDefault(): bool
      * @throws \Exception
      */
     public function finish(
-        Context $dependencyContext,
+        Context $context,
         OutputInterface $output,
         OutputFormatterInput $outputFormatterInput
     ): void {
-        $xml = $this->createXml($dependencyContext);
+        $xml = $this->createXml($context);
 
         if ($dumpXmlPath = $outputFormatterInput->getOption(self::DUMP_XML)) {
             file_put_contents($dumpXmlPath, $xml);