RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-13 13:09:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1427 from nelmio/issue

Browse Source 
Fix alternative names issue
This commit is contained in:
Guilhem N 2018-11-04 12:28:46 +01:00 committed by GitHub
commit 8839085239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Model/ModelRegistry.php
View File

@ -98,13 +98,14 @@ final class ModelRegistry
$this->api->getDefinitions()->set($name, $schema); $this->api->getDefinitions()->set($name, $schema);
} }
}
if (0 === count($this->unregistered)) { if (empty($this->unregistered) && !empty($this->alternativeNames)) {
foreach ($this->alternativeNames as $model) { foreach ($this->alternativeNames as $model) {
$this->register($model); $this->register($model);
} }
$this->alternativeNames = []; $this->alternativeNames = [];
} $this->registerDefinitions();
} }
} }

2
ModelDescriber/ObjectModelDescriber.php
View File

@ -45,7 +45,7 @@ class ObjectModelDescriber implements ModelDescriberInterface, ModelRegistryAwar
$class = $model->getType()->getClassName(); $class = $model->getType()->getClassName();
$context = []; $context = [];
if (null !== $model->getGroups()) { if (null !== $model->getGroups()) {
$context = ['serializer_groups' => $model->getGroups()]; $context = ['serializer_groups' => array_filter($model->getGroups(), 'is_string')];
} }
$annotationsReader = new AnnotationsReader($this->doctrineReader, $this->modelRegistry); $annotationsReader = new AnnotationsReader($this->doctrineReader, $this->modelRegistry);

4
Tests/Functional/TestKernel.php
View File

@ -104,6 +104,10 @@ class TestKernel extends Kernel
'serializer' => ['enable_annotations' => true], 'serializer' => ['enable_annotations' => true],
]); ]);
$c->loadFromExtension('twig', [
'strict_variables' => '%kernel.debug%',
]);
$c->loadFromExtension('fos_rest', [ $c->loadFromExtension('fos_rest', [
'format_listener' => [ 'format_listener' => [
'rules' => [ 'rules' => [