Merge branch 'zf2-skeleton-version-bump'

src/DoctrineORMModule/Doctrine/ORM/Configuration.php

@@ -37,8 +37,8 @@
 class Configuration extends Instance
 {
     /**
-     * Definition for configuration options. 
-     * 
+     * Definition for configuration options.
+     *
      * @var array
      */
     protected $definition = array(
@@ -57,12 +57,12 @@ class Configuration extends Instance
             'named_native_queries'      => 'array',
         )
     );
-    
+
     /**
-     * @var Doctrine\ORM\Mapping\Driver\Driver
+     * @var \Doctrine\Common\Persistence\Mapping\Driver\MappingDriver
      */
     protected $metadataDriver;
-    
+
     /**
      * @var Doctrine\Common\Cache\Cache
      */
@@ -72,51 +72,50 @@ class Configuration extends Instance
      * @var Doctrine\Common\Cache\Cache
      */
     protected $queryCache;
-    
+
     /**
      * @var Doctrine\Common\Cache\Cache
      */
     protected $resutlCache;
-    
+
     /**
      * @var Doctrine\DBAL\Logging\SQLLogger
      */
     protected $logger;
-    
+
     /**
      * Constructor.
-     * 
+     *
      * @param array 	$opts
      * @param Cache 	$metadataCache
      * @param Cache 	$queryCache
      * @param Cache 	$resultCache
      * @param SQLLogger $logger
      */
-    public function __construct(array $opts, $metadataDriver, Cache $metadataCache, Cache $queryCache, 
+    public function __construct(array $opts, $metadataDriver, Cache $metadataCache, Cache $queryCache,
                                 Cache $resultCache = null, SQLLogger $logger = null)
     {
     	if ($metadataDriver instanceof DriverChain) {
     		$metadataDriver = $metadataDriver->getInstance();
     	}
-    	
+
     	$this->metadataDriver = $metadataDriver;
         $this->metadataCache  = $metadataCache;
         $this->queryCache     = $queryCache;
         $this->resultCache    = $resultCache;
         $this->logger         = $logger;
-        
+
         parent::__construct($opts);
     }
-    
+
     /**
-     * (non-PHPdoc)
-     * @see DoctrineORMModule\Instance.Instance::loadInstance()
+     * {@inheritDoc}
      */
     protected function loadInstance()
     {
         $opts   = $this->opts;
         $config = new DoctrineConfiguration;
-        
+
         // proxies
         $config->setAutoGenerateProxyClasses($opts['auto_generate_proxies']);
         $config->setProxyDir($opts['proxy_dir']);
@@ -129,15 +128,13 @@ protected function loadInstance()
         $config->setCustomDatetimeFunctions($opts['custom_datetime_functions']);
         $config->setCustomStringFunctions($opts['custom_string_functions']);
         $config->setCustomNumericFunctions($opts['custom_numeric_functions']);
-        
+
         // custom queries
         foreach($opts['named_queries'] as $query) {
-            $this->_validateOptions($query, $this->_namedQueryDefinition);
             $config->addNamedQuery($query['name'], $query['dql']);
         }
-        
+
         foreach($opts['named_native_queries'] as $query) {
-            $this->_validateOptions($query, $this->_namedNativeQueryDefinition);
             $config->addNamedNativeQuery($query['name'], $query['sql'], new $query['rsm']);
         }
 
@@ -148,10 +145,10 @@ protected function loadInstance()
 
         // logger
         $config->setSQLLogger($this->logger);
-        
+
         // finally, the driver
         $config->setMetadataDriverImpl($this->metadataDriver);
-        
+
         $this->instance = $config;
     }
 }

src/DoctrineORMModule/Doctrine/ORM/Connection.php

@@ -37,7 +37,7 @@
 class Connection extends Instance
 {
     /**
-     * @var Doctrine\ORM\Configuration
+     * @var \Doctrine\ORM\Configuration
      */
     protected $config;
 
@@ -67,8 +67,7 @@ public function __construct(array $params, Configuration $config, EventManager $
     }
 
     /**
-     * (non-PHPdoc)
-     * @see DoctrineORMModule\Instance.Instance::loadInstance()
+     * {@inheritDoc}
      */
     protected function loadInstance()
     {

src/DoctrineORMModule/Factory/EntityManager.php

@@ -36,10 +36,12 @@ class EntityManager
 {
 	public static function get(Connection $conn)
 	{
+        /** @var $instance \Doctrine\DBAL\Connection */
+        $instance = $conn->getInstance();
 		return DoctrineEntityManager::create(
-			$conn->getInstance(),
-			$conn->getInstance()->getConfiguration(),
-			$conn->getInstance()->getEventManager()
+            $instance,
+            $instance->getConfiguration(),
+            $instance->getEventManager()
 		);
 	}
 }

tests/Bootstrap.php

@@ -43,7 +43,7 @@
 $moduleManager->events()->attachAggregate($defaultListeners);
 $moduleManager->loadModules();
 
-$config = $defaultListeners->getConfigListener()->getMergedConfig()->toArray();
+$config = $defaultListeners->getConfigListener()->getMergedConfig(false);
 
 // setup sqlite
 $config['di']['instance']['DoctrineORMModule\Doctrine\ORM\Connection']['parameters']['params'] = array(

tests/DoctrineORMModuleTest/Di/ConnectionTest.php

@@ -14,12 +14,15 @@ class ConnectionTest extends TestCase
     public function testCanInjectConnection()
     {
         $locator = $this->getLocator();
-        $target = $locator->get('DoctrineORMModuleTest\Di\\ConnectionTestInjectTarget');
-        $this->assertInstanceOf('DoctrineORMModuleTest\Di\\ConnectionTestInjectTarget', $target);
+        /* @var $target ConnectionTestInjectTarget */
+        $target = $locator->get('DoctrineORMModuleTest\\Di\\ConnectionTestInjectTarget');
+        $this->assertInstanceOf('DoctrineORMModuleTest\\Di\\ConnectionTestInjectTarget', $target);
         $connection = $target->getConnection();
-        $this->assertInstanceOf('Doctrine\DBAL\Connection', $connection);
-        $this->assertSame($connection, $locator->get('Doctrine\DBAL\Connection'));
-        $this->assertSame($connection, $locator->get('Doctrine\ORM\EntityManager')->getConnection());
+        $this->assertInstanceOf('Doctrine\\DBAL\\Connection', $connection);
+        $this->assertSame($connection, $locator->get('Doctrine\\DBAL\\Connection'));
+        /* @var $em \Doctrine\ORM\EntityManager */
+        $em = $locator->get('Doctrine\\ORM\\EntityManager');
+        $this->assertSame($connection, $em->getConnection());
     }
 }
 

tests/DoctrineORMModuleTest/Di/EntityManagerTest.php

@@ -14,6 +14,7 @@ class EntityManagerTest extends TestCase
     public function testCanInjectEntityManager()
     {
         $locator = $this->getLocator();
+        /* @var $target EntityManagerTestInjectTarget */
         $target = $locator->get('DoctrineORMModuleTest\Di\\EntityManagerTestInjectTarget');
         $this->assertInstanceOf('DoctrineORMModuleTest\Di\\EntityManagerTestInjectTarget', $target);
         $em = $target->getEntityManager();

tests/DoctrineORMModuleTest/Framework/TestCase.php

@@ -3,15 +3,14 @@
 namespace DoctrineORMModuleTest\Framework;
 
 use PHPUnit_Framework_TestCase;
-use DoctrineModule\Service\Doctrine;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\SchemaTool;
-use Zend\Di\Locator;
+use Zend\Di\LocatorInterface;
 
 class TestCase extends PHPUnit_Framework_TestCase
 {
     /**
-     * @var Locator
+     * @var LocatorInterface
      */
     protected static $locator;
 
@@ -20,11 +19,6 @@ class TestCase extends PHPUnit_Framework_TestCase
      */
     protected static $hasDb = false;
 
-    /**
-     * @var \DoctrineModule\Service\Doctrine
-     */
-    protected $_service;
-
     /**
      * Creates a database if not done already.
      */
@@ -50,15 +44,15 @@ public function dropDb()
     }
 
     /**
-     * @param Locator $locator
+     * @param LocatorInterface $locator
      */
-    public static function setLocator(Locator $locator)
+    public static function setLocator(LocatorInterface $locator)
     {
         self::$locator = $locator;
     }
 
     /**
-     * @return Locator
+     * @return LocatorInterface
      */
     public function getLocator()
     {