Merge branch 'hotfix/33'

Close #35
Fixes #33

Author: michalbundyra

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.5.1 - TBD
+## 1.5.1 - 2016-11-14
 
 ### Added
 
@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#35](https://github.com/zfcampus/zf-doctrine-querybuilder/pull/35) fixes
+  an issue with `DefaultOdmFactory` and `DefaultOrmFactory` when used with
+  ZF2 with context of `AbstractPluginManager`.
 
 ## 1.5.0 - 2016-11-10
 

src/Query/Provider/DefaultOdmFactory.php

@@ -7,6 +7,7 @@
 namespace ZF\Doctrine\QueryBuilder\Query\Provider;
 
 use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\AbstractPluginManager;
 
 class DefaultOdmFactory
 {
@@ -18,6 +19,10 @@ class DefaultOdmFactory
      */
     public function __invoke(ContainerInterface $container)
     {
+        if ($container instanceof AbstractPluginManager) {
+            $container = $container->getServiceLocator() ?: $container;
+        }
+
         $provider = new DefaultOdm();
         $provider->setServiceLocator($container);
 

src/Query/Provider/DefaultOrmFactory.php

@@ -7,6 +7,7 @@
 namespace ZF\Doctrine\QueryBuilder\Query\Provider;
 
 use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\AbstractPluginManager;
 
 class DefaultOrmFactory
 {
@@ -18,6 +19,10 @@ class DefaultOrmFactory
      */
     public function __invoke(ContainerInterface $container)
     {
+        if ($container instanceof AbstractPluginManager) {
+            $container = $container->getServiceLocator() ?: $container;
+        }
+
         $provider = new DefaultOrm();
         $provider->setServiceLocator($container);
 

test/Query/Provider/DefaultOdmFactoryTest.php

@@ -7,6 +7,7 @@
 namespace ZFTest\Doctrine\QueryBuilder\Query\Provider;
 
 use PHPUnit_Framework_TestCase as TestCase;
+use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use ZF\Doctrine\QueryBuilder\Query\Provider\DefaultOdm;
 use ZF\Doctrine\QueryBuilder\Query\Provider\DefaultOdmFactory;
@@ -23,4 +24,17 @@ public function testInvokableFactoryReturnsDefaultOdmQueryProvider()
         $this->assertInstanceOf(DefaultOdm::class, $provider);
         $this->assertAttributeSame($serviceLocator, 'serviceLocator', $provider);
     }
+
+    public function testInvokableFactoryReturnsDefaultOdmQueryProviderWhenCreatedViaAbstractPluginManager()
+    {
+        $serviceLocator = $this->prophesize(ServiceLocatorInterface::class)->reveal();
+        $abstractPluginManager = $this->prophesize(AbstractPluginManager::class);
+        $abstractPluginManager->getServiceLocator()->willReturn($serviceLocator);
+
+        $factory = new DefaultOdmFactory();
+        $provider = $factory($abstractPluginManager->reveal());
+
+        $this->assertInstanceOf(DefaultOdm::class, $provider);
+        $this->assertAttributeSame($serviceLocator, 'serviceLocator', $provider);
+    }
 }

test/Query/Provider/DefaultOrmFactoryTest.php

@@ -7,6 +7,7 @@
 namespace ZFTest\Doctrine\QueryBuilder\Query\Provider;
 
 use PHPUnit_Framework_TestCase as TestCase;
+use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use ZF\Doctrine\QueryBuilder\Query\Provider\DefaultOrm;
 use ZF\Doctrine\QueryBuilder\Query\Provider\DefaultOrmFactory;
@@ -23,4 +24,17 @@ public function testInvokableFactoryReturnsDefaultOdmQueryProvider()
         $this->assertInstanceOf(DefaultOrm::class, $provider);
         $this->assertAttributeSame($serviceLocator, 'serviceLocator', $provider);
     }
+
+    public function testInvokableFactoryReturnsDefaultOrmQueryProviderWhenCreatedViaAbstractPluginManager()
+    {
+        $serviceLocator = $this->prophesize(ServiceLocatorInterface::class)->reveal();
+        $abstractPluginManager = $this->prophesize(AbstractPluginManager::class);
+        $abstractPluginManager->getServiceLocator()->willReturn($serviceLocator);
+
+        $factory = new DefaultOrmFactory();
+        $provider = $factory($abstractPluginManager->reveal());
+
+        $this->assertInstanceOf(DefaultOrm::class, $provider);
+        $this->assertAttributeSame($serviceLocator, 'serviceLocator', $provider);
+    }
 }