CS Fix, dep update

Slamdunk · Apr 14, 2020 · 8b05d04 · 8b05d04
1 parent 6a46872
commit 8b05d04
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/.php_cs b/.php_cs
@@ -1,6 +1,6 @@
 <?php
 
-$config = new SlamCsFixer\Config(SlamCsFixer\Config::LIB);
+$config = new SlamCsFixer\Config();
 $config->getFinder()
     ->in(__DIR__ . '/src')
     ->in(__DIR__ . '/tests')

diff --git a/composer.json b/composer.json
@@ -24,9 +24,9 @@
     },
     "require-dev": {
         "phpstan/phpstan-phpunit": "^0.12",
-        "phpunit/phpunit": "^8.5",
+        "phpunit/phpunit": "^9.1",
         "roave/security-advisories": "dev-master",
-        "slam/php-cs-fixer-extensions": "^1.19",
+        "slam/php-cs-fixer-extensions": "^2.0",
         "slam/php-debug-r": "^1.6",
         "laminas/laminas-cache": "^2.8",
         "laminas/laminas-filter": "^2.9",

diff --git a/...PluginMethodDynamicReturnTypeExtension/AbstractPluginMethodDynamicReturnTypeExtension.php b/...PluginMethodDynamicReturnTypeExtension/AbstractPluginMethodDynamicReturnTypeExtension.php
@@ -9,7 +9,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
-use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
@@ -41,16 +40,16 @@ final public function getTypeFromMethodCall(
     ): Type {
         $argType = $scope->getType($methodCall->args[0]->value);
         $strings = TypeUtils::getConstantStrings($argType);
-        $plugin = count($strings) === 1 ? $strings[0]->getValue() : null;
-        
-        if ($plugin) {
+        $plugin  = 1 === \count($strings) ? $strings[0]->getValue() : null;
+
+        if (null !== $plugin) {
             $pluginManager = $this->serviceManagerLoader->getServiceLocator($this->getPluginManagerName());
+
             return new ObjectType(\get_class($pluginManager->get($plugin)));
         }
 
-        if ($argType instanceof StringType) {            
-            $defaultReturnType = ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->args, $methodReflection->getVariants())->getReturnType();
-            return $defaultReturnType;
+        if ($argType instanceof StringType) {
+            return ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->args, $methodReflection->getVariants())->getReturnType();
         }
 
         throw new \PHPStan\ShouldNotHappenException(\sprintf('Argument passed to %s::%s should be a string, %s given',

diff --git a/tests/LaminasIntegration/data/pluginMethodDynamicReturn.php b/tests/LaminasIntegration/data/pluginMethodDynamicReturn.php
@@ -5,8 +5,8 @@
 namespace LaminasPhpStan\Tests\LaminasIntegration\data;
 
 use Laminas\Router\SimpleRouteStack;
-use Laminas\View\Renderer\PhpRenderer;
 use Laminas\View\Helper\AbstractHelper;
+use Laminas\View\Renderer\PhpRenderer;
 
 final class pluginMethodDynamicReturn
 {
@@ -32,5 +32,4 @@ public function getDynamicTypeFromStringVariable(string $name): AbstractHelper
     {
         return $this->phpRenderer->plugin($name);
     }
-
 }