Bump to PHP 8.3

bin/behastan.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Rector\Behastan\DependencyInjection\ContainerFactory;
+use Rector\Behastan\DependencyInjection\BehastanContainerFactory;
 
 $possibleAutoloadPaths = [
     // dependency
@@ -25,7 +25,7 @@
     require_once $scoperAutoloadFilepath;
 }
 
-$container = ContainerFactory::create();
+$container = BehastanContainerFactory::create();
 $consoleApplication = $container->make(\Entropy\Console\ConsoleApplication::class);
 
 $exitCode = $consoleApplication->run($argv);

composer.json

@@ -6,7 +6,7 @@
         "bin/behastan"
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "nette/utils": "^4.0",
         "entropy/entropy": "dev-main",
         "nikic/php-parser": "^5.6",
@@ -15,11 +15,12 @@
     },
     "require-dev": {
         "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan": "^2.1",
-        "phpunit/phpunit": "^11.5",
-        "rector/rector": "^2.2",
-        "phpecs/phpecs": "^2.2",
-        "tomasvotruba/class-leak": "^2.0",
+        "phpstan/phpstan": "^2.1.34",
+        "phpunit/phpunit": "^12.5",
+        "rector/jack": "^0.5.1",
+        "rector/rector": "^2.3.2",
+        "symplify/easy-coding-standard": "^13.0",
+        "tomasvotruba/class-leak": "^2.1",
         "tracy/tracy": "^2.10"
     },
     "autoload": {

rector.php

@@ -11,6 +11,7 @@
         codeQuality: true,
         deadCode: true,
         typeDeclarations: true,
+        typeDeclarationDocblocks: true,
         privatization: true,
         earlyReturn: true,
         codingStyle: true,

src/Analyzer/PatternAnalyzer.php

@@ -6,10 +6,7 @@
 
 final class PatternAnalyzer
 {
-    /**
-     * @var string
-     */
-    private const PATTERN_REGEX = '#(\:[\W\w]+)#';
+    private const string PATTERN_REGEX = '#(\:[\W\w]+)#';
 
     public static function isRegex(string $rawPattern): bool
     {

src/Analyzer/UnusedDefinitionsAnalyzer.php

@@ -5,7 +5,6 @@
 namespace Rector\Behastan\Analyzer;
 
 use Nette\Utils\Strings;
-use Rector\Behastan\DefinitionPatternsExtractor;
 use Rector\Behastan\UsedInstructionResolver;
 use Rector\Behastan\ValueObject\Pattern\AbstractPattern;
 use Rector\Behastan\ValueObject\Pattern\ExactPattern;
@@ -21,14 +20,10 @@
  */
 final readonly class UnusedDefinitionsAnalyzer
 {
-    /**
-     * @var string
-     */
-    private const PATTERN_VALUE_REGEX = '#(\:[\W\w]+)#';
+    private const string PATTERN_VALUE_REGEX = '#(\:[\W\w]+)#';
 
     public function __construct(
         private UsedInstructionResolver $usedInstructionResolver,
-        private DefinitionPatternsExtractor $definitionPatternsExtractor,
     ) {
     }
 
@@ -40,18 +35,10 @@ public function __construct(
      */
     public function analyse(array $contextFiles, array $featureFiles, PatternCollection $patternCollection): array
     {
-        Assert::allIsInstanceOf($contextFiles, SplFileInfo::class);
-        foreach ($contextFiles as $contextFile) {
-            Assert::endsWith($contextFile->getFilename(), '.php');
-        }
-
-        Assert::allIsInstanceOf($featureFiles, SplFileInfo::class);
         foreach ($featureFiles as $featureFile) {
             Assert::endsWith($featureFile->getFilename(), '.feature');
         }
 
-        $patternCollection = $this->definitionPatternsExtractor->extract($contextFiles);
-
         $featureInstructions = $this->usedInstructionResolver->resolveInstructionsFromFeatureFiles($featureFiles);
 
         $unusedPatterns = [];

src/DefinitionPatternsExtractor.php

@@ -19,6 +19,7 @@
 use Rector\Behastan\ValueObject\Pattern\SkippedPattern;
 use Rector\Behastan\ValueObject\PatternCollection;
 use SplFileInfo;
+use Webmozart\Assert\Assert;
 
 #[RelatedTest(DefinitionPatternExtractorTest::class)]
 final readonly class DefinitionPatternsExtractor
@@ -35,6 +36,10 @@ public function __construct(
      */
     public function extract(array $contextFiles): PatternCollection
     {
+        foreach ($contextFiles as $contextFile) {
+            Assert::endsWith($contextFile->getFilename(), '.php');
+        }
+
         $patterns = [];
 
         $classMethodContextDefinitions = $this->resolvePatternsFromFiles($contextFiles);

src/DependencyInjection/ContainerFactory.php → src/DependencyInjection/BehastanContainerFactory.php

@@ -8,7 +8,7 @@
 use Rector\Behastan\Contract\RuleInterface;
 use Rector\Behastan\RulesRegistry;
 
-final class ContainerFactory
+final class BehastanContainerFactory
 {
     public static function create(): Container
     {

src/Enum/RuleIdentifier.php

@@ -6,18 +6,9 @@
 
 final class RuleIdentifier
 {
-    /**
-     * @var string
-     */
-    public const DUPLICATED_CONTENTS = 'duplicated-contents';
+    public const string DUPLICATED_CONTENTS = 'duplicated-contents';
 
-    /**
-     * @var string
-     */
-    public const DUPLICATED_PATTERNS = 'duplicated-patterns';
+    public const string DUPLICATED_PATTERNS = 'duplicated-patterns';
 
-    /**
-     * @var string
-     */
-    public const UNUSED_DEFINITIONS = 'unused-definitions';
+    public const string UNUSED_DEFINITIONS = 'unused-definitions';
 }

src/Resolver/ClassMethodPatternResolver.php

@@ -10,10 +10,7 @@
 
 final class ClassMethodPatternResolver
 {
-    /**
-     * @var string
-     */
-    private const INSTRUCTION_DOCBLOCK_REGEX = '#\@(Given|Then|When)\s+(?<instruction>.*?)\n#m';
+    private const string INSTRUCTION_DOCBLOCK_REGEX = '#\@(Given|Then|When)\s+(?<instruction>.*?)\n#m';
 
     /**
      * @return string[]

src/UsedInstructionResolver.php

@@ -7,6 +7,7 @@
 use Nette\Utils\Strings;
 use RuntimeException;
 use Symfony\Component\Finder\SplFileInfo;
+use Webmozart\Assert\Assert;
 
 /**
  * @see \Rector\Behastan\Tests\UsedInstructionResolver\UsedInstructionResolverTest
@@ -19,6 +20,10 @@ final class UsedInstructionResolver
      */
     public function resolveInstructionsFromFeatureFiles(array $featureFileInfos): array
     {
+        foreach ($featureFileInfos as $featureFileInfo) {
+            Assert::endsWith($featureFileInfo->getFilename(), '.feature');
+        }
+
         $instructions = [];
 
         foreach ($featureFileInfos as $featureFileInfo) {

tests/AbstractTestCase.php

@@ -6,16 +6,16 @@
 
 use Entropy\Container\Container;
 use PHPUnit\Framework\TestCase;
-use Rector\Behastan\DependencyInjection\ContainerFactory;
+use Rector\Behastan\DependencyInjection\BehastanContainerFactory;
 
 abstract class AbstractTestCase extends TestCase
 {
     private Container $container;
 
     protected function setUp(): void
     {
-        $containerFactory = new ContainerFactory();
-        $this->container = $containerFactory->create();
+        $behastanContainerFactory = new BehastanContainerFactory();
+        $this->container = $behastanContainerFactory->create();
     }
 
     /**