Move the non-legacy code to src

phpstan.neon.dist

@@ -96,7 +96,7 @@ parameters:
 			path: tests/Core/Identifier/Normalizer/IntegerDenormalizerTest.php
 		-
 			message: '#Call to method PHPUnit\\Framework\\Assert::assertSame\(\) with array\(.+\) and array\(.+\) will always evaluate to false\.#'
-			path: tests/Core/Util/SortTraitTest.php
+			path: tests/Util/SortTraitTest.php
 		# https://github.com/phpstan/phpstan-symfony/issues/76
 		-
 			message: '#Service "test" is not registered in the container\.#'

src/Core/Action/EntrypointAction.php → src/Action/EntrypointAction.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Action;
+namespace ApiPlatform\Action;
 
 use ApiPlatform\Core\Api\Entrypoint;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;

src/Core/Action/ExceptionAction.php → src/Action/ExceptionAction.php

@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Action;
+namespace ApiPlatform\Action;
 
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
-use ApiPlatform\Core\Util\ErrorFormatGuesser;
-use ApiPlatform\Core\Util\RequestAttributesExtractor;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Util\ErrorFormatGuesser;
 use ApiPlatform\Util\OperationRequestInitiatorTrait;
+use ApiPlatform\Util\RequestAttributesExtractor;
 use Symfony\Component\Debug\Exception\FlattenException as LegacyFlattenException;
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Request;
@@ -72,10 +72,7 @@ public function __invoke($exception, Request $request): Response
         $exceptionClass = $exception->getClass();
         $statusCode = $exception->getStatusCode();
 
-        $exceptionToStatus = array_merge(
-            $this->exceptionToStatus,
-            $operation ? $operation->getExceptionToStatus() ?? [] : $this->getOperationExceptionToStatus($request)
-        );
+        $exceptionToStatus = array_merge($this->exceptionToStatus, $operation ? $operation->getExceptionToStatus() ?? [] : $this->getOperationExceptionToStatus($request));
 
         foreach ($exceptionToStatus as $class => $status) {
             if (is_a($exceptionClass, $class, true)) {
@@ -110,9 +107,6 @@ private function getOperationExceptionToStatus(Request $request): array
             throw new \LogicException('"exception_to_status" attribute should be an array.');
         }
 
-        return array_merge(
-            $resourceExceptionToStatus,
-            $operationExceptionToStatus
-        );
+        return array_merge($resourceExceptionToStatus, $operationExceptionToStatus);
     }
 }

src/Core/Action/NotFoundAction.php → src/Action/NotFoundAction.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Action;
+namespace ApiPlatform\Action;
 
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 

src/Core/Action/PlaceholderAction.php → src/Action/PlaceholderAction.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Action;
+namespace ApiPlatform\Action;
 
 /**
  * Placeholder returning the data passed in parameter.

src/Api/IdentifiersExtractor.php

@@ -17,9 +17,9 @@
 use ApiPlatform\Core\Identifier\CompositeIdentifierParser;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
-use ApiPlatform\Core\Util\ResourceClassInfoTrait;
 use ApiPlatform\Exception\RuntimeException;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Util\ResourceClassInfoTrait;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 

src/Core/Bridge/Doctrine/Common/Filter/BooleanFilterTrait.php → src/Bridge/Doctrine/Common/Filter/BooleanFilterTrait.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
+namespace ApiPlatform\Bridge\Doctrine\Common\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait;
 use ApiPlatform\Exception\InvalidArgumentException;

src/Core/Bridge/Doctrine/Common/Filter/DateFilterInterface.php → src/Bridge/Doctrine/Common/Filter/DateFilterInterface.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
+namespace ApiPlatform\Bridge\Doctrine\Common\Filter;
 
 /**
  * Interface for filtering the collection by date intervals.

src/Core/Bridge/Doctrine/Common/Filter/DateFilterTrait.php → src/Bridge/Doctrine/Common/Filter/DateFilterTrait.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
+namespace ApiPlatform\Bridge\Doctrine\Common\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait;
 use ApiPlatform\Exception\InvalidArgumentException;

src/Core/Bridge/Doctrine/Common/Filter/ExistsFilterInterface.php → src/Bridge/Doctrine/Common/Filter/ExistsFilterInterface.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
+namespace ApiPlatform\Bridge\Doctrine\Common\Filter;
 
 /**
  * Interface for filtering the collection by whether a property value exists or not.

src/Core/Bridge/Doctrine/Common/Filter/ExistsFilterTrait.php → src/Bridge/Doctrine/Common/Filter/ExistsFilterTrait.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
+namespace ApiPlatform\Bridge\Doctrine\Common\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait;
 use ApiPlatform\Exception\InvalidArgumentException;
@@ -73,10 +73,7 @@ abstract protected function normalizePropertyName($property);
     private function normalizeValue($value, string $property): ?bool
     {
         if (\is_array($value) && isset($value[self::QUERY_PARAMETER_KEY])) {
-            @trigger_error(
-                sprintf('The ExistsFilter syntax "%s[exists]=true/false" is deprecated since 2.5. Use the syntax "%s[%s]=true/false" instead.', $property, $this->existsParameterName, $property),
-                \E_USER_DEPRECATED
-            );
+            @trigger_error(sprintf('The ExistsFilter syntax "%s[exists]=true/false" is deprecated since 2.5. Use the syntax "%s[%s]=true/false" instead.', $property, $this->existsParameterName, $property), \E_USER_DEPRECATED);
             $value = $value[self::QUERY_PARAMETER_KEY];
         }
 

src/Core/Bridge/Doctrine/Common/Filter/NumericFilterTrait.php → src/Bridge/Doctrine/Common/Filter/NumericFilterTrait.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
+namespace ApiPlatform\Bridge\Doctrine\Common\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait;
 use ApiPlatform\Exception\InvalidArgumentException;

src/Core/Bridge/Doctrine/Common/Filter/OrderFilterInterface.php → src/Bridge/Doctrine/Common/Filter/OrderFilterInterface.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
+namespace ApiPlatform\Bridge\Doctrine\Common\Filter;
 
 /**
  * Interface for ordering the collection by given properties.

src/Core/Bridge/Doctrine/Common/Filter/OrderFilterTrait.php → src/Bridge/Doctrine/Common/Filter/OrderFilterTrait.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
+namespace ApiPlatform\Bridge\Doctrine\Common\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait;
 

src/Core/Bridge/Doctrine/Common/Filter/RangeFilterInterface.php → src/Bridge/Doctrine/Common/Filter/RangeFilterInterface.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
+namespace ApiPlatform\Bridge\Doctrine\Common\Filter;
 
 /**
  * Interface for filtering the collection by range.

src/Core/Bridge/Doctrine/Common/Filter/RangeFilterTrait.php → src/Bridge/Doctrine/Common/Filter/RangeFilterTrait.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
+namespace ApiPlatform\Bridge\Doctrine\Common\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait;
 use ApiPlatform\Exception\InvalidArgumentException;

src/Core/Bridge/Doctrine/Common/Filter/SearchFilterInterface.php → src/Bridge/Doctrine/Common/Filter/SearchFilterInterface.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
+namespace ApiPlatform\Bridge\Doctrine\Common\Filter;
 
 /**
  * Interface for filtering the collection by given properties.

src/Core/Bridge/Doctrine/Common/Filter/SearchFilterTrait.php → src/Bridge/Doctrine/Common/Filter/SearchFilterTrait.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter;
+namespace ApiPlatform\Bridge\Doctrine\Common\Filter;
 
 use ApiPlatform\Api\IriConverterInterface;
 use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface;

src/Bridge/Doctrine/Orm/State/UriVariablesHandlerTrait.php

@@ -38,35 +38,19 @@ private function handleUriVariables(QueryBuilder $queryBuilder, array $identifie
                 $propertyIdentifier = $uriVariable->getIdentifiers()[0];
                 $joinAlias = $queryNameGenerator->generateJoinAlias($inverseProperty);
 
-                $queryBuilder->join(
-                    $uriVariable->getTargetClass(),
-                    $joinAlias,
-                    'with',
-                    "$alias.$propertyIdentifier = $joinAlias.$inverseProperty"
-                );
+                $queryBuilder->join($uriVariable->getTargetClass(), $joinAlias, 'with', "$alias.$propertyIdentifier = $joinAlias.$inverseProperty");
 
-                $expression = $queryBuilder->expr()->eq(
-                    "{$joinAlias}.{$propertyIdentifier}",
-                    $placeholder
-                );
+                $expression = $queryBuilder->expr()->eq("{$joinAlias}.{$propertyIdentifier}", $placeholder);
             } elseif ($property = $uriVariable->getProperty()) {
                 $propertyIdentifier = $uriVariable->getIdentifiers()[0];
                 $joinAlias = $queryNameGenerator->generateJoinAlias($property);
 
-                $queryBuilder->join(
-                    "$alias.$property",
-                    $joinAlias,
-                );
+                $queryBuilder->join("$alias.$property", $joinAlias, );
 
-                $expression = $queryBuilder->expr()->eq(
-                    "{$joinAlias}.{$propertyIdentifier}",
-                    $placeholder
-                );
+                $expression = $queryBuilder->expr()->eq("{$joinAlias}.{$propertyIdentifier}", $placeholder);
             } else {
                 $propertyIdentifier = $uriVariable->getIdentifiers()[0];
-                $expression = $queryBuilder->expr()->eq(
-                    "{$alias}.{$propertyIdentifier}", $placeholder
-                );
+                $expression = $queryBuilder->expr()->eq("{$alias}.{$propertyIdentifier}", $placeholder);
             }
             $queryBuilder->andWhere($expression);
             $queryBuilder->setParameter($placeholder, $value, $doctrineClassMetadata->getTypeOfField($identifier));

src/Core/Annotation/ApiFilter.php

@@ -57,13 +57,8 @@ final class ApiFilter
      * @param string $id
      * @param string $strategy
      */
-    public function __construct(
-        $filterClass,
-        ?string $id = null,
-        ?string $strategy = null,
-        array $properties = [],
-        array $arguments = []
-    ) {
+    public function __construct($filterClass, ?string $id = null, ?string $strategy = null, array $properties = [], array $arguments = [])
+    {
         if (\is_array($filterClass)) { /** @phpstan-ignore-line Doctrine annotations */
             $options = $filterClass;
             $this->filterClass = $options['value'] ?? null;

src/Core/Annotation/ApiProperty.php

@@ -120,33 +120,9 @@ final class ApiProperty
      *
      * @throws InvalidArgumentException
      */
-    public function __construct(
-        $description = null,
-        ?bool $readable = null,
-        ?bool $writable = null,
-        ?bool $readableLink = null,
-        ?bool $writableLink = null,
-        ?bool $required = null,
-        ?string $iri = null,
-        ?bool $identifier = null,
-        $default = null,
-        $example = null,
-
-        // attributes
-        ?array $attributes = null,
-        ?string $deprecationReason = null,
-        ?bool $fetchable = null,
-        ?bool $fetchEager = null,
-        ?array $jsonldContext = null,
-        ?array $openapiContext = null,
-        ?bool $push = null,
-        ?string $security = null,
-        ?array $swaggerContext = null,
-        ?string $securityPostDenormalize = null,
-
-        ?array $types = [],
-        ?array $builtinTypes = []
-    ) {
+    public function __construct($description = null, ?bool $readable = null, ?bool $writable = null, ?bool $readableLink = null, ?bool $writableLink = null, ?bool $required = null, ?string $iri = null, ?bool $identifier = null, $default = null, $example = null,        // attributes
+        ?array $attributes = null, ?string $deprecationReason = null, ?bool $fetchable = null, ?bool $fetchEager = null, ?array $jsonldContext = null, ?array $openapiContext = null, ?bool $push = null, ?string $security = null, ?array $swaggerContext = null, ?string $securityPostDenormalize = null, ?array $types = [], ?array $builtinTypes = [])
+    {
         if (!\is_array($description)) { // @phpstan-ignore-line Doctrine annotations support
             [$publicProperties, $configurableAttributes] = self::getConfigMetadata();
 

src/Core/Annotation/ApiResource.php

@@ -181,58 +181,9 @@ final class ApiResource
      *
      * @throws InvalidArgumentException
      */
-    public function __construct(
-        $description = null,
-        ?array $collectionOperations = null,
-        ?array $graphql = null,
-        ?string $iri = null,
-        ?array $itemOperations = null,
-        ?string $shortName = null,
-        ?array $subresourceOperations = null,
-
-        // attributes
-        ?array $attributes = null,
-        ?array $cacheHeaders = null,
-        ?array $denormalizationContext = null,
-        ?string $deprecationReason = null,
-        ?bool $elasticsearch = null,
-        ?bool $fetchPartial = null,
-        ?bool $forceEager = null,
-        ?array $formats = null,
-        ?array $filters = null,
-        ?array $hydraContext = null,
-        $input = null,
-        $mercure = null,
-        $messenger = null,
-        ?array $normalizationContext = null,
-        ?array $openapiContext = null,
-        ?array $order = null,
-        $output = null,
-        ?bool $paginationClientEnabled = null,
-        ?bool $paginationClientItemsPerPage = null,
-        ?bool $paginationClientPartial = null,
-        ?array $paginationViaCursor = null,
-        ?bool $paginationEnabled = null,
-        ?bool $paginationFetchJoinCollection = null,
-        ?int $paginationItemsPerPage = null,
-        ?int $paginationMaximumItemsPerPage = null,
-        ?bool $paginationPartial = null,
-        ?string $routePrefix = null,
-        ?string $security = null,
-        ?string $securityMessage = null,
-        ?string $securityPostDenormalize = null,
-        ?string $securityPostDenormalizeMessage = null,
-        ?string $securityPostValidation = null,
-        ?string $securityPostValidationMessage = null,
-        ?bool $stateless = null,
-        ?string $sunset = null,
-        ?array $swaggerContext = null,
-        ?array $validationGroups = null,
-        ?int $urlGenerationStrategy = null,
-        ?bool $compositeIdentifier = null,
-        ?array $exceptionToStatus = null,
-        ?bool $queryParameterValidationEnabled = null
-    ) {
+    public function __construct($description = null, ?array $collectionOperations = null, ?array $graphql = null, ?string $iri = null, ?array $itemOperations = null, ?string $shortName = null, ?array $subresourceOperations = null,        // attributes
+        ?array $attributes = null, ?array $cacheHeaders = null, ?array $denormalizationContext = null, ?string $deprecationReason = null, ?bool $elasticsearch = null, ?bool $fetchPartial = null, ?bool $forceEager = null, ?array $formats = null, ?array $filters = null, ?array $hydraContext = null, $input = null, $mercure = null, $messenger = null, ?array $normalizationContext = null, ?array $openapiContext = null, ?array $order = null, $output = null, ?bool $paginationClientEnabled = null, ?bool $paginationClientItemsPerPage = null, ?bool $paginationClientPartial = null, ?array $paginationViaCursor = null, ?bool $paginationEnabled = null, ?bool $paginationFetchJoinCollection = null, ?int $paginationItemsPerPage = null, ?int $paginationMaximumItemsPerPage = null, ?bool $paginationPartial = null, ?string $routePrefix = null, ?string $security = null, ?string $securityMessage = null, ?string $securityPostDenormalize = null, ?string $securityPostDenormalizeMessage = null, ?string $securityPostValidation = null, ?string $securityPostValidationMessage = null, ?bool $stateless = null, ?string $sunset = null, ?array $swaggerContext = null, ?array $validationGroups = null, ?int $urlGenerationStrategy = null, ?bool $compositeIdentifier = null, ?array $exceptionToStatus = null, ?bool $queryParameterValidationEnabled = null)
+    {
         if (!\is_array($description)) { // @phpstan-ignore-line Doctrine annotations support
             [$publicProperties, $configurableAttributes] = self::getConfigMetadata();
 

src/Core/Annotation/AttributesHydratorTrait.php

@@ -13,8 +13,8 @@
 
 namespace ApiPlatform\Core\Annotation;
 
-use ApiPlatform\Core\Util\Inflector;
 use ApiPlatform\Exception\InvalidArgumentException;
+use ApiPlatform\Util\Inflector;
 
 /**
  * Hydrates attributes from annotation's parameters.

src/Core/Api/CachedIdentifiersExtractor.php

@@ -13,7 +13,7 @@
 
 namespace ApiPlatform\Core\Api;
 
-use ApiPlatform\Core\Util\ResourceClassInfoTrait;
+use ApiPlatform\Util\ResourceClassInfoTrait;
 use Psr\Cache\CacheException;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\PropertyAccess\PropertyAccess;

src/Core/Api/IdentifiersExtractor.php

@@ -16,8 +16,8 @@
 use ApiPlatform\Api\IdentifiersExtractor as NewIdentifiersExtractor;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
-use ApiPlatform\Core\Util\ResourceClassInfoTrait;
 use ApiPlatform\Exception\RuntimeException;
+use ApiPlatform\Util\ResourceClassInfoTrait;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;