cs

Author: TomasVotruba

preload-split-package.php

@@ -2,16 +2,23 @@
 
 declare(strict_types=1);
 
+use PhpParser\Node;
+use PHPStan\Testing\PHPStanTestCase;
+
 if (defined('__PHPSTAN_RUNNING__')) {
     return;
 }
 
 // edge case during Rector tests case, happens when
 // 1. phpstan autoload test case is triggered first,
 // 2. all php-parser classes are loaded,
-if (defined('PHPUNIT_COMPOSER_INSTALL') && class_exists(\PHPStan\Testing\PHPStanTestCase::class, false) && interface_exists(\PhpParser\Node::class, false)) {
+if (defined('PHPUNIT_COMPOSER_INSTALL') && class_exists(
+    PHPStanTestCase::class,
+    false
+) && interface_exists(Node::class, false)) {
     return;
 }
+
 require_once __DIR__ . '/../../../vendor/nikic/php-parser/lib/PhpParser/Node.php';
 require_once __DIR__ . '/src/Contract/PhpParser/Node/StmtsAwareInterface.php';
 require_once __DIR__ . '/../../../vendor/nikic/php-parser/lib/PhpParser/NodeAbstract.php';

preload.php

@@ -2,16 +2,23 @@
 
 declare(strict_types=1);
 
+use PhpParser\Node;
+use PHPStan\Testing\PHPStanTestCase;
+
 if (defined('__PHPSTAN_RUNNING__')) {
     return;
 }
 
 // edge case during Rector tests case, happens when
 // 1. phpstan autoload test case is triggered first,
 // 2. all php-parser classes are loaded,
-if (defined('PHPUNIT_COMPOSER_INSTALL') && class_exists(\PHPStan\Testing\PHPStanTestCase::class, false) && interface_exists(\PhpParser\Node::class, false)) {
+if (defined('PHPUNIT_COMPOSER_INSTALL') && class_exists(
+    PHPStanTestCase::class,
+    false
+) && interface_exists(Node::class, false)) {
     return;
 }
+
 require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/Node.php';
 require_once __DIR__ . '/src/Contract/PhpParser/Node/StmtsAwareInterface.php';
 require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/NodeAbstract.php';

rules/TypeDeclarationDocblocks/Rector/ClassMethod/AddParamArrayDocblockBasedOnArrayMapRector.php

@@ -11,11 +11,6 @@
 use PhpParser\Node\Stmt\Function_;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\MixedType;
-<<<<<<< HEAD
-=======
-use PHPStan\Type\Type;
-use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
->>>>>>> a264677ce8 ([autoload] Add workaround for phpstan + rector tests co-run to avoid duplicated php-parser loading error)
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Rector\AbstractRector;
 use Rector\StaticTypeMapper\StaticTypeMapper;
@@ -152,31 +147,4 @@ private function isArrayParam(Param $param): bool
 
         return $this->isName($param->type, 'array');
     }
-<<<<<<< HEAD
-=======
-
-    private function isMixedArrayType(Type $type): bool
-    {
-        if (! $type instanceof ArrayType) {
-            return false;
-        }
-
-        if (! $type->getItemType() instanceof MixedType) {
-            return false;
-        }
-
-        return $type->getKeyType() instanceof MixedType;
-    }
-
-    private function isAlreadyNonMixedParamType(PhpDocInfo $functionPhpDocInfo, string $paramName): bool
-    {
-        $currentParamType = $functionPhpDocInfo->getParamType($paramName);
-        if ($currentParamType instanceof MixedType) {
-            return false;
-        }
-
-        // has useful param type already?
-        return ! $this->isMixedArrayType($currentParamType);
-    }
->>>>>>> a264677ce8 ([autoload] Add workaround for phpstan + rector tests co-run to avoid duplicated php-parser loading error)
 }

src/BetterPhpDocParser/PhpDocManipulator/PhpDocTypeChanger.php

@@ -7,7 +7,6 @@
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt;
-use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
 use PHPStan\PhpDocParser\Ast\Node;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;