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

Update after PR

Browse Source
This commit is contained in:
Filip Benčo 2020-02-18 20:45:58 +01:00
parent 325ba909e1
commit 90bae6738a
4 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ModelDescriber/ObjectModelDescriber.php
View File

@ -100,9 +100,6 @@ class ObjectModelDescriber implements ModelDescriberInterface, ModelRegistryAwar
private function describeProperty(Type $type, Model $model, Schema $property, string $propertyName) private function describeProperty(Type $type, Model $model, Schema $property, string $propertyName)
{ {
foreach ($this->propertyDescribers as $propertyDescriber) { foreach ($this->propertyDescribers as $propertyDescriber) {
if ($propertyDescriber instanceof ModelRegistryAwareInterface) {
$propertyDescriber->setModelRegistry($this->modelRegistry);
}
if ($propertyDescriber->supports($type)) { if ($propertyDescriber->supports($type)) {
$propertyDescriber->describe($type, $property, $model->getGroups()); $propertyDescriber->describe($type, $property, $model->getGroups());

11
PropertyDescriber/ArrayPropertyDescriber.php
View File

@ -12,18 +12,14 @@
namespace Nelmio\ApiDocBundle\PropertyDescriber; namespace Nelmio\ApiDocBundle\PropertyDescriber;
use EXSyst\Component\Swagger\Schema; use EXSyst\Component\Swagger\Schema;
use Nelmio\ApiDocBundle\Describer\ModelRegistryAwareInterface;
use Nelmio\ApiDocBundle\Describer\ModelRegistryAwareTrait;
use Symfony\Component\PropertyInfo\Type; use Symfony\Component\PropertyInfo\Type;
class ArrayPropertyDescriber implements PropertyDescriberInterface, ModelRegistryAwareInterface class ArrayPropertyDescriber implements PropertyDescriberInterface
{ {
use ModelRegistryAwareTrait;
/** @var PropertyDescriberInterface[] */ /** @var PropertyDescriberInterface[] */
private $propertyDescribers; private $propertyDescribers;
public function __construct($propertyDescribers = []) public function __construct(iterable $propertyDescribers = [])
{ {
$this->propertyDescribers = $propertyDescribers; $this->propertyDescribers = $propertyDescribers;
} }
@ -39,9 +35,6 @@ class ArrayPropertyDescriber implements PropertyDescriberInterface, ModelRegistr
$property = $property->getItems(); $property = $property->getItems();
foreach ($this->propertyDescribers as $propertyDescriber) { foreach ($this->propertyDescribers as $propertyDescriber) {
if ($propertyDescriber instanceof ModelRegistryAwareInterface) {
$propertyDescriber->setModelRegistry($this->modelRegistry);
}
if ($propertyDescriber->supports($type)) { if ($propertyDescriber->supports($type)) {
$propertyDescriber->describe($type, $property, $groups); $propertyDescriber->describe($type, $property, $groups);

15
PropertyDescriber/ObjectPropertyDescriber.php
View File

@ -12,14 +12,21 @@
namespace Nelmio\ApiDocBundle\PropertyDescriber; namespace Nelmio\ApiDocBundle\PropertyDescriber;
use EXSyst\Component\Swagger\Schema; use EXSyst\Component\Swagger\Schema;
use Nelmio\ApiDocBundle\Describer\ModelRegistryAwareInterface;
use Nelmio\ApiDocBundle\Describer\ModelRegistryAwareTrait;
use Nelmio\ApiDocBundle\Model\Model; use Nelmio\ApiDocBundle\Model\Model;
use Nelmio\ApiDocBundle\Model\ModelRegistry;
use Symfony\Component\PropertyInfo\Type; use Symfony\Component\PropertyInfo\Type;
class ObjectPropertyDescriber implements PropertyDescriberInterface, ModelRegistryAwareInterface class ObjectPropertyDescriber implements PropertyDescriberInterface
{ {
use ModelRegistryAwareTrait; /**
* @var ModelRegistry
*/
private $modelRegistry;
public function __construct(ModelRegistry $modelRegistry)
{
$this->modelRegistry = $modelRegistry;
}
public function describe(Type $type, Schema $property, array $groups = null) public function describe(Type $type, Schema $property, array $groups = null)
{ {

32
Resources/config/services.xml
View File

@ -41,7 +41,7 @@
<service id="nelmio_api_doc.model_describers.object" class="Nelmio\ApiDocBundle\ModelDescriber\ObjectModelDescriber" public="false"> <service id="nelmio_api_doc.model_describers.object" class="Nelmio\ApiDocBundle\ModelDescriber\ObjectModelDescriber" public="false">
<argument type="service" id="property_info" /> <argument type="service" id="property_info" />
<argument type="service" id="annotation_reader" /> <argument type="service" id="annotation_reader" />
<argument type="tagged" tag="nelmio_api_doc.property_describer" /> <argument type="tagged" tag="nelmio_api_doc.object_model.property_describer" />
<tag name="nelmio_api_doc.model_describer" /> <tag name="nelmio_api_doc.model_describer" />
</service> </service>
@ -51,34 +51,34 @@
</service> </service>
<!-- Property Describers --> <!-- Property Describers -->
<service id="nelmio_api_doc.property_describers.array" class="Nelmio\ApiDocBundle\PropertyDescriber\ArrayPropertyDescriber" public="false"> <service id="nelmio_api_doc.object_model.property_describers.array" class="Nelmio\ApiDocBundle\PropertyDescriber\ArrayPropertyDescriber" public="false">
<argument type="tagged" tag="nelmio_api_doc.property_describer" /> <argument type="tagged" tag="nelmio_api_doc.object_model.property_describer" />
<tag name="nelmio_api_doc.property_describer" /> <tag name="nelmio_api_doc.object_model.property_describer" />
</service> </service>
<service id="nelmio_api_doc.property_describers.boolean" class="Nelmio\ApiDocBundle\PropertyDescriber\BooleanPropertyDescriber" public="false"> <service id="nelmio_api_doc.object_model.property_describers.boolean" class="Nelmio\ApiDocBundle\PropertyDescriber\BooleanPropertyDescriber" public="false">
<tag name="nelmio_api_doc.property_describer" /> <tag name="nelmio_api_doc.object_model.property_describer" />
</service> </service>
<service id="nelmio_api_doc.property_describers.float" class="Nelmio\ApiDocBundle\PropertyDescriber\FloatPropertyDescriber" public="false"> <service id="nelmio_api_doc.object_model.property_describers.float" class="Nelmio\ApiDocBundle\PropertyDescriber\FloatPropertyDescriber" public="false">
<tag name="nelmio_api_doc.property_describer" /> <tag name="nelmio_api_doc.object_model.property_describer" />
</service> </service>
<service id="nelmio_api_doc.property_describers.integer" class="Nelmio\ApiDocBundle\PropertyDescriber\IntegerPropertyDescriber" public="false"> <service id="nelmio_api_doc.object_model.property_describers.integer" class="Nelmio\ApiDocBundle\PropertyDescriber\IntegerPropertyDescriber" public="false">
<tag name="nelmio_api_doc.property_describer" /> <tag name="nelmio_api_doc.object_model.property_describer" />
</service> </service>
<service id="nelmio_api_doc.property_describers.string" class="Nelmio\ApiDocBundle\PropertyDescriber\StringPropertyDescriber" public="false"> <service id="nelmio_api_doc.object_model.property_describers.string" class="Nelmio\ApiDocBundle\PropertyDescriber\StringPropertyDescriber" public="false">
<tag name="nelmio_api_doc.property_describer" /> <tag name="nelmio_api_doc.object_model.property_describer" />
</service> </service>
<service id="nelmio_api_doc.property_describers.date_time" class="Nelmio\ApiDocBundle\PropertyDescriber\DateTimePropertyDescriber" public="false"> <service id="nelmio_api_doc.object_model.property_describers.date_time" class="Nelmio\ApiDocBundle\PropertyDescriber\DateTimePropertyDescriber" public="false">
<tag name="nelmio_api_doc.property_describer" /> <tag name="nelmio_api_doc.object_model.property_describer" />
</service> </service>
<service id="nelmio_api_doc.property_describers.object" class="Nelmio\ApiDocBundle\PropertyDescriber\ObjectPropertyDescriber" public="false"> <service id="nelmio_api_doc.object_model.property_describers.object" class="Nelmio\ApiDocBundle\PropertyDescriber\ObjectPropertyDescriber" public="false">
<tag name="nelmio_api_doc.property_describer" priority="-1000" /> <tag name="nelmio_api_doc.object_model.property_describer" priority="-1000" />
</service> </service>
<!-- Form Type Extensions --> <!-- Form Type Extensions -->