phpstan (#2006)

rectorphp · Apr 4, 2022 · 258f2d0 · 258f2d0
1 parent 38add40
commit 258f2d0
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 36 deletions.
diff --git a/packages/NodeTypeResolver/NodeTypeResolver/TraitTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/TraitTypeResolver.php
@@ -56,10 +56,6 @@ public function resolve(Node $node): Type
             return $types[0];
         }
 
-        if (count($types) > 1) {
-            return new UnionType($types);
-        }
-
-        return new MixedType();
+        return new UnionType($types);
     }
 }
diff --git a/...ts/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector/Fixture/fixture.php.inc b/...ts/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector/Fixture/fixture.php.inc
@@ -4,11 +4,13 @@ namespace Rector\Tests\Arguments\Rector\ClassMethod\ReplaceArgumentDefaultValueR
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-function argumentDefalutValue()
-{
-    $container = new ContainerBuilder();
-    $container->register('foo', 'stdClass')
-        ->setScope(ContainerBuilder::SCOPE_PROTOTYPE);
+class Fixture {
+    function argumentDefalutValue()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')
+            ->setScope(ContainerBuilder::SCOPE_PROTOTYPE);
+    }
 }
 
 ?>
@@ -19,11 +21,13 @@ namespace Rector\Tests\Arguments\Rector\ClassMethod\ReplaceArgumentDefaultValueR
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-function argumentDefalutValue()
-{
-    $container = new ContainerBuilder();
-    $container->register('foo', 'stdClass')
-        ->setScope(false);
+class Fixture {
+    function argumentDefalutValue()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')
+            ->setScope(false);
+    }
 }
 
 ?>
diff --git a/...s/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector/Fixture/fixture2.php.inc b/...s/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector/Fixture/fixture2.php.inc
@@ -4,12 +4,14 @@ namespace Rector\Tests\Arguments\Rector\ClassMethod\ReplaceArgumentDefaultValueR
 
 use Symfony\Component\Yaml\Yaml;
 
-function argumentDefaultValue2()
-{
-    Yaml::parse('...', true);
-    Yaml::parse('...', false);
-    Yaml::parse('...', false, true);
-    Yaml::parse('...', false, false, true);
+class Fixture2 {
+    function argumentDefaultValue2()
+    {
+        Yaml::parse('...', true);
+        Yaml::parse('...', false);
+        Yaml::parse('...', false, true);
+        Yaml::parse('...', false, false, true);
+    }
 }
 
 ?>
@@ -20,12 +22,14 @@ namespace Rector\Tests\Arguments\Rector\ClassMethod\ReplaceArgumentDefaultValueR
 
 use Symfony\Component\Yaml\Yaml;
 
-function argumentDefaultValue2()
-{
-    Yaml::parse('...', \Symfony\Component\Yaml\Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
-    Yaml::parse('...', 0);
-    Yaml::parse('...', \Symfony\Component\Yaml\Yaml::PARSE_OBJECT);
-    Yaml::parse('...', \Symfony\Component\Yaml\Yaml::PARSE_OBJECT_FOR_MAP);
+class Fixture2 {
+    function argumentDefaultValue2()
+    {
+        Yaml::parse('...', \Symfony\Component\Yaml\Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
+        Yaml::parse('...', 0);
+        Yaml::parse('...', \Symfony\Component\Yaml\Yaml::PARSE_OBJECT);
+        Yaml::parse('...', \Symfony\Component\Yaml\Yaml::PARSE_OBJECT_FOR_MAP);
+    }
 }
 
 ?>
diff --git a/...s/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector/Fixture/fixture3.php.inc b/...s/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector/Fixture/fixture3.php.inc
@@ -4,11 +4,13 @@ namespace Rector\Tests\Arguments\Rector\ClassMethod\ReplaceArgumentDefaultValueR
 
 use Symfony\Component\Yaml\Yaml;
 
-function argumentDefaultValue3()
-{
-    Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, true);
+class Fixture3 {
+    function argumentDefaultValue3()
+    {
+        Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, true);
 
-    Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, false, true);
+        Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, false, true);
+    }
 }
 
 ?>
@@ -19,11 +21,13 @@ namespace Rector\Tests\Arguments\Rector\ClassMethod\ReplaceArgumentDefaultValueR
 
 use Symfony\Component\Yaml\Yaml;
 
-function argumentDefaultValue3()
-{
-    Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, \Symfony\Component\Yaml\Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE);
+class Fixture3 {
+    function argumentDefaultValue3()
+    {
+        Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, \Symfony\Component\Yaml\Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE);
 
-    Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, \Symfony\Component\Yaml\Yaml::DUMP_OBJECT);
+        Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, \Symfony\Component\Yaml\Yaml::DUMP_OBJECT);
+    }
 }
 
 ?>
diff --git a/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php b/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php
@@ -123,6 +123,6 @@ private function resolveMaximumAllowedParameterCount(
             $parameterCounts[] = count($parametersAcceptor->getParameters());
         }
 
-        return (int) max($parameterCounts);
+        return max($parameterCounts);
     }
 }