Bump to PHP 8.1

TomasVotruba · Jul 26, 2023 · 7558d0d · 7558d0d
1 parent aef369d
commit 7558d0d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 44 deletions.
diff --git a/rector.php b/rector.php
@@ -20,7 +20,7 @@
     ]);
 
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_74,
+        LevelSetList::UP_TO_PHP_81,
         \Rector\PHPUnit\Set\PHPUnitSetList::PHPUNIT_100,
     ]);
 };
diff --git a/src/Analyser.php b/src/Analyser.php
@@ -48,16 +48,14 @@
 use function is_string;
 use function rtrim;
 use function str_replace;
-use function strpos;
 use function strtolower;
-use function substr;
 use function substr_count;
 use function token_get_all;
 use function trim;
 
 final class Analyser
 {
-    private Collector $collector;
+    private readonly Collector $collector;
 
     private array $classes = [];
 
@@ -538,7 +536,7 @@ private function getClassName($namespace, array $tokens, $i)
             $className = $namespace . '\\' . $className;
         }
 
-        return strtolower($className);
+        return strtolower((string) $className);
     }
 
     /**
@@ -579,7 +577,7 @@ private function isTestClass($className)
 
         // Fallback: Treat the class as a test case class if the name
         // of the parent class ends with "TestCase".
-        return substr((string) $this->classes[$className], -8) === 'testcase';
+        return str_ends_with((string) $this->classes[$className], 'testcase');
     }
 
     /**
@@ -596,7 +594,7 @@ private function isTestMethod($functionName, $visibility, $static, array $tokens
             return false;
         }
 
-        if (strpos($functionName, 'test') === 0) {
+        if (str_starts_with($functionName, 'test')) {
             return true;
         }
 
@@ -608,8 +606,8 @@ private function isTestMethod($functionName, $visibility, $static, array $tokens
             $currentToken--;
         }
 
-        return strpos($tokens[$currentToken][1], '@test') !== false ||
-               strpos($tokens[$currentToken][1], '@scenario') !== false;
+        return str_contains((string) $tokens[$currentToken][1], '@test') ||
+               str_contains((string) $tokens[$currentToken][1], '@scenario');
     }
 
     /**

diff --git a/src/CLI/Arguments.php b/src/CLI/Arguments.php
@@ -3,38 +3,25 @@
 
 final class Arguments
 {
-    /**
-     * @psalm-var list<string>
-     */
-    private array $directories;
-
-    /**
-     * @psalm-var list<string>
-     */
-    private array $suffixes;
-
-    /**
-     * @psalm-var list<string>
-     */
-    private array $exclude;
-
-    private bool $countTests;
-
-    private ?string $jsonLogfile = null;
-
-    private bool $help;
-
-    private bool $version;
-
-    public function __construct(array $directories, array $suffixes, array $exclude, bool $countTests, ?string $jsonLogfile, bool $help, bool $version)
+    public function __construct(
+        /**
+         * @psalm-var list<string>
+         */
+        private readonly array $directories,
+        /**
+         * @psalm-var list<string>
+         */
+        private readonly array $suffixes,
+        /**
+         * @psalm-var list<string>
+         */
+        private readonly array $exclude,
+        private readonly bool $countTests,
+        private readonly ?string $jsonLogfile,
+        private readonly bool $help,
+        private readonly bool $version
+    )
     {
-        $this->directories = $directories;
-        $this->suffixes    = $suffixes;
-        $this->exclude     = $exclude;
-        $this->countTests  = $countTests;
-        $this->jsonLogfile = $jsonLogfile;
-        $this->help        = $help;
-        $this->version     = $version;
     }
 
     /**

diff --git a/src/Collector.php b/src/Collector.php
@@ -28,7 +28,7 @@ public function getPublisher()
     public function addFile($filename): void
     {
         $this->increment('files');
-        $this->addUnique('directories', dirname($filename));
+        $this->addUnique('directories', dirname((string) $filename));
     }
 
     public function incrementLines($number): void

diff --git a/tests/_files/class_constants.php b/tests/_files/class_constants.php
@@ -2,8 +2,8 @@
 
 class ClassConstants
 {
-    public const IMPLICITLY_PUBLIC_CONSTANT = 'implicitly public';
-    public const EXPLICITLY_PUBLIC_CONSTANT = 'explicitly public';
+    final public const IMPLICITLY_PUBLIC_CONSTANT = 'implicitly public';
+    final public const EXPLICITLY_PUBLIC_CONSTANT = 'explicitly public';
     private /* a comment might be here */ const COMMENT_IN_DEFINTION = 'comment in definition';
     private const PRIVATE_CONSTANT = 'private';
     protected const PROTECTED_CONSTANT = 'protected';

diff --git a/tests/_files/source.php b/tests/_files/source.php
@@ -26,7 +26,7 @@ abstract class AnAbstractClass
  */
 class AClass extends AnAbstractClass implements AnInterface
 {
-    public const A_CLASS_CONSTANT = 'bar';
+    final public const A_CLASS_CONSTANT = 'bar';
 
     private static array $a = [];