From bb7763b435ecf54f7ef7bc35421672564fdbddd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sat, 24 Jan 2026 22:05:57 +0100 Subject: [PATCH] Run Rector on src/ Used configuration: withPaths([ __DIR__ . '/src', ]) ->withPhpSets(); --- src/Mapping/Driver/ClassNames.php | 2 +- src/Mapping/Driver/DefaultFileLocator.php | 6 +----- src/Mapping/Driver/FileClassLocator.php | 2 +- src/Mapping/Driver/MappingDriverChain.php | 8 ++++---- src/Mapping/Driver/SymfonyFileLocator.php | 7 ++----- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/Mapping/Driver/ClassNames.php b/src/Mapping/Driver/ClassNames.php index 3b2c57f3..4b088cb5 100644 --- a/src/Mapping/Driver/ClassNames.php +++ b/src/Mapping/Driver/ClassNames.php @@ -11,7 +11,7 @@ final class ClassNames implements ClassLocator { /** @param list $classNames */ public function __construct( - private array $classNames, + private readonly array $classNames, ) { } diff --git a/src/Mapping/Driver/DefaultFileLocator.php b/src/Mapping/Driver/DefaultFileLocator.php index ef046f4c..9750b116 100644 --- a/src/Mapping/Driver/DefaultFileLocator.php +++ b/src/Mapping/Driver/DefaultFileLocator.php @@ -32,9 +32,6 @@ class DefaultFileLocator implements FileLocator */ protected array $paths = []; - /** The file extension of mapping documents. */ - protected string|null $fileExtension; - /** * Initializes a new FileDriver that looks in the given path(s) for mapping * documents and operates in the specified operating mode. @@ -44,10 +41,9 @@ class DefaultFileLocator implements FileLocator * @param string|null $fileExtension The file extension of mapping documents, * usually prefixed with a dot. */ - public function __construct(string|array $paths, string|null $fileExtension = null) + public function __construct(string|array $paths, protected string|null $fileExtension = null) { $this->addPaths((array) $paths); - $this->fileExtension = $fileExtension; } /** diff --git a/src/Mapping/Driver/FileClassLocator.php b/src/Mapping/Driver/FileClassLocator.php index dae77929..c8a69c76 100644 --- a/src/Mapping/Driver/FileClassLocator.php +++ b/src/Mapping/Driver/FileClassLocator.php @@ -38,7 +38,7 @@ final class FileClassLocator implements ClassLocator { /** @param iterable $files An iterable of files to include. */ public function __construct( - private iterable $files, + private readonly iterable $files, ) { } diff --git a/src/Mapping/Driver/MappingDriverChain.php b/src/Mapping/Driver/MappingDriverChain.php index f40c0f21..ea51f647 100644 --- a/src/Mapping/Driver/MappingDriverChain.php +++ b/src/Mapping/Driver/MappingDriverChain.php @@ -9,7 +9,7 @@ use function array_keys; use function spl_object_id; -use function strpos; +use function str_starts_with; /** * The DriverChain allows you to add multiple other mapping drivers for @@ -56,7 +56,7 @@ public function getDrivers(): array public function loadMetadataForClass(string $className, ClassMetadata $metadata): void { foreach ($this->drivers as $namespace => $driver) { - if (strpos($className, $namespace) === 0) { + if (str_starts_with($className, $namespace)) { $driver->loadMetadataForClass($className, $metadata); return; @@ -88,7 +88,7 @@ public function getAllClassNames(): array } foreach ($driverClasses[$oid] as $className) { - if (strpos($className, $namespace) !== 0) { + if (! str_starts_with($className, $namespace)) { continue; } @@ -108,7 +108,7 @@ public function getAllClassNames(): array public function isTransient(string $className): bool { foreach ($this->drivers as $namespace => $driver) { - if (strpos($className, $namespace) === 0) { + if (str_starts_with($className, $namespace)) { return $driver->isTransient($className); } } diff --git a/src/Mapping/Driver/SymfonyFileLocator.php b/src/Mapping/Driver/SymfonyFileLocator.php index 17d29441..6c9504a3 100644 --- a/src/Mapping/Driver/SymfonyFileLocator.php +++ b/src/Mapping/Driver/SymfonyFileLocator.php @@ -47,9 +47,6 @@ class SymfonyFileLocator implements FileLocator */ protected array $prefixes = []; - /** File extension that is searched for. */ - protected string|null $fileExtension; - /** * Represents PHP namespace delimiters when looking for files */ @@ -62,11 +59,11 @@ class SymfonyFileLocator implements FileLocator */ public function __construct( array $prefixes, - string $fileExtension = '', + /** File extension that is searched for. */ + protected string|null $fileExtension = '', string $nsSeparator = '.', ) { $this->addNamespacePrefixes($prefixes); - $this->fileExtension = $fileExtension; if ($nsSeparator === '') { throw new InvalidArgumentException('Namespace separator should not be empty');