diff --git a/src/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactory.php b/src/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactory.php index ec2ea373e40..8b014467fd4 100644 --- a/src/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactory.php +++ b/src/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactory.php @@ -13,8 +13,6 @@ namespace ApiPlatform\Doctrine\Odm\Metadata\Resource; -use ApiPlatform\Doctrine\Common\State\PersistProcessor; -use ApiPlatform\Doctrine\Common\State\RemoveProcessor; use ApiPlatform\Doctrine\Odm\State\CollectionProvider; use ApiPlatform\Doctrine\Odm\State\ItemProvider; use ApiPlatform\Metadata\CollectionOperationInterface; @@ -110,9 +108,9 @@ private function getProvider(Operation $operation): string private function getProcessor(Operation $operation): string { if ($operation instanceof DeleteOperationInterface) { - return RemoveProcessor::class; + return 'api_platform.doctrine_mongodb.odm.state.remove_processor'; } - return PersistProcessor::class; + return 'api_platform.doctrine_mongodb.odm.state.persist_processor'; } } diff --git a/src/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactory.php b/src/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactory.php index 7f50d12977b..9f04b10453b 100644 --- a/src/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactory.php +++ b/src/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactory.php @@ -13,8 +13,6 @@ namespace ApiPlatform\Doctrine\Orm\Metadata\Resource; -use ApiPlatform\Doctrine\Common\State\PersistProcessor; -use ApiPlatform\Doctrine\Common\State\RemoveProcessor; use ApiPlatform\Doctrine\Orm\State\CollectionProvider; use ApiPlatform\Doctrine\Orm\State\ItemProvider; use ApiPlatform\Metadata\CollectionOperationInterface; @@ -110,9 +108,9 @@ private function getProvider(Operation $operation): string private function getProcessor(Operation $operation): string { if ($operation instanceof DeleteOperationInterface) { - return RemoveProcessor::class; + return 'api_platform.doctrine.orm.state.remove_processor'; } - return PersistProcessor::class; + return 'api_platform.doctrine.orm.state.persist_processor'; } } diff --git a/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml b/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml index 037ee945b5e..9e5ec877b1d 100644 --- a/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml +++ b/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml @@ -29,6 +29,7 @@ + @@ -36,6 +37,7 @@ + diff --git a/src/Symfony/Bundle/Resources/config/doctrine_orm.xml b/src/Symfony/Bundle/Resources/config/doctrine_orm.xml index bb71a354e5e..b63fe55fb4c 100644 --- a/src/Symfony/Bundle/Resources/config/doctrine_orm.xml +++ b/src/Symfony/Bundle/Resources/config/doctrine_orm.xml @@ -13,6 +13,7 @@ + @@ -20,6 +21,7 @@ + diff --git a/src/Symfony/Bundle/Resources/config/v3/doctrine_odm.xml b/src/Symfony/Bundle/Resources/config/v3/doctrine_odm.xml index ace96525184..e4639f267cf 100644 --- a/src/Symfony/Bundle/Resources/config/v3/doctrine_odm.xml +++ b/src/Symfony/Bundle/Resources/config/v3/doctrine_odm.xml @@ -20,6 +20,7 @@ + @@ -29,6 +30,7 @@ + diff --git a/src/Symfony/Bundle/Resources/config/v3/doctrine_orm.xml b/src/Symfony/Bundle/Resources/config/v3/doctrine_orm.xml index a87fb02eae1..c042d1c8cc9 100644 --- a/src/Symfony/Bundle/Resources/config/v3/doctrine_orm.xml +++ b/src/Symfony/Bundle/Resources/config/v3/doctrine_orm.xml @@ -19,6 +19,7 @@ + @@ -28,6 +29,7 @@ + diff --git a/tests/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactoryTest.php b/tests/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactoryTest.php index 5793373b06a..25a48705fa3 100644 --- a/tests/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactoryTest.php +++ b/tests/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactoryTest.php @@ -14,8 +14,6 @@ namespace ApiPlatform\Tests\Doctrine\Odm\Metadata\Resource; use ApiPlatform\Core\Tests\ProphecyTrait; -use ApiPlatform\Doctrine\Common\State\PersistProcessor; -use ApiPlatform\Doctrine\Common\State\RemoveProcessor; use ApiPlatform\Doctrine\Odm\Metadata\Resource\DoctrineMongoDbOdmResourceCollectionMetadataFactory; use ApiPlatform\Doctrine\Odm\State\CollectionProvider; use ApiPlatform\Doctrine\Odm\State\ItemProvider; @@ -97,8 +95,8 @@ public function operationProvider(): iterable $default = (new Get())->withName('get')->withClass(Dummy::class); yield [(new Get())->withProvider('has a provider')->withProcessor('and a processor')->withOperation($default), 'has a provider', 'and a processor']; - yield [(new Get())->withOperation($default), ItemProvider::class, PersistProcessor::class]; - yield [(new GetCollection())->withOperation($default), CollectionProvider::class, PersistProcessor::class]; - yield [(new Delete())->withOperation($default), ItemProvider::class, RemoveProcessor::class]; + yield [(new Get())->withOperation($default), ItemProvider::class, 'api_platform.doctrine_mongodb.odm.state.persist_processor']; + yield [(new GetCollection())->withOperation($default), CollectionProvider::class, 'api_platform.doctrine_mongodb.odm.state.persist_processor']; + yield [(new Delete())->withOperation($default), ItemProvider::class, 'api_platform.doctrine_mongodb.odm.state.remove_processor']; } } diff --git a/tests/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactoryTest.php b/tests/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactoryTest.php index 7bce670e5cc..630194a0547 100644 --- a/tests/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactoryTest.php +++ b/tests/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactoryTest.php @@ -14,8 +14,6 @@ namespace ApiPlatform\Tests\Doctrine\Orm\Metadata\Resource; use ApiPlatform\Core\Tests\ProphecyTrait; -use ApiPlatform\Doctrine\Common\State\PersistProcessor; -use ApiPlatform\Doctrine\Common\State\RemoveProcessor; use ApiPlatform\Doctrine\Orm\Metadata\Resource\DoctrineOrmResourceCollectionMetadataFactory; use ApiPlatform\Doctrine\Orm\State\CollectionProvider; use ApiPlatform\Doctrine\Orm\State\ItemProvider; @@ -85,8 +83,8 @@ public function operationProvider(): iterable $default = (new Get())->withName('get')->withClass(Dummy::class); yield [(new Get())->withProvider('has a provider')->withProcessor('and a processor')->withOperation($default), 'has a provider', 'and a processor']; - yield [(new Get())->withOperation($default), ItemProvider::class, PersistProcessor::class]; - yield [(new GetCollection())->withOperation($default), CollectionProvider::class, PersistProcessor::class]; - yield [(new Delete())->withOperation($default), ItemProvider::class, RemoveProcessor::class]; + yield [(new Get())->withOperation($default), ItemProvider::class, 'api_platform.doctrine.orm.state.persist_processor']; + yield [(new GetCollection())->withOperation($default), CollectionProvider::class, 'api_platform.doctrine.orm.state.persist_processor']; + yield [(new Delete())->withOperation($default), ItemProvider::class, 'api_platform.doctrine.orm.state.remove_processor']; } }