misc: drop support for PHP 8.0

PHP 8.0 security support has ended on the 26th of November 2023. See: https://www.php.net/supported-versions.php
CuyZ · Feb 8, 2024 · dafcc80 · dafcc80
1 parent 3afd7fa
commit dafcc80
Show file tree

Hide file tree

Showing 114 changed files with 532 additions and 1,028 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,6 @@ jobs:
           - "highest"
           - "locked"
         php-version:
-          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -9,12 +9,8 @@
     ->notPath('Fixtures/FunctionWithSeveralImportStatementsInSameUseStatement.php')
     ->notPath('Fixtures/TwoClassesInDifferentNamespaces.php');
 
-if (PHP_VERSION_ID < 8_01_00) {
-    $finder = $finder->notPath('Fixture/Enum/PureEnum.php');
-    $finder = $finder->notPath('Fixture/Enum/BackedStringEnum.php');
-    $finder = $finder->notPath('Fixture/Enum/BackedIntegerEnum.php');
-    $finder = $finder->notPath('Fixture/Object/ObjectWithPropertyWithNativeIntersectionType.php');
-    $finder = $finder->notPath('Integration/Mapping/Fixture/ReadonlyValues.php');
+if (PHP_VERSION_ID < 8_02_00) {
+    $finder = $finder->notPath('Fixture/Object/ObjectWithPropertyWithNativeDisjunctiveNormalFormType.php');
 }
 
 return (new PhpCsFixer\Config())

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "composer-runtime-api": "^2.0",
         "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/rector.php b/rector.php
@@ -4,11 +4,12 @@
 
 use Rector\Caching\ValueObject\Storage\FileCacheStorage;
 use Rector\Config\RectorConfig;
-use Rector\Core\Configuration\Option;
 use Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector;
 use Rector\Php74\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
 use Rector\Php80\Rector\FunctionLike\MixedTypeRector;
+use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
+use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
 use Rector\Set\ValueObject\LevelSetList;
 
 return static function (RectorConfig $config): void {
@@ -18,22 +19,26 @@
         __DIR__ . '/tests',
     ]);
 
-    $config->parameters()->set(Option::CACHE_DIR, './var/cache/rector');
+    $config->cacheDirectory(__DIR__ . '/var/cache/rector');
 
     // @see https://github.com/rectorphp/rector/issues/7341
-    $config->parameters()->set(Option::CACHE_CLASS, FileCacheStorage::class);
+    $config->cacheClass(FileCacheStorage::class);
 
     $config->sets([
-        LevelSetList::UP_TO_PHP_80,
+        LevelSetList::UP_TO_PHP_81,
     ]);
 
     $config->parallel();
     $config->skip([
         AddLiteralSeparatorToNumberRector::class,
         ClassPropertyAssignToConstructorPromotionRector::class,
+        ReadOnlyPropertyRector::class,
         MixedTypeRector::class => [
             __DIR__ . '/tests/Unit/Definition/Repository/Reflection/ReflectionClassDefinitionRepositoryTest',
         ],
+        NullToStrictStringFuncCallArgRector::class => [
+            __DIR__ . '/tests/Traits/TestIsSingleton.php',
+        ],
         RestoreDefaultNullToNullableTypePropertyRector::class => [
             __DIR__ . '/tests/Integration/Mapping/Other/FlexibleCastingMappingTest.php',
             __DIR__ . '/tests/Integration/Mapping/SingleNodeMappingTest',

diff --git a/src/Cache/FileWatchingCache.php b/src/Cache/FileWatchingCache.php
@@ -125,15 +125,15 @@ private function saveTimestamps(string $key, mixed $value): void
         $fileNames = [];
 
         if ($value instanceof ClassDefinition) {
-            $reflection = Reflection::class($value->name());
+            $reflection = Reflection::class($value->name);
 
             do {
                 $fileNames[] = $reflection->getFileName();
             } while ($reflection = $reflection->getParentClass());
         }
 
         if ($value instanceof FunctionDefinition) {
-            $fileNames[] = $value->fileName();
+            $fileNames[] = $value->fileName;
         }
 
         foreach ($fileNames as $fileName) {

diff --git a/src/Cache/Warmup/RecursiveCacheWarmupService.php b/src/Cache/Warmup/RecursiveCacheWarmupService.php
@@ -82,10 +82,10 @@ private function warmupInterfaceType(InterfaceType $type): void
 
         $function = $this->implementations->function($interfaceName);
 
-        $this->warmupType($function->returnType());
+        $this->warmupType($function->returnType);
 
-        foreach ($function->parameters() as $parameter) {
-            $this->warmupType($parameter->type());
+        foreach ($function->parameters as $parameter) {
+            $this->warmupType($parameter->type);
         }
     }
 

diff --git a/src/Definition/AttributeDefinition.php b/src/Definition/AttributeDefinition.php
@@ -8,26 +8,13 @@
 final class AttributeDefinition
 {
     public function __construct(
-        private ClassDefinition $class,
+        public readonly ClassDefinition $class,
         /** @var list<mixed> */
-        private array $arguments,
+        public readonly array $arguments,
     ) {}
 
-    public function class(): ClassDefinition
-    {
-        return $this->class;
-    }
-
-    /**
-     * @return list<mixed>
-     */
-    public function arguments(): array
-    {
-        return $this->arguments;
-    }
-
     public function instantiate(): object
     {
-        return new ($this->class->type()->className())(...$this->arguments);
+        return new ($this->class->type->className())(...$this->arguments);
     }
 }
diff --git a/src/Definition/Attributes.php b/src/Definition/Attributes.php
@@ -40,7 +40,7 @@ public static function empty(): self
     public function has(string $className): bool
     {
         foreach ($this->attributes as $attribute) {
-            if (is_a($attribute->class()->type()->className(), $className, true)) {
+            if (is_a($attribute->class->type->className(), $className, true)) {
                 return true;
             }
         }

diff --git a/src/Definition/ClassDefinition.php b/src/Definition/ClassDefinition.php
@@ -10,49 +10,13 @@
 final class ClassDefinition
 {
     public function __construct(
-        private ClassType $type,
-        private Attributes $attributes,
-        private Properties $properties,
-        private Methods $methods,
-        private bool $isFinal,
-        private bool $isAbstract,
+        /** @var class-string */
+        public readonly string $name,
+        public readonly ClassType $type,
+        public readonly Attributes $attributes,
+        public readonly Properties $properties,
+        public readonly Methods $methods,
+        public readonly bool $isFinal,
+        public readonly bool $isAbstract,
     ) {}
-
-    /**
-     * @return class-string
-     */
-    public function name(): string
-    {
-        return $this->type->className();
-    }
-
-    public function type(): ClassType
-    {
-        return $this->type;
-    }
-
-    public function attributes(): Attributes
-    {
-        return $this->attributes;
-    }
-
-    public function properties(): Properties
-    {
-        return $this->properties;
-    }
-
-    public function methods(): Methods
-    {
-        return $this->methods;
-    }
-
-    public function isFinal(): bool
-    {
-        return $this->isFinal;
-    }
-
-    public function isAbstract(): bool
-    {
-        return $this->isAbstract;
-    }
 }
diff --git a/src/Definition/FunctionDefinition.php b/src/Definition/FunctionDefinition.php
@@ -10,63 +10,15 @@
 final class FunctionDefinition
 {
     public function __construct(
-        private string $name,
-        private string $signature,
-        private Attributes $attributes,
-        private ?string $fileName,
+        public readonly string $name,
+        public readonly string $signature,
+        public readonly Attributes $attributes,
+        public readonly ?string $fileName,
         /** @var class-string|null */
-        private ?string $class,
-        private bool $isStatic,
-        private bool $isClosure,
-        private Parameters $parameters,
-        private Type $returnType
+        public readonly ?string $class,
+        public readonly bool $isStatic,
+        public readonly bool $isClosure,
+        public readonly Parameters $parameters,
+        public readonly Type $returnType
     ) {}
-
-    public function name(): string
-    {
-        return $this->name;
-    }
-
-    public function signature(): string
-    {
-        return $this->signature;
-    }
-
-    public function attributes(): Attributes
-    {
-        return $this->attributes;
-    }
-
-    public function fileName(): ?string
-    {
-        return $this->fileName;
-    }
-
-    /**
-     * @return class-string|null
-     */
-    public function class(): ?string
-    {
-        return $this->class;
-    }
-
-    public function isStatic(): bool
-    {
-        return $this->isStatic;
-    }
-
-    public function isClosure(): bool
-    {
-        return $this->isClosure;
-    }
-
-    public function parameters(): Parameters
-    {
-        return $this->parameters;
-    }
-
-    public function returnType(): Type
-    {
-        return $this->returnType;
-    }
 }
diff --git a/src/Definition/FunctionObject.php b/src/Definition/FunctionObject.php
@@ -7,24 +7,14 @@
 /** @internal */
 final class FunctionObject
 {
-    private FunctionDefinition $definition;
+    public readonly FunctionDefinition $definition;
 
     /** @var callable */
-    private $callback;
+    public readonly mixed $callback;
 
     public function __construct(FunctionDefinition $definition, callable $callback)
     {
         $this->definition = $definition;
         $this->callback = $callback;
     }
-
-    public function definition(): FunctionDefinition
-    {
-        return $this->definition;
-    }
-
-    public function callback(): callable
-    {
-        return $this->callback;
-    }
 }
diff --git a/src/Definition/MethodDefinition.php b/src/Definition/MethodDefinition.php
@@ -10,41 +10,11 @@
 final class MethodDefinition
 {
     public function __construct(
-        private string $name,
-        private string $signature,
-        private Parameters $parameters,
-        private bool $isStatic,
-        private bool $isPublic,
-        private Type $returnType
+        public readonly string $name,
+        public readonly string $signature,
+        public readonly Parameters $parameters,
+        public readonly bool $isStatic,
+        public readonly bool $isPublic,
+        public readonly Type $returnType
     ) {}
-
-    public function name(): string
-    {
-        return $this->name;
-    }
-
-    public function signature(): string
-    {
-        return $this->signature;
-    }
-
-    public function parameters(): Parameters
-    {
-        return $this->parameters;
-    }
-
-    public function isStatic(): bool
-    {
-        return $this->isStatic;
-    }
-
-    public function isPublic(): bool
-    {
-        return $this->isPublic;
-    }
-
-    public function returnType(): Type
-    {
-        return $this->returnType;
-    }
 }
diff --git a/src/Definition/Methods.php b/src/Definition/Methods.php
@@ -21,7 +21,7 @@ final class Methods implements IteratorAggregate, Countable
     public function __construct(MethodDefinition ...$methods)
     {
         foreach ($methods as $method) {
-            $this->methods[$method->name()] = $method;
+            $this->methods[$method->name] = $method;
         }
     }