From 925699385126a09a9e404151ff584184a316625e Mon Sep 17 00:00:00 2001 From: aldel Date: Tue, 9 Aug 2016 15:49:54 +0200 Subject: [PATCH] Revert "Handle circular references in DunglasApiParser. Close #678." This reverts commit 3317037e615ad33f448f3913b1653a072b4cabec. --- Parser/DunglasApiParser.php | 2 +- Tests/Fixtures/app/config/dunglas_api.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Parser/DunglasApiParser.php b/Parser/DunglasApiParser.php index 10f169800..3a0f51a79 100644 --- a/Parser/DunglasApiParser.php +++ b/Parser/DunglasApiParser.php @@ -181,7 +181,7 @@ private function parseAttribute(ResourceInterface $resource, AttributeMetadataIn $data['actualType'] = DataTypes::MODEL; $data['subType'] = $class; - $data['children'] = $resource->getEntityClass() === $class ? [] : $this->parseClass($resource, $class, $io); + $data['children'] = $this->parseClass($resource, $class, $io); return $data; } diff --git a/Tests/Fixtures/app/config/dunglas_api.yml b/Tests/Fixtures/app/config/dunglas_api.yml index f663b523a..f490b7555 100644 --- a/Tests/Fixtures/app/config/dunglas_api.yml +++ b/Tests/Fixtures/app/config/dunglas_api.yml @@ -1,22 +1,22 @@ doctrine: dbal: - driver: 'pdo_sqlite' - path: '%kernel.cache_dir%/db.sqlite' - charset: 'UTF8' + driver: "pdo_sqlite" + path: "%kernel.cache_dir%/db.sqlite" + charset: "UTF8" orm: - auto_generate_proxy_classes: '%kernel.debug%' + auto_generate_proxy_classes: "%kernel.debug%" auto_mapping: true framework: - router: { resource: '%kernel.root_dir%/config/dunglas_api_routing.yml' } + router: { resource: "%kernel.root_dir%/config/dunglas_api_routing.yml" } dunglas_api: title: API description: Test API services: - dunglas_api.popo: - parent: 'api.resource' - arguments: [ 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Popo' ] - tags: [ { name: 'api.resource' } ] + dunglas_json_ld_api.popo: + parent: "api.resource" + arguments: [ "Nelmio\\ApiDocBundle\\Tests\\Fixtures\\Model\\Popo" ] + tags: [ { name: "api.resource" } ]