CS: Follow rector rule changes

DerManoMann · DerManoMann · commit d47b25e64bbc · 2025-07-23T15:06:44.000+12:00
diff --git a/rector.php b/rector.php
@@ -11,6 +11,7 @@
 use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
 use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
+use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByMethodCallTypeRector;
 use Rector\ValueObject\PhpVersion;
 
@@ -35,6 +36,7 @@
         ParamTypeByMethodCallTypeRector::class => [
             __DIR__ . '/src/Serializer.php',
         ],
+        ClassPropertyAssignToConstructorPromotionRector::class,
     ])
     ->withPreparedSets(
         deadCode: true,
diff --git a/src/Analysers/ComposerAutoloaderScanner.php b/src/Analysers/ComposerAutoloaderScanner.php
@@ -29,7 +29,7 @@ public function scan(array $namespaces): array
         if ($autoloader = static::getComposerAutoloader()) {
             foreach (array_keys($autoloader->getClassMap()) as $unit) {
                 foreach ($namespaces as $namespace) {
-                    if (0 === strpos($unit, $namespace)) {
+                    if (str_starts_with($unit, $namespace)) {
                         $units[] = $unit;
                         break;
                     }
diff --git a/src/Analysers/DocBlockAnnotationFactory.php b/src/Analysers/DocBlockAnnotationFactory.php
@@ -41,16 +41,16 @@ public function build(\Reflector $reflector, Context $context): array
         $aliases = $this->generator ? $this->generator->getAliases() : [];
 
         if (method_exists($reflector, 'getShortName') && method_exists($reflector, 'getName')) {
-            $aliases[strtolower($reflector->getShortName())] = $reflector->getName();
+            $aliases[strtolower((string) $reflector->getShortName())] = $reflector->getName();
         }
 
         if ($context->with('scanned')) {
             $details = $context->scanned;
             foreach ($details['uses'] as $alias => $name) {
-                $aliasKey = strtolower($alias);
+                $aliasKey = strtolower((string) $alias);
                 if ($name != $alias && !array_key_exists($aliasKey, $aliases)) {
                     // real aliases only
-                    $aliases[strtolower($alias)] = $name;
+                    $aliases[strtolower((string) $alias)] = $name;
                 }
             }
         }
diff --git a/src/Analysers/TokenScanner.php b/src/Analysers/TokenScanner.php
@@ -71,7 +71,7 @@ protected function collect_stmts(array $stmts, string $namespace): array
         };
         $result = [];
         foreach ($stmts as $stmt) {
-            switch (get_class($stmt)) {
+            switch ($stmt::class) {
                 case Use_::class:
                     $uses += $this->collect_uses($stmt);
                     break;
diff --git a/src/Annotations/AbstractAnnotation.php b/src/Annotations/AbstractAnnotation.php
@@ -237,7 +237,7 @@ public function mergeProperties($object): void
                 if (Generator::isDefault($value)) {
                     continue;
                 }
-                $identity = method_exists($object, 'identity') ? $object->identity() : get_class($object);
+                $identity = method_exists($object, 'identity') ? $object->identity() : $object::class;
                 $context1 = $this->_context;
                 $context2 = property_exists($object, '_context') ? $object->_context : 'unknown';
                 if ($this->{$property} instanceof AbstractAnnotation) {
@@ -449,13 +449,13 @@ public function validate(array $stack = [], array $skip = [], string $ref = '',
             }
 
             /** @var class-string<AbstractAnnotation> $class */
-            $class = get_class($annotation);
+            $class = $annotation::class;
             if ($details = $this->matchNested($annotation)) {
                 $property = $details->value;
                 if (is_array($property)) {
-                    $this->_context->logger->warning('Only one ' . static::shorten(get_class($annotation)) . '() allowed for ' . $this->identity() . ' multiple found, skipped: ' . $annotation->_context);
+                    $this->_context->logger->warning('Only one ' . static::shorten($annotation::class) . '() allowed for ' . $this->identity() . ' multiple found, skipped: ' . $annotation->_context);
                 } else {
-                    $this->_context->logger->warning('Only one ' . static::shorten(get_class($annotation)) . '() allowed for ' . $this->identity() . " multiple found in:\n    Using: " . $this->{$property}->_context . "\n  Skipped: " . $annotation->_context);
+                    $this->_context->logger->warning('Only one ' . static::shorten($annotation::class) . '() allowed for ' . $this->identity() . " multiple found in:\n    Using: " . $this->{$property}->_context . "\n  Skipped: " . $annotation->_context);
                 }
             } elseif ($annotation instanceof AbstractAnnotation) {
                 $message = 'Unexpected ' . $annotation->identity();
@@ -493,7 +493,7 @@ public function validate(array $stack = [], array $skip = [], string $ref = '',
         }
 
         if (property_exists($this, 'ref') && !Generator::isDefault($this->ref) && is_string($this->ref)) {
-            if (substr($this->ref, 0, 2) === '#/' && $stack !== [] && $stack[0] instanceof OpenApi) {
+            if (str_starts_with($this->ref, '#/') && $stack !== [] && $stack[0] instanceof OpenApi) {
                 // Internal reference
                 try {
                     $stack[0]->ref($this->ref);
@@ -540,7 +540,7 @@ public function validate(array $stack = [], array $skip = [], string $ref = '',
                     $this->_context->logger->warning($this->identity() . '->' . $property . ' "' . $value . '" is invalid, expecting "' . implode('", "', $type) . '" in ' . $this->_context);
                 }
             } else {
-                throw new OpenApiException('Invalid ' . get_class($this) . '::$_types[' . $property . ']');
+                throw new OpenApiException('Invalid ' . static::class . '::$_types[' . $property . ']');
             }
         }
         $stack[] = $this;
@@ -599,7 +599,7 @@ private static function _validate($fields, array $stack, array $skip, string $ba
      */
     public function identity(): string
     {
-        $class = get_class($this);
+        $class = static::class;
         $properties = [];
         /** @var class-string<AbstractAnnotation> $parent */
         foreach (static::$_parents as $parent) {
@@ -640,10 +640,10 @@ public function matchNested($other)
      */
     public function getRoot(): string
     {
-        $class = get_class($this);
+        $class = static::class;
 
         do {
-            if (0 === strpos($class, 'OpenApi\\Annotations\\')) {
+            if (str_starts_with($class, 'OpenApi\\Annotations\\')) {
                 break;
             }
         } while ($class = get_parent_class($class));
@@ -658,7 +658,7 @@ public function getRoot(): string
      */
     public function isRoot(string $rootClass): bool
     {
-        return get_class($this) === $rootClass || $this->getRoot() === $rootClass;
+        return static::class === $rootClass || $this->getRoot() === $rootClass;
     }
 
     /**
@@ -674,7 +674,7 @@ protected function _identity(array $properties): string
             }
         }
 
-        return static::shorten(get_class($this)) . '(' . implode(',', $fields) . ')';
+        return static::shorten(static::class) . '(' . implode(',', $fields) . ')';
     }
 
     /**
@@ -685,7 +685,7 @@ protected function _identity(array $properties): string
      */
     private function validateType(string $type, $value): bool
     {
-        if (substr($type, 0, 1) === '[' && substr($type, -1) === ']') { // Array of a specified type?
+        if (str_starts_with($type, '[') && str_ends_with($type, ']')) { // Array of a specified type?
             if ($this->validateType('array', $value) === false) {
                 return false;
             }
@@ -725,24 +725,16 @@ private function validateDefaultTypes(string $type, $value): bool
             return false;
         }
 
-        switch ($type) {
-            case 'string':
-                return is_string($value);
-            case 'boolean':
-                return is_bool($value);
-            case 'integer':
-                return is_int($value);
-            case 'number':
-                return is_numeric($value);
-            case 'object':
-                return is_object($value);
-            case 'array':
-                return $this->validateArrayType($value);
-            case 'scheme':
-                return in_array($value, ['http', 'https', 'ws', 'wss'], true);
-            default:
-                throw new OpenApiException('Invalid type "' . $type . '"');
-        }
+        return match ($type) {
+            'string' => is_string($value),
+            'boolean' => is_bool($value),
+            'integer' => is_int($value),
+            'number' => is_numeric($value),
+            'object' => is_object($value),
+            'array' => $this->validateArrayType($value),
+            'scheme' => in_array($value, ['http', 'https', 'ws', 'wss'], true),
+            default => throw new OpenApiException('Invalid type "' . $type . '"'),
+        };
     }
 
     /**
diff --git a/src/Annotations/OpenApi.php b/src/Annotations/OpenApi.php
@@ -192,7 +192,7 @@ public function saveAs(string $filename, string $format = 'auto'): void
      */
     public function ref(string $ref)
     {
-        if (substr($ref, 0, 2) !== '#/') {
+        if (!str_starts_with($ref, '#/')) {
             // @todo Add support for external (http) refs?
             throw new OpenApiException('Unsupported $ref "' . $ref . '", it should start with "#/"');
         }
@@ -219,7 +219,7 @@ private static function resolveRef(string $ref, string $resolved, $container, ar
 
         if (is_object($container)) {
             // support use x-* in ref
-            $xKey = strpos($property, 'x-') === 0 ? substr($property, 2) : null;
+            $xKey = str_starts_with($property, 'x-') ? substr($property, 2) : null;
             if ($xKey) {
                 if (!is_array($container->x) || !array_key_exists($xKey, $container->x)) {
                     $xKey = null;
diff --git a/src/Context.php b/src/Context.php
@@ -43,7 +43,7 @@
  * @property string|null                  $version     The OpenAPI version in use
  */
 #[\AllowDynamicProperties]
-class Context
+class Context implements \Stringable
 {
     /**
      * Prototypical inheritance for properties.
diff --git a/src/Generator.php b/src/Generator.php
@@ -158,7 +158,7 @@ protected function normaliseConfig(array $config): array
         $normalised = [];
         foreach ($config as $key => $value) {
             if (is_numeric($key)) {
-                $token = explode('=', $value);
+                $token = explode('=', (string) $value);
                 if (2 == count($token)) {
                     // 'operationId.hash=false'
                     [$key, $value] = $token;
@@ -169,7 +169,7 @@ protected function normaliseConfig(array $config): array
                 $value = 'true' == $value;
             }
 
-            if ($isList = ('[]' === substr($key, -2))) {
+            if ($isList = (str_ends_with($key, '[]'))) {
                 $key = substr($key, 0, -2);
             }
             $token = explode('.', $key);
diff --git a/src/Pipeline.php b/src/Pipeline.php
@@ -71,7 +71,7 @@ public function insert(callable $pipe, $matcher): Pipeline
     {
         if (is_string($matcher)) {
             $before = $matcher;
-            $matcher = function (array $pipes) use ($before) {
+            $matcher = function (array $pipes) use ($before): int|string|null {
                 foreach ($pipes as $ii => $current) {
                     if ($current instanceof $before) {
                         return $ii;
diff --git a/src/Processors/AugmentProperties.php b/src/Processors/AugmentProperties.php
@@ -170,7 +170,7 @@ protected function isNullable(string $typeDescription): bool
 
     protected function stripNull(string $typeDescription): string
     {
-        if (strpos($typeDescription, '|') === false) {
+        if (!str_contains($typeDescription, '|')) {
             return $typeDescription;
         }
         $types = [];
diff --git a/src/Processors/AugmentRefs.php b/src/Processors/AugmentRefs.php
@@ -47,7 +47,7 @@ protected function resolveAllOfRefs(Analysis $analysis): void
             foreach ($analysis->annotations as $annotation) {
                 if (property_exists($annotation, 'ref') && !Generator::isDefault($annotation->ref) && $annotation->ref !== null) {
                     foreach ($updatedRefs as $origRef => $updatedRef) {
-                        if (0 === strpos($annotation->ref, $origRef)) {
+                        if (str_starts_with($annotation->ref, $origRef)) {
                             $annotation->ref = str_replace($origRef, $updatedRef, $annotation->ref);
                         }
                     }
@@ -71,7 +71,7 @@ protected function resolveFQCNRefs(Analysis $analysis): void
                         $annotation->ref = OA\Components::ref($refSchema);
                     }
                 }
-                if (!$resolved && ($refAnnotation = $analysis->getAnnotationForSource($annotation->ref, get_class($annotation)))) {
+                if (!$resolved && ($refAnnotation = $analysis->getAnnotationForSource($annotation->ref, $annotation::class))) {
                     $annotation->ref = OA\Components::ref($refAnnotation);
                 }
             }
diff --git a/src/Processors/Concerns/DocblockTrait.php b/src/Processors/Concerns/DocblockTrait.php
@@ -41,7 +41,7 @@ public function isRoot(OA\AbstractAnnotation $annotation): bool
         foreach ($matchPriorityMap as $className => $strict) {
             foreach ($annotation->_context->annotations as $contextAnnotation) {
                 if ($strict) {
-                    if ($className === get_class($contextAnnotation)) {
+                    if ($className === $contextAnnotation::class) {
                         return $annotation === $contextAnnotation;
                     }
                 } else {
@@ -96,13 +96,13 @@ public function extractContent(?string $docblock, ?array &$tags = null): string
         $comment = preg_split('/(\n|\r\n)/', (string) $docblock);
         $comment[0] = preg_replace('/[ \t]*\\/\*\*/', '', $comment[0]); // strip '/**'
         $ii = count($comment) - 1;
-        $comment[$ii] = preg_replace('/\*\/[ \t]*$/', '', $comment[$ii]); // strip '*/'
+        $comment[$ii] = preg_replace('/\*\/[ \t]*$/', '', (string) $comment[$ii]); // strip '*/'
         $lines = [];
         $append = false;
         $skip = false;
         foreach ($comment as $line) {
-            $line = preg_replace('/^\s+\* ?/', '', $line);
-            if (substr($tagline = trim($line), 0, 1) === '@') {
+            $line = preg_replace('/^\s+\* ?/', '', (string) $line);
+            if (str_starts_with($tagline = trim((string) $line), '@')) {
                 $this->handleTag($tagline, $tags);
                 $skip = true;
             }
@@ -111,11 +111,11 @@ public function extractContent(?string $docblock, ?array &$tags = null): string
             }
             if ($append) {
                 $ii = count($lines) - 1;
-                $lines[$ii] = substr($lines[$ii], 0, -1) . $line;
+                $lines[$ii] = substr((string) $lines[$ii], 0, -1) . $line;
             } else {
                 $lines[] = $line;
             }
-            $append = (substr($line, -1) === '\\');
+            $append = (str_ends_with((string) $line, '\\'));
         }
         $description = trim(implode("\n", $lines));
         if ($description === '') {
@@ -133,11 +133,11 @@ public function extractSummary(?string $docblock): string
         if (!$content = $this->extractContent($docblock)) {
             return Generator::UNDEFINED;
         }
-        $lines = preg_split('/(\n|\r\n)/', $content);
+        $lines = preg_split('/(\n|\r\n)/', (string) $content);
         $summary = '';
         foreach ($lines as $line) {
             $summary .= $line . "\n";
-            if ($line === '' || substr($line, -1) === '.') {
+            if ($line === '' || str_ends_with($line, '.')) {
                 return trim($summary);
             }
         }
@@ -162,7 +162,7 @@ public function extractDescription(?string $docblock): string
         }
 
         $description = '';
-        if (false !== ($substr = substr($this->extractContent($docblock), strlen($summary)))) {
+        if (false !== ($substr = substr($this->extractContent($docblock), strlen((string) $summary)))) {
             $description = trim($substr);
         }
 
@@ -178,7 +178,7 @@ public function extractVarTypeAndDescription(?string $docblock): array
     {
         $comment = str_replace("\r\n", "\n", (string) $docblock);
         $comment = preg_replace('/\*\/[ \t]*$/', '', $comment); // strip '*/'
-        preg_match('/@var\s+(?<type>[^\s]+)([ \t])?(?<description>.+)?$/im', $comment, $matches);
+        preg_match('/@var\s+(?<type>[^\s]+)([ \t])?(?<description>.+)?$/im', (string) $comment, $matches);
 
         return array_merge(
             ['type' => null, 'description' => null],
@@ -191,7 +191,7 @@ public function extractVarTypeAndDescription(?string $docblock): array
      */
     public function extractExampleDescription(?string $docblock): ?string
     {
-        preg_match('/@example\s+([ \t])?(?<example>.+)?$/im', $docblock, $matches);
+        preg_match('/@example\s+([ \t])?(?<example>.+)?$/im', (string) $docblock, $matches);
 
         return $matches['example'] ?? null;
     }
diff --git a/src/Processors/Concerns/RefTrait.php b/src/Processors/Concerns/RefTrait.php
@@ -19,6 +19,6 @@ protected function toRefKey(Context $context, ?string $name): string
 
     protected function isRef(?string $ref): bool
     {
-        return $ref && 0 === strpos($ref, '#/');
+        return $ref && str_starts_with($ref, '#/');
     }
 }
diff --git a/src/Processors/ExpandEnums.php b/src/Processors/ExpandEnums.php
@@ -81,7 +81,7 @@ protected function expandContextEnum(Analysis $analysis): void
                 // no (or invalid) schema type means name
                 $useName = Generator::isDefault($schemaType) || ($enumType && $this->native2spec($enumType) != $schemaType);
 
-                $schema->enum = array_map(fn ($case) => ($useName || !($case instanceof \ReflectionEnumBackedCase)) ? $case->name : $case->getBackingValue(), $re->getCases());
+                $schema->enum = array_map(fn ($case): int|string => ($useName || !($case instanceof \ReflectionEnumBackedCase)) ? $case->name : $case->getBackingValue(), $re->getCases());
 
                 if ($this->enumNames !== null && !$useName) {
                     $schemaX = Generator::isDefault($schema->x) ? [] : $schema->x;
diff --git a/src/Serializer.php b/src/Serializer.php
@@ -106,7 +106,7 @@ protected function doDeserialize(\stdClass $c, string $class, Context $context):
                 $property = 'ref';
             }
 
-            if (substr($property, 0, 2) === 'x-') {
+            if (str_starts_with($property, 'x-')) {
                 if (Generator::isDefault($annotation->x)) {
                     $annotation->x = [];
                 }
@@ -186,7 +186,7 @@ protected function doDeserializeBaseProperty($type, $value, Context $context)
         $isAnnotationClass = is_string($type) && is_subclass_of(trim($type, '[]'), OA\AbstractAnnotation::class);
 
         if ($isAnnotationClass) {
-            $isArray = strpos($type, '[') === 0 && substr($type, -1) === ']';
+            $isArray = str_starts_with($type, '[') && str_ends_with($type, ']');
 
             if ($isArray) {
                 $annotationArr = [];
diff --git a/src/SourceFinder.php b/src/SourceFinder.php
@@ -49,8 +49,8 @@ public function __construct(string|array $directory, null|array|string $exclude
     private function getRelativePath(string $fullPath, array $directories): string
     {
         foreach ($directories as $directory) {
-            if (str_starts_with($directory, $fullPath)) {
-                $relativePath = substr($directory, strlen($fullPath));
+            if (str_starts_with((string) $directory, $fullPath)) {
+                $relativePath = substr((string) $directory, strlen($fullPath));
 
                 if ($relativePath !== '' && $relativePath !== '0') {
                     return trim($relativePath, '/');

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function scan(array $namespaces): array`
`29`	`29`	`if ($autoloader = static::getComposerAutoloader()) {`
`30`	`30`	`foreach (array_keys($autoloader->getClassMap()) as $unit) {`
`31`	`31`	`foreach ($namespaces as $namespace) {`
`32`		`- if (0 === strpos($unit, $namespace)) {`
	`32`	`+ if (str_starts_with($unit, $namespace)) {`
`33`	`33`	`$units[] = $unit;`
`34`	`34`	`break;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,16 +41,16 @@ public function build(\Reflector $reflector, Context $context): array`
`41`	`41`	`$aliases = $this->generator ? $this->generator->getAliases() : [];`
`42`	`42`
`43`	`43`	`if (method_exists($reflector, 'getShortName') && method_exists($reflector, 'getName')) {`
`44`		`- $aliases[strtolower($reflector->getShortName())] = $reflector->getName();`
	`44`	`+ $aliases[strtolower((string) $reflector->getShortName())] = $reflector->getName();`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`if ($context->with('scanned')) {`
`48`	`48`	`$details = $context->scanned;`
`49`	`49`	`foreach ($details['uses'] as $alias => $name) {`
`50`		`- $aliasKey = strtolower($alias);`
	`50`	`+ $aliasKey = strtolower((string) $alias);`
`51`	`51`	`if ($name != $alias && !array_key_exists($aliasKey, $aliases)) {`
`52`	`52`	`// real aliases only`
`53`		`- $aliases[strtolower($alias)] = $name;`
	`53`	`+ $aliases[strtolower((string) $alias)] = $name;`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`* @property string\|null $version The OpenAPI version in use`
`44`	`44`	`*/`
`45`	`45`	`#[\AllowDynamicProperties]`
`46`		`-class Context`
	`46`	`+class Context implements \Stringable`
`47`	`47`	`{`
`48`	`48`	`/**`
`49`	`49`	`* Prototypical inheritance for properties.`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function insert(callable $pipe, $matcher): Pipeline`
`71`	`71`	`{`
`72`	`72`	`if (is_string($matcher)) {`
`73`	`73`	`$before = $matcher;`
`74`		`- $matcher = function (array $pipes) use ($before) {`
	`74`	`+ $matcher = function (array $pipes) use ($before): int\|string\|null {`
`75`	`75`	`foreach ($pipes as $ii => $current) {`
`76`	`76`	`if ($current instanceof $before) {`
`77`	`77`	`return $ii;`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ protected function isNullable(string $typeDescription): bool`
`170`	`170`
`171`	`171`	`protected function stripNull(string $typeDescription): string`
`172`	`172`	`{`
`173`		`- if (strpos($typeDescription, '\|') === false) {`
	`173`	`+ if (!str_contains($typeDescription, '\|')) {`
`174`	`174`	`return $typeDescription;`
`175`	`175`	`}`
`176`	`176`	`$types = [];`