Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ private function hasFetchEagerAssociation(EntityManager $em, ClassMetadataInfo $

$related = $em->getClassMetadata($mapping['targetEntity']);

if (in_array($related->name, $checked)) {
if (in_array($related->name, $checked, true)) {
continue;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ private function registerCacheConfiguration(ContainerBuilder $container)
*/
private function registerLoaders(ContainerBuilder $container, array $bundles)
{
$annotationPaths = [];
$resourceClassDirectories = [];
$yamlResources = [];
$xmlResources = [];

Expand All @@ -267,12 +267,13 @@ private function registerLoaders(ContainerBuilder $container, array $bundles)
$this->addFileResources($bundleDirectory, $xmlResources, $yamlResources);

if (file_exists($entityDirectory = $bundleDirectory.'/Entity')) {
$annotationPaths[] = $entityDirectory;
$resourceClassDirectories[] = $entityDirectory;
$container->addResource(new DirectoryResource($entityDirectory, '/\.php$/'));
}
}

$container->getDefinition('api_platform.metadata.resource.name_collection_factory.annotation')->addArgument($annotationPaths);
$container->setParameter('api_platform.resource_class_directories', $resourceClassDirectories);
$container->getDefinition('api_platform.metadata.resource.name_collection_factory.annotation')->addArgument('%api_platform.resource_class_directories%');
$container->getDefinition('api_platform.metadata.extractor.yaml')->addArgument($yamlResources);
$container->getDefinition('api_platform.metadata.extractor.xml')->addArgument($xmlResources);
}
Expand Down
1 change: 1 addition & 0 deletions src/Bridge/Symfony/Bundle/Resources/config/api.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<argument type="service" id="api_platform.operation_path_resolver.custom" />
<argument type="service" id="service_container" />
<argument>%api_platform.formats%</argument>
<argument>%api_platform.resource_class_directories%</argument>

<tag name="routing.loader" />
</service>
Expand Down
10 changes: 8 additions & 2 deletions src/Bridge/Symfony/Routing/ApiLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use Doctrine\Common\Inflector\Inflector;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\Config\Loader\Loader;
use Symfony\Component\Config\Resource\DirectoryResource;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\KernelInterface;
use Symfony\Component\Routing\Loader\XmlFileLoader;
Expand All @@ -43,23 +44,28 @@ final class ApiLoader extends Loader
private $operationPathResolver;
private $container;
private $formats;
private $resourceClassDirectories;

public function __construct(KernelInterface $kernel, ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory, ResourceMetadataFactoryInterface $resourceMetadataFactory, OperationPathResolverInterface $operationPathResolver, ContainerInterface $container, array $formats)
public function __construct(KernelInterface $kernel, ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory, ResourceMetadataFactoryInterface $resourceMetadataFactory, OperationPathResolverInterface $operationPathResolver, ContainerInterface $container, array $formats, array $resourceClassDirectories = [])
{
$this->fileLoader = new XmlFileLoader(new FileLocator($kernel->locateResource('@ApiPlatformBundle/Resources/config/routing')));
$this->resourceNameCollectionFactory = $resourceNameCollectionFactory;
$this->resourceMetadataFactory = $resourceMetadataFactory;
$this->operationPathResolver = $operationPathResolver;
$this->container = $container;
$this->formats = $formats;
$this->resourceClassDirectories = $resourceClassDirectories;
}

/**
* {@inheritdoc}
*/
public function load($data, $type = null)
public function load($data, $type = null): RouteCollection
{
$routeCollection = new RouteCollection();
foreach ($this->resourceClassDirectories as $directory) {
$routeCollection->addResource(new DirectoryResource($directory, '/\.php$/'));
}

$this->loadExternalFiles($routeCollection);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ private function getContainerBuilderProphecy()
'api_platform.eager_loading.enabled' => Argument::type('bool'),
'api_platform.eager_loading.max_joins' => 30,
'api_platform.eager_loading.force_eager' => true,
'api_platform.resource_class_directories' => [],
];
foreach ($parameters as $key => $value) {
$containerBuilderProphecy->setParameter($key, $value)->shouldBeCalled();
Expand All @@ -219,7 +220,7 @@ private function getContainerBuilderProphecy()
$containerBuilderProphecy->hasExtension('http://symfony.com/schema/dic/services')->shouldBeCalled();

$definitionProphecy = $this->prophesize(Definition::class);
$definitionProphecy->addArgument([])->shouldBeCalled();
$definitionProphecy->addArgument('%api_platform.resource_class_directories%')->shouldBeCalled();
$containerBuilderProphecy->getDefinition('api_platform.metadata.resource.name_collection_factory.annotation')->willReturn($definitionProphecy->reveal())->shouldBeCalled();

foreach (['yaml', 'xml'] as $format) {
Expand Down