fix rector rule test

TomasVotruba · TomasVotruba · commit 223312192f81 · 2024-12-16T00:36:14.000+01:00
diff --git a/composer-dependency-analyser.php b/composer-dependency-analyser.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use ShipMonk\ComposerDependencyAnalyser\Config\Configuration;
+
+$config = new Configuration();
+
+return $config->addPathToScan(__DIR__ . '/src', false)
+    // ->ignoreErrorsOnPath('/Fixture/', [\ShipMonk\ComposerDependencyAnalyser\Config\ErrorType::UNKNOWN_CLASS]);
+;
diff --git a/composer.json b/composer.json
@@ -18,7 +18,9 @@
         "rector/rector": "^2.0",
         "phpstan/extension-installer": "^1.4",
         "symplify/phpstan-extensions": "^12.0",
-        "tomasvotruba/unused-public": "^2.0"
+        "tomasvotruba/unused-public": "^2.0",
+        "tomasvotruba/type-coverage": "^2.0",
+        "shipmonk/composer-dependency-analyser": "^1.8"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpstan.neon b/phpstan.neon
@@ -28,10 +28,10 @@ parameters:
         properties: true
         constants: true
 
-    # type_coverage:
-    #     return: 99
-    #     param: 99
-    #     property: 99
+    type_coverage:
+        return: 99
+        param: 99
+        property: 99
 
     ignoreErrors:
         # needless generics
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" cacheDirectory=".phpunit.cache">
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    bootstrap="vendor/autoload.php"
+    colors="true"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    displayDetailsOnIncompleteTests="true"
+    cacheDirectory=".phpunit.cache">
     <testsuite name="all">
         <directory>tests</directory>
         <exclude>tests/Rules/ClassNameRespectsParentSuffixRule/Fixture/</exclude>
diff --git a/phpunit.xml.bak b/phpunit.xml.bak
diff --git a/src/Composer/ComposerAutoloadResolver.php b/src/Composer/ComposerAutoloadResolver.php
@@ -4,6 +4,8 @@
 
 namespace Symplify\PHPStanRules\Composer;
 
+use Symplify\PHPStanRules\FileSystem\FileSystem;
+
 final class ComposerAutoloadResolver
 {
     /**
@@ -20,7 +22,7 @@ public function getPsr4Autoload(): array
             return [];
         }
 
-        $fileContent = \Symplify\PHPStanRules\FileSystem\FileSystem::read(self::COMPOSER_JSON_FILE);
+        $fileContent = FileSystem::read(self::COMPOSER_JSON_FILE);
         $composerJsonContent = json_decode($fileContent, true, 512, JSON_THROW_ON_ERROR);
 
         $autoloadPsr4 = $composerJsonContent['autoload']['psr-4'] ?? [];
diff --git a/src/Enum/ClassName.php b/src/Enum/ClassName.php
@@ -15,4 +15,19 @@ final class ClassName
      * @var string
      */
     public const NETTE_STRINGS = 'Nette\Utils\Strings';
+
+    /**
+     * @var string
+     */
+    public const SYMFONY_ABSTRACT_CONTROLLER = 'Symfony\Bundle\FrameworkBundle\Controller\AbstractController';
+
+    /**
+     * @var string
+     */
+    public const PHPUNIT_TEST_CASE = 'PHPUnit\Framework\TestCase';
+
+    /**
+     * @var string
+     */
+    public const EVENT_DISPATCHER_INTERFACE = 'Symfony\Component\EventDispatcher\EventSubscriberInterface';
 }
diff --git a/src/Naming/ClassToSuffixResolver.php b/src/Naming/ClassToSuffixResolver.php
@@ -40,7 +40,7 @@ private function removeAbstractInterfacePrefixSuffix(string $parentType): string
         }
 
         if (\str_starts_with($parentType, 'Abstract')) {
-            return substr($parentType, (int) strlen('Abstract'));
+            return substr($parentType, strlen('Abstract'));
         }
 
         return $parentType;
diff --git a/src/Reflection/Nested/Some.php b/src/Reflection/Nested/Some.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symplify\PHPStanRules\Reflection;
+
+class Some
+{
+}
diff --git a/src/Reflection/ReflectionParser.php b/src/Reflection/ReflectionParser.php
@@ -14,6 +14,7 @@
 use PHPStan\Reflection\MethodReflection;
 use ReflectionClass;
 use ReflectionMethod;
+use Symplify\PHPStanRules\FileSystem\FileSystem;
 use Symplify\PHPStanRules\NodeFinder\TypeAwareNodeFinder;
 use Throwable;
 
@@ -77,7 +78,7 @@ private function parseFilenameToClass(string $fileName): ClassLike|null
         }
 
         try {
-            $stmts = $this->parser->parse(\Symplify\PHPStanRules\FileSystem\FileSystem::read($fileName));
+            $stmts = $this->parser->parse(FileSystem::read($fileName));
             if (! is_array($stmts)) {
                 return null;
             }
diff --git a/src/Rules/AnnotateRegexClassConstWithRegexLinkRule.php b/src/Rules/AnnotateRegexClassConstWithRegexLinkRule.php
@@ -4,7 +4,6 @@
 
 namespace Symplify\PHPStanRules\Rules;
 
-use Nette\Utils\Strings;
 use PhpParser\Comment\Doc;
 use PhpParser\Node;
 use PhpParser\Node\Scalar\String_;
@@ -89,7 +88,8 @@ private function isNonSingleCharRegexPattern(string $value): bool
             return false;
         }
 
-        $lastChar = Strings::substring($patternWithoutModifiers, -1, 1);
+        $lastChar = substr($patternWithoutModifiers, -1, 1);
+
         // this is probably a regex
         return $firstChar === $lastChar;
     }
diff --git a/src/Rules/ClassNameRespectsParentSuffixRule.php b/src/Rules/ClassNameRespectsParentSuffixRule.php
@@ -14,10 +14,8 @@
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPUnit\Framework\TestCase;
 use Rector\Rector\AbstractRector;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symplify\PHPStanRules\Enum\ClassName;
 use Symplify\PHPStanRules\Enum\RuleIdentifier;
 use Symplify\PHPStanRules\Naming\ClassToSuffixResolver;
 
@@ -37,10 +35,10 @@ final class ClassNameRespectsParentSuffixRule implements Rule
      */
     private const DEFAULT_PARENT_CLASSES = [
         'Symfony\Component\Console\Command\Command',
-        EventSubscriberInterface::class,
-        AbstractController::class,
+        ClassName::EVENT_DISPATCHER_INTERFACE,
+        ClassName::SYMFONY_ABSTRACT_CONTROLLER,
         Sniff::class,
-        TestCase::class,
+        ClassName::PHPUNIT_TEST_CASE,
         Exception::class,
         'PhpCsFixer\Fixer\FixerInterface',
         Rule::class,
diff --git a/src/Rules/Rector/PhpUpgradeDowngradeRegisteredInSetRule.php b/src/Rules/Rector/PhpUpgradeDowngradeRegisteredInSetRule.php
@@ -18,6 +18,7 @@
 use SplFileInfo;
 use Symplify\PHPStanRules\Enum\RuleIdentifier;
 use Symplify\PHPStanRules\Exception\ShouldNotHappenException;
+use Symplify\PHPStanRules\FileSystem\FileSystem;
 
 /**
  * @see \Symplify\PHPStanRules\Tests\Rules\Rector\PhpUpgradeDowngradeRegisteredInSetRule\PhpUpgradeDowngradeRegisteredInSetRuleTest
@@ -57,7 +58,7 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
 
-        $configContent = \Symplify\PHPStanRules\FileSystem\FileSystem::read($configFilePath);
+        $configContent = FileSystem::read($configFilePath);
 
         // is rule registered?
         if (str_contains($configContent, $className)) {
diff --git a/src/Rules/SeeAnnotationToTestRule.php b/src/Rules/SeeAnnotationToTestRule.php
@@ -15,7 +15,7 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPUnit\Framework\TestCase;
+use Symplify\PHPStanRules\Enum\ClassName;
 use Symplify\PHPStanRules\Enum\RuleIdentifier;
 use Symplify\PHPStanRules\PhpDoc\PhpDocResolver;
 use Symplify\PHPStanRules\PhpDoc\SeePhpDocTagNodesFinder;
@@ -113,7 +113,7 @@ private function hasSeeTestCaseAnnotation(array $seeTags): bool
                 continue;
             }
 
-            if (is_a($seeTag->value->value, TestCase::class, true)) {
+            if (is_a($seeTag->value->value, ClassName::PHPUNIT_TEST_CASE, true)) {
                 return true;
             }
         }
diff --git a/src/Symfony/Rules/RequireInvokableControllerRule.php b/src/Symfony/Rules/RequireInvokableControllerRule.php
@@ -9,7 +9,7 @@
 use PHPStan\Node\InClassNode;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symplify\PHPStanRules\Enum\ClassName;
 use Symplify\PHPStanRules\Enum\MethodName;
 use Symplify\PHPStanRules\Enum\RuleIdentifier;
 use Symplify\PHPStanRules\Symfony\NodeAnalyzer\SymfonyControllerAnalyzer;
@@ -39,7 +39,7 @@ public function processNode(Node $node, Scope $scope): array
     {
         $classReflection = $node->getClassReflection();
         if (
-            ! $classReflection->isSubclassOf(AbstractController::class) &&
+            ! $classReflection->isSubclassOf(ClassName::SYMFONY_ABSTRACT_CONTROLLER) &&
             ! $classReflection->isSubclassOf('Symfony\Bundle\FrameworkBundle\Controller\Controller')
         ) {
             return [];
diff --git a/tests/Rules/ForbiddenFuncCallRule/Fixture/CurlCall.php b/tests/Rules/ForbiddenFuncCallRule/Fixture/CurlCall.php
diff --git a/tests/Rules/ForbiddenFuncCallRule/ForbiddenFuncCallRuleTest.php b/tests/Rules/ForbiddenFuncCallRule/ForbiddenFuncCallRuleTest.php
@@ -29,9 +29,6 @@ public static function provideData(): Iterator
         $errorMessage = sprintf(ForbiddenFuncCallRule::ERROR_MESSAGE, 'extract');
         yield [__DIR__ . '/Fixture/ExtractCall.php', [[$errorMessage, 11]]];
 
-        $errorMessage = sprintf(ForbiddenFuncCallRule::ERROR_MESSAGE, 'curl_init');
-        yield [__DIR__ . '/Fixture/CurlCall.php', [[$errorMessage, 11]]];
-
         $errorMessage = sprintf(ForbiddenFuncCallRule::ERROR_MESSAGE, 'property_exists');
         yield [__DIR__ . '/Fixture/PropertyExists.php', [[$errorMessage, 11]]];
 
diff --git a/tests/Rules/ForbiddenFuncCallRule/ForbiddenFuncCallRuleWithDeprecationsTest.php b/tests/Rules/ForbiddenFuncCallRule/ForbiddenFuncCallRuleWithDeprecationsTest.php
@@ -33,10 +33,6 @@ public static function provideData(): Iterator
         $errorMessage .= ': you shouldn"t use this dynamic things';
         yield [__DIR__ . '/Fixture/ExtractCall.php', [[$errorMessage, 11]]];
 
-        $errorMessage = sprintf(ForbiddenFuncCallRule::ERROR_MESSAGE, 'curl_init');
-        $errorMessage .= ': we use a proper http client these days';
-        yield [__DIR__ . '/Fixture/CurlCall.php', [[$errorMessage, 11]]];
-
         // custom error defined as empty-string -> just prints the default message
         $errorMessage = sprintf(ForbiddenFuncCallRule::ERROR_MESSAGE, 'property_exists');
         yield [__DIR__ . '/Fixture/PropertyExists.php', [[$errorMessage, 11]]];
diff --git a/tests/Rules/Rector/PhpUpgradeDowngradeRegisteredInSetRule/Fixture/DowngradePhp80/SomePhpFeature2Rector.php b/tests/Rules/Rector/PhpUpgradeDowngradeRegisteredInSetRule/Fixture/DowngradePhp80/SomePhpFeature2Rector.php
@@ -5,16 +5,10 @@
 namespace Symplify\PHPStanRules\Tests\Rules\Rector\PhpUpgradeDowngradeRegisteredInSetRule\Fixture\DowngradePhp80;
 
 use PhpParser\Node;
-use Rector\Contract\Rector\RectorInterface;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
-final class SomePhpFeature2Rector extends AbstractRector implements RectorInterface
+final class SomePhpFeature2Rector extends AbstractRector
 {
-    public function getRuleDefinition(): RuleDefinition
-    {
-    }
-
     public function getNodeTypes(): array
     {
         return [];
diff --git a/tests/Rules/Rector/PhpUpgradeDowngradeRegisteredInSetRule/Fixture/Php80/SomePhpFeatureRector.php b/tests/Rules/Rector/PhpUpgradeDowngradeRegisteredInSetRule/Fixture/Php80/SomePhpFeatureRector.php
@@ -4,12 +4,16 @@
 
 namespace Symplify\PHPStanRules\Tests\Rules\Rector\PhpUpgradeDowngradeRegisteredInSetRule\Fixture\Php80;
 
-use Rector\Contract\Rector\RectorInterface;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use PhpParser\Node;
+use Rector\Rector\AbstractRector;
 
-final class SomePhpFeatureRector implements RectorInterface
+final class SomePhpFeatureRector extends AbstractRector
 {
-    public function getRuleDefinition(): RuleDefinition
+    public function getNodeTypes(): array
+    {
+    }
+
+    public function refactor(Node $node)
     {
     }
 }
diff --git a/tests/Rules/Rector/PhpUpgradeDowngradeRegisteredInSetRule/PhpUpgradeDowngradeRegisteredInSetRuleTest.php b/tests/Rules/Rector/PhpUpgradeDowngradeRegisteredInSetRule/PhpUpgradeDowngradeRegisteredInSetRuleTest.php
@@ -8,23 +8,23 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
-use Rector\Contract\Rector\RectorInterface;
 use Symplify\PHPStanRules\Rules\Rector\PhpUpgradeDowngradeRegisteredInSetRule;
 use Symplify\PHPStanRules\Tests\Rules\Rector\PhpUpgradeDowngradeRegisteredInSetRule\Fixture\DowngradePhp80\SomePhpFeature2Rector;
 use Symplify\PHPStanRules\Tests\Rules\Rector\PhpUpgradeDowngradeRegisteredInSetRule\Fixture\Php80\SomePhpFeatureRector;
 
 final class PhpUpgradeDowngradeRegisteredInSetRuleTest extends RuleTestCase
 {
+    protected function setUp(): void
+    {
+        require_once __DIR__ . '/../../../../vendor/rector/rector/vendor/autoload.php';
+    }
+
     /**
      * @param mixed[] $expectedErrorsWithLines
      */
     #[DataProvider('provideData')]
     public function testRule(string $filePath, array $expectedErrorsWithLines): void
     {
-        if (! class_exists(RectorInterface::class)) {
-            $this->markTestIncomplete('Skip this test because Rector is not installed');
-        }
-
         $this->analyse([$filePath], $expectedErrorsWithLines);
     }
 
@@ -45,16 +45,11 @@ public static function provideData(): Iterator
             SomePhpFeature2Rector::class,
             'downgrade-php80.php'
         );
-        yield [__DIR__ . '/Fixture/DowngradePhp80/SomePhpFeature2Rector.php', [[$errorMessage, 12]]];
-    }
-
-    public static function getAdditionalConfigFiles(): array
-    {
-        return [__DIR__ . '/config/configured_rule.neon'];
+        yield [__DIR__ . '/Fixture/DowngradePhp80/SomePhpFeature2Rector.php', [[$errorMessage, 10]]];
     }
 
     protected function getRule(): Rule
     {
-        return self::getContainer()->getByType(PhpUpgradeDowngradeRegisteredInSetRule::class);
+        return new PhpUpgradeDowngradeRegisteredInSetRule();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace Symplify\PHPStanRules\Composer;`
`6`	`6`
	`7`	`+use Symplify\PHPStanRules\FileSystem\FileSystem;`
	`8`	`+`
`7`	`9`	`final class ComposerAutoloadResolver`
`8`	`10`	`{`
`9`	`11`	`/**`
`@@ -20,7 +22,7 @@ public function getPsr4Autoload(): array`
`20`	`22`	`return [];`
`21`	`23`	`}`
`22`	`24`
`23`		`- $fileContent = \Symplify\PHPStanRules\FileSystem\FileSystem::read(self::COMPOSER_JSON_FILE);`
	`25`	`+ $fileContent = FileSystem::read(self::COMPOSER_JSON_FILE);`
`24`	`26`	`$composerJsonContent = json_decode($fileContent, true, 512, JSON_THROW_ON_ERROR);`
`25`	`27`
`26`	`28`	`$autoloadPsr4 = $composerJsonContent['autoload']['psr-4'] ?? [];`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ private function removeAbstractInterfacePrefixSuffix(string $parentType): string`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`if (\str_starts_with($parentType, 'Abstract')) {`
`43`		`- return substr($parentType, (int) strlen('Abstract'));`
	`43`	`+ return substr($parentType, strlen('Abstract'));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`return $parentType;`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +<?php
++
 +namespace Symplify\PHPStanRules\Reflection;
++
 +class Some
 +{
 +}
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use PHPStan\Reflection\MethodReflection;`
`15`	`15`	`use ReflectionClass;`
`16`	`16`	`use ReflectionMethod;`
	`17`	`+use Symplify\PHPStanRules\FileSystem\FileSystem;`
`17`	`18`	`use Symplify\PHPStanRules\NodeFinder\TypeAwareNodeFinder;`
`18`	`19`	`use Throwable;`
`19`	`20`
`@@ -77,7 +78,7 @@ private function parseFilenameToClass(string $fileName): ClassLike\|null`
`77`	`78`	`}`
`78`	`79`
`79`	`80`	`try {`
`80`		`- $stmts = $this->parser->parse(\Symplify\PHPStanRules\FileSystem\FileSystem::read($fileName));`
	`81`	`+ $stmts = $this->parser->parse(FileSystem::read($fileName));`
`81`	`82`	`if (! is_array($stmts)) {`
`82`	`83`	`return null;`
`83`	`84`	`}`