-refactoring

alexndlm · alexndlm · commit 313d3e9d465c · 2024-12-07T00:34:56.000+01:00
diff --git a/src/Doctrine/Common/Filter/SearchFilterTrait.php b/src/Doctrine/Common/Filter/SearchFilterTrait.php
@@ -184,7 +184,7 @@ protected function hasValidValues(array $values, ?string $type = null): bool
                 return false;
             }
 
-            if (\in_array($type, (array) self::DOCTRINE_UUID_TYPE, true) && false === $this->isValidUuid($value)) {
+            if ($type === self::DOCTRINE_UUID_TYPE && false === $this->isValidUuid($value)) {
                 return false;
             }
         }
diff --git a/src/Doctrine/Odm/Filter/SearchFilter.php b/src/Doctrine/Odm/Filter/SearchFilter.php
@@ -141,7 +141,7 @@ final class SearchFilter extends AbstractFilter implements SearchFilterInterface
     use SearchFilterTrait;
 
     public const DOCTRINE_INTEGER_TYPE = [MongoDbType::INTEGER, MongoDbType::INT];
-    public const DOCTRINE_UUID_TYPE = [];
+    public const DOCTRINE_UUID_TYPE = null;
 
     public function __construct(ManagerRegistry $managerRegistry, IriConverterInterface|LegacyIriConverterInterface $iriConverter, IdentifiersExtractorInterface|LegacyIdentifiersExtractorInterface|null $identifiersExtractor, ?PropertyAccessorInterface $propertyAccessor = null, ?LoggerInterface $logger = null, ?array $properties = null, ?NameConverterInterface $nameConverter = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ protected function hasValidValues(array $values, ?string $type = null): bool`
`184`	`184`	`return false;`
`185`	`185`	`}`
`186`	`186`
`187`		`- if (\in_array($type, (array) self::DOCTRINE_UUID_TYPE, true) && false === $this->isValidUuid($value)) {`
	`187`	`+ if ($type === self::DOCTRINE_UUID_TYPE && false === $this->isValidUuid($value)) {`
`188`	`188`	`return false;`
`189`	`189`	`}`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ final class SearchFilter extends AbstractFilter implements SearchFilterInterface`
`141`	`141`	`use SearchFilterTrait;`
`142`	`142`
`143`	`143`	`public const DOCTRINE_INTEGER_TYPE = [MongoDbType::INTEGER, MongoDbType::INT];`
`144`		`- public const DOCTRINE_UUID_TYPE = [];`
	`144`	`+ public const DOCTRINE_UUID_TYPE = null;`
`145`	`145`
`146`	`146`	`public function __construct(ManagerRegistry $managerRegistry, IriConverterInterface\|LegacyIriConverterInterface $iriConverter, IdentifiersExtractorInterface\|LegacyIdentifiersExtractorInterface\|null $identifiersExtractor, ?PropertyAccessorInterface $propertyAccessor = null, ?LoggerInterface $logger = null, ?array $properties = null, ?NameConverterInterface $nameConverter = null)`
`147`	`147`	`{`