Merge pull request #257 from TomHAnderson/hotfix/253-collection-link

Hotfix/253 collection link
zfcampus · Jun 12, 2016 · 144cdeb · 144cdeb
2 parents fa00dbe + 86369c0
commit 144cdeb
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 52 deletions.
diff --git a/composer.json b/composer.json
@@ -42,7 +42,9 @@
     },
     "suggest": {
         "doctrine/doctrine-orm-module": "For ORM mapping",
-        "doctrine/doctrine-mongo-odm-module": "For Mongo ODM mapping"
+        "doctrine/doctrine-mongo-odm-module": "For Mongo ODM mapping",
+        "api-skeletons/zf-doctrine-hydrator": "Hydrator strategies for Doctrine in Apipgility",
+        "api-skeletons/zf-oauth2-doctrine": "OAuth2 Doctrine Adapter for Apigility"
     },
     "prefer-stable": true,
     "autoload": {

diff --git a/src/Admin/Model/DoctrineRestServiceModel.php b/src/Admin/Model/DoctrineRestServiceModel.php
@@ -768,23 +768,6 @@ public function createDoctrineConfig(DoctrineRestServiceEntity $details, $entity
         $objectManager      = $this->getServiceManager()->get($details->objectManager);
         $hydratorStrategies = array();
 
-        // Add all ORM collections to Hydrator Strategies
-        if ($objectManager instanceof \Doctrine\ORM\EntityManager) {
-            $collectionStrategyName = 'ZF\Apigility\Doctrine\Server\Hydrator\Strategy\CollectionLink';
-            $metadataFactory = $objectManager->getMetadataFactory();
-            $metadata = $metadataFactory->getMetadataFor($entityClass);
-
-            foreach ($metadata->associationMappings as $relationName => $relationMapping) {
-                switch ($relationMapping['type']) {
-                    case 4:
-                        $hydratorStrategies[$relationName] = $collectionStrategyName;
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-
         // The abstract_factories key is set to the value so these factories do not get duplicaed with each resource
         $config = array(
             'zf-apigility' => array(

diff --git a/src/Server/Hydrator/Strategy/CollectionExtract.php b/src/Server/Hydrator/Strategy/CollectionExtract.php
diff --git a/src/Server/Resource/DoctrineResourceFactory.php b/src/Server/Resource/DoctrineResourceFactory.php
@@ -38,7 +38,6 @@ class DoctrineResourceFactory implements AbstractFactoryInterface
     public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
     {
         if (array_key_exists($requestedName, $this->lookupCache)) {
-
             return $this->lookupCache[$requestedName];
         }