Move bridge

features/doctrine/eager_loading.feature

@@ -11,11 +11,12 @@ Feature: Eager Loading
     Then the response status code should be 200
     And the DQL should be equal to:
     """
-    SELECT o, thirdLevel_a1, relatedToDummyFriend_a2, dummyFriend_a3
+    SELECT o, thirdLevel_a1, fourthLevel_a2, relatedToDummyFriend_a3, dummyFriend_a4
     FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy o
         LEFT JOIN o.thirdLevel thirdLevel_a1
-        LEFT JOIN o.relatedToDummyFriend relatedToDummyFriend_a2
-        LEFT JOIN relatedToDummyFriend_a2.dummyFriend dummyFriend_a3
+        LEFT JOIN thirdLevel_a1.fourthLevel fourthLevel_a2
+        LEFT JOIN o.relatedToDummyFriend relatedToDummyFriend_a3
+        LEFT JOIN relatedToDummyFriend_a3.dummyFriend dummyFriend_a4
     WHERE o.id = :id_id
     """
 
@@ -45,11 +46,12 @@ Feature: Eager Loading
     Then the response status code should be 200
     And the DQL should be equal to:
     """
-    SELECT o, thirdLevel_a4, relatedToDummyFriend_a1, dummyFriend_a5
+    SELECT o, thirdLevel_a4, fourthLevel_a5, relatedToDummyFriend_a1, dummyFriend_a6
     FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy o
         INNER JOIN o.relatedToDummyFriend relatedToDummyFriend_a1
         LEFT JOIN o.thirdLevel thirdLevel_a4
-        INNER JOIN relatedToDummyFriend_a1.dummyFriend dummyFriend_a5
+        LEFT JOIN thirdLevel_a4.fourthLevel fourthLevel_a5
+        INNER JOIN relatedToDummyFriend_a1.dummyFriend dummyFriend_a6
     WHERE o IN(
             SELECT o_a2
             FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy o_a2
@@ -81,11 +83,12 @@ Feature: Eager Loading
     Then the response status code should be 200
     And the DQL should be equal to:
     """
-    SELECT o, thirdLevel_a3, relatedToDummyFriend_a4, dummyFriend_a5
+    SELECT o, thirdLevel_a3, fourthLevel_a4, relatedToDummyFriend_a5, dummyFriend_a6
     FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy o
         LEFT JOIN o.thirdLevel thirdLevel_a3
-        LEFT JOIN o.relatedToDummyFriend relatedToDummyFriend_a4
-        LEFT JOIN relatedToDummyFriend_a4.dummyFriend dummyFriend_a5
+        LEFT JOIN thirdLevel_a3.fourthLevel fourthLevel_a4
+        LEFT JOIN o.relatedToDummyFriend relatedToDummyFriend_a5
+        LEFT JOIN relatedToDummyFriend_a5.dummyFriend dummyFriend_a6
     WHERE o.id IN (
             SELECT related_dummy_a1.id
             FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy related_dummy_a1

phpunit.xml.dist

@@ -6,7 +6,7 @@
         <ini name="memory_limit" value="-1" />
         <server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
         <!-- This is necessary for GitHub Actions to work properly -->
-        <server name="SYMFONY_PHPUNIT_DIR" value="vendor/bin/.phpunit" />
+        <!--<server name="SYMFONY_PHPUNIT_DIR" value="vendor/bin/.phpunit" />-->
         <server name="SYMFONY_PHPUNIT_REMOVE" value="symfony/yaml" />
         <server name="KERNEL_DIR" value="tests/Fixtures/app/" />
         <server name="KERNEL_CLASS" value="AppKernel" />

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/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/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;

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/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/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/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/Core/Bridge/Doctrine/MongoDbOdm/Filter/BooleanFilter.php

@@ -13,7 +13,7 @@
 
 namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter;
 
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\BooleanFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\BooleanFilterTrait;
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
 use Doctrine\ODM\MongoDB\Types\Type as MongoDbType;
 

src/Core/Bridge/Doctrine/MongoDbOdm/Filter/DateFilter.php

@@ -14,7 +14,7 @@
 namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\DateFilterInterface;
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\DateFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\DateFilterTrait;
 use ApiPlatform\Exception\InvalidArgumentException;
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
 use Doctrine\ODM\MongoDB\Types\Type as MongoDbType;

src/Core/Bridge/Doctrine/MongoDbOdm/Filter/ExistsFilter.php

@@ -14,7 +14,7 @@
 namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\ExistsFilterInterface;
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\ExistsFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\ExistsFilterTrait;
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\Persistence\ManagerRegistry;

src/Core/Bridge/Doctrine/MongoDbOdm/Filter/NumericFilter.php

@@ -13,7 +13,7 @@
 
 namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter;
 
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\NumericFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\NumericFilterTrait;
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
 use Doctrine\ODM\MongoDB\Types\Type as MongoDbType;
 

src/Core/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilter.php

@@ -14,7 +14,7 @@
 namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\OrderFilterInterface;
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\OrderFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\OrderFilterTrait;
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
 use Doctrine\Persistence\ManagerRegistry;
 use Psr\Log\LoggerInterface;

src/Core/Bridge/Doctrine/MongoDbOdm/Filter/RangeFilter.php

@@ -14,7 +14,7 @@
 namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\RangeFilterInterface;
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\RangeFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\RangeFilterTrait;
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
 
 /**

src/Core/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilter.php

@@ -17,7 +17,7 @@
 use ApiPlatform\Core\Api\IdentifiersExtractorInterface;
 use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface;
 use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\SearchFilterInterface;
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\SearchFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\SearchFilterTrait;
 use ApiPlatform\Exception\InvalidArgumentException;
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata as MongoDBClassMetadata;

src/Core/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php

@@ -28,8 +28,10 @@
 use ApiPlatform\Exception\RuntimeException;
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\Query\Expr\Select;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
@@ -169,7 +171,7 @@ private function apply(bool $collection, QueryBuilder $queryBuilder, QueryNameGe
      *
      * @throws RuntimeException when the max number of joins has been reached
      */
-    private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, bool $forceEager, bool $fetchPartial, string $parentAlias, array $options = [], array $normalizationContext = [], bool $wasLeftJoin = false, int &$joinCount = 0, int $currentDepth = null)
+    private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, bool $forceEager, bool $fetchPartial, string $parentAlias, array $options = [], array $normalizationContext = [], bool $wasLeftJoin = false, int &$joinCount = 0, int $currentDepth = null, string $parentAssociation = null)
     {
         if ($joinCount > $this->maxJoins) {
             throw new RuntimeException('The total number of joined relations has exceeded the specified maximum. Raise the limit if necessary with the "api_platform.eager_loading.max_joins" configuration key (https://api-platform.com/docs/core/performance/#eager-loading), or limit the maximum serialization depth using the "enable_max_depth" option of the Symfony serializer (https://symfony.com/doc/current/components/serializer.html#handling-serialization-depth).');
@@ -229,8 +231,17 @@ private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInt
                 continue;
             }
 
-            $isNotReadableLink = false === $propertyMetadata->isReadableLink();
-            if (null === $fetchEager && (false === $propertyMetadata->isReadable() || ((null === $inAttributes && $isNotReadableLink) || (false === $inAttributes)))) {
+            if (true !== $fetchEager && (false === $propertyMetadata->isReadable() || false === $inAttributes)) {
+                continue;
+            }
+
+            // Avoid joining back to the parent that we just came from, but only on *ToOne relations
+            if (
+                null !== $parentAssociation &&
+                isset($mapping['inversedBy']) &&
+                $mapping['inversedBy'] === $parentAssociation &&
+                $mapping['type'] & ClassMetadata::TO_ONE
+            ) {
                 continue;
             }
 
@@ -256,16 +267,16 @@ private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInt
                     continue;
                 }
             } else {
-                $queryBuilder->addSelect($associationAlias);
+                $this->addSelectOnce($queryBuilder, $associationAlias);
             }
 
-            // Avoid recursive joins
+            // Avoid recursive joins for self-referencing relations
             if ($mapping['targetEntity'] === $resourceClass) {
-                // Avoid joining the same association twice (see #1959)
-                if (!\in_array($associationAlias, $queryBuilder->getAllAliases(), true)) {
-                    $queryBuilder->addSelect($associationAlias);
-                }
+                continue;
+            }
 
+            // Only join the relation's relations recursively if it's a readableLink
+            if (true !== $fetchEager && (true !== $propertyMetadata->isReadableLink())) {
                 continue;
             }
 
@@ -278,7 +289,7 @@ private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInt
                 }
             }
 
-            $this->joinRelations($queryBuilder, $queryNameGenerator, $mapping['targetEntity'], $forceEager, $fetchPartial, $associationAlias, $options, $childNormalizationContext, $isLeftJoin, $joinCount, $currentDepth);
+            $this->joinRelations($queryBuilder, $queryNameGenerator, $mapping['targetEntity'], $forceEager, $fetchPartial, $associationAlias, $options, $childNormalizationContext, $isLeftJoin, $joinCount, $currentDepth, $association);
         }
     }
 
@@ -288,7 +299,7 @@ private function addSelect(QueryBuilder $queryBuilder, string $entity, string $a
         $entityManager = $queryBuilder->getEntityManager();
         $targetClassMetadata = $entityManager->getClassMetadata($entity);
         if (!empty($targetClassMetadata->subClasses)) {
-            $queryBuilder->addSelect($associationAlias);
+            $this->addSelectOnce($queryBuilder, $associationAlias);
 
             return;
         }
@@ -327,6 +338,17 @@ private function addSelect(QueryBuilder $queryBuilder, string $entity, string $a
         $queryBuilder->addSelect(sprintf('partial %s.{%s}', $associationAlias, implode(',', $select)));
     }
 
+    private function addSelectOnce(QueryBuilder $queryBuilder, string $alias)
+    {
+        $existingSelects = array_reduce($queryBuilder->getDQLPart('select') ?? [], function ($existing, $dqlSelect) {
+            return ($dqlSelect instanceof Select) ? array_merge($existing, $dqlSelect->getParts()) : $existing;
+        }, []);
+
+        if (!\in_array($alias, $existingSelects, true)) {
+            $queryBuilder->addSelect($alias);
+        }
+    }
+
     /**
      * Gets the serializer context.
      *

src/Core/Bridge/Doctrine/Orm/Filter/BooleanFilter.php

@@ -13,7 +13,7 @@
 
 namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter;
 
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\BooleanFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\BooleanFilterTrait;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;

src/Core/Bridge/Doctrine/Orm/Filter/DateFilter.php

@@ -14,7 +14,7 @@
 namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\DateFilterInterface;
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\DateFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\DateFilterTrait;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use ApiPlatform\Exception\InvalidArgumentException;
 use Doctrine\DBAL\Types\Type as DBALType;

src/Core/Bridge/Doctrine/Orm/Filter/ExistsFilter.php

@@ -14,7 +14,7 @@
 namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\ExistsFilterInterface;
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\ExistsFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\ExistsFilterTrait;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;

src/Core/Bridge/Doctrine/Orm/Filter/NumericFilter.php

@@ -13,7 +13,7 @@
 
 namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter;
 
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\NumericFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\NumericFilterTrait;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;

src/Core/Bridge/Doctrine/Orm/Filter/OrderFilter.php

@@ -14,7 +14,7 @@
 namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\OrderFilterInterface;
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\OrderFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\OrderFilterTrait;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;

src/Core/Bridge/Doctrine/Orm/Filter/RangeFilter.php

@@ -14,7 +14,7 @@
 namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\RangeFilterInterface;
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\RangeFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\RangeFilterTrait;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\ORM\QueryBuilder;
 

src/Core/Bridge/Doctrine/Orm/Filter/SearchFilter.php

@@ -17,7 +17,7 @@
 use ApiPlatform\Core\Api\IdentifiersExtractorInterface;
 use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface;
 use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\SearchFilterInterface;
-use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\SearchFilterTrait;
+use ApiPlatform\Bridge\Doctrine\Common\Filter\SearchFilterTrait;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use ApiPlatform\Exception\InvalidArgumentException;

src/Core/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

@@ -31,8 +31,8 @@
 use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface;
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface;
-use ApiPlatform\Core\DataTransformer\DataTransformerInitializerInterface;
-use ApiPlatform\Core\DataTransformer\DataTransformerInterface;
+use ApiPlatform\DataTransformer\DataTransformerInitializerInterface;
+use ApiPlatform\DataTransformer\DataTransformerInterface;
 use ApiPlatform\Core\Metadata\Extractor\XmlExtractor;
 use ApiPlatform\Core\Metadata\Extractor\YamlExtractor;
 use ApiPlatform\GraphQl\Error\ErrorHandlerInterface;

src/Core/Bridge/Symfony/Messenger/DataTransformer.php

@@ -13,7 +13,7 @@
 
 namespace ApiPlatform\Core\Bridge\Symfony\Messenger;
 
-use ApiPlatform\Core\DataTransformer\DataTransformerInterface;
+use ApiPlatform\DataTransformer\DataTransformerInterface;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
 use ApiPlatform\Core\Util\ClassInfoTrait;
 use ApiPlatform\Exception\OperationNotFoundException;

src/Core/Serializer/AbstractItemNormalizer.php

@@ -17,8 +17,8 @@
 use ApiPlatform\Api\UrlGeneratorInterface;
 use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface;
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
-use ApiPlatform\Core\DataTransformer\DataTransformerInitializerInterface;
-use ApiPlatform\Core\DataTransformer\DataTransformerInterface;
+use ApiPlatform\DataTransformer\DataTransformerInitializerInterface;
+use ApiPlatform\DataTransformer\DataTransformerInterface;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface as LegacyPropertyMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface as LegacyPropertyNameCollectionFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\PropertyMetadata;

src/Core/DataTransformer/DataTransformerInitializerInterface.php → src/DataTransformer/DataTransformerInitializerInterface.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\DataTransformer;
+namespace ApiPlatform\DataTransformer;
 
 interface DataTransformerInitializerInterface extends DataTransformerInterface
 {

src/Core/DataTransformer/DataTransformerInterface.php → src/DataTransformer/DataTransformerInterface.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\DataTransformer;
+namespace ApiPlatform\DataTransformer;
 
 /**
  * Transforms a DTO or an Anonymous class to a Resource object.