Use service factory syntax introduced in Symfony 2.6.

OpenConext · Jun 3, 2015 · ee3a4a1 · ee3a4a1
1 parent 64775de
commit ee3a4a1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 34 deletions.
diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/projection.yml
@@ -2,8 +2,7 @@ services:
     stepup.repository.identifying_data:
         public: false
         class: Surfnet\Stepup\IdentifyingData\Entity\IdentifyingDataRepository
-        factory_service: doctrine.orm.entity_manager
-        factory_method:  getRepository
+        factory: [@doctrine.orm.entity_manager, getRepository]
         arguments:
             - 'Surfnet\Stepup\IdentifyingData\Entity\IdentifyingData'
 

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/ApiBundle/Resources/config/services.yml
@@ -2,74 +2,62 @@ services:
     # Repositories
     surfnet_stepup_middleware_api.repository.identity:
         class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\IdentityRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Identity ]
 
     surfnet_stepup_middleware_api.repository.institution_listing:
         class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\InstitutionListingRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\InstitutionListing ]
 
     surfnet_stepup_middleware_api.repository.ra:
         class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Ra ]
 
     surfnet_stepup_middleware_api.repository.raa:
         class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaaRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Raa ]
 
     surfnet_stepup_middleware_api.repository.ra_candidate:
         class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaCandidateRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaCandidate ]
 
     surfnet_stepup_middleware_api.repository.ra_listing:
         class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaListingRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing ]
 
     surfnet_stepup_middleware_api.repository.sraa:
         class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\SraaRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\Sraa ]
 
     surfnet_stepup_middleware_api.repository.unverified_second_factor:
         class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\UnverifiedSecondFactorRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\UnverifiedSecondFactor ]
 
     surfnet_stepup_middleware_api.repository.verified_second_factor:
         class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VerifiedSecondFactorRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VerifiedSecondFactor ]
 
     surfnet_stepup_middleware_api.repository.vetted_second_factor:
         class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\VettedSecondFactorRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\VettedSecondFactor ]
 
     surfnet_stepup_middleware_api.repository.ra_second_factor:
         class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\RaSecondFactorRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaSecondFactor ]
 
     surfnet_stepup_middleware_api.repository.audit_log:
         class: Surfnet\StepupMiddleware\ApiBundle\Identity\Repository\AuditLogRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\AuditLogEntry ]
 
     # Domain Services

diff --git a/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/repositories.yml b/src/Surfnet/StepupMiddleware/GatewayBundle/Resources/config/repositories.yml
@@ -1,14 +1,12 @@
 services:
     middleware.gateway_repository.saml_entities:
-        class:           Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntityRepository
-        factory_service: doctrine.orm.gateway_entity_manager
-        factory_method:  getRepository
+        class:   Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntityRepository
+        factory: [@doctrine.orm.gateway_entity_manager, getRepository]
         arguments:
             - 'Surfnet\StepupMiddleware\GatewayBundle\Entity\SamlEntity'
 
     middleware.gateway_repository.second_factors:
-        class:           Surfnet\StepupMiddleware\GatewayBundle\Repository\SecondFactorRepository
-        factory_service: doctrine.orm.gateway_entity_manager
-        factory_method:  getRepository
+        class:   Surfnet\StepupMiddleware\GatewayBundle\Repository\SecondFactorRepository
+        factory: [@doctrine.orm.gateway_entity_manager, getRepository]
         arguments:
             - 'Surfnet\StepupMiddleware\GatewayBundle\Entity\SecondFactor'
diff --git a/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml b/src/Surfnet/StepupMiddleware/ManagementBundle/Resources/config/services.yml
@@ -36,8 +36,7 @@ services:
 
     surfnet_stepup_middleware_management.repository.email_template:
         class: Surfnet\StepupMiddleware\ManagementBundle\Configuration\Repository\EmailTemplateRepository
-        factory_service: doctrine.orm.middleware_entity_manager
-        factory_method: getRepository
+        factory: [@doctrine.orm.middleware_entity_manager, getRepository]
         arguments: [ Surfnet\StepupMiddleware\ManagementBundle\Configuration\Entity\EmailTemplate ]
 
     surfnet_stepup_middleware_management.service.email_template: