Merge branch 'hotfix/zendframework/zendframework#7142-zendframework/z…

…endframework#7144-config-abstract-factory-should-return-config-key' into develop

Close zendframework/zendframework#7142
Close zendframework/zendframework#7144
Forward port zendframework/zendframework#7142
Forward port zendframework/zendframework#7144

src/AbstractConfigFactory.php

@@ -84,7 +84,7 @@ public function createServiceWithName(ServiceManager\ServiceLocatorInterface $se
 
         $config = $serviceLocator->get('Config');
         $this->configs[$requestedName] = $this->configs[$key] = $config[$key];
-        return $config;
+        return $config[$key];
     }
 
     /**

test/AbstractConfigFactoryTest.php

@@ -20,6 +20,11 @@
  */
 class AbstractConfigFactoryTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var array
+     */
+    protected $config;
+
     /**
      * @var \Zend\Mvc\Application
      */
@@ -35,7 +40,7 @@ class AbstractConfigFactoryTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $config = array(
+        $this->config = array(
             'MyModule' => array(
                 'foo' => array(
                     'bar'
@@ -56,7 +61,7 @@ public function setUp()
             ))
         );
 
-        $sm->setService('Config', $config);
+        $sm->setService('Config', $this->config);
     }
 
     /**
@@ -131,4 +136,17 @@ public function testCreateService()
         $this->assertInternalType('array', $serviceLocator->get('phly-blog-config'));
         $this->assertInternalType('array', $serviceLocator->get('config-phly-blog'));
     }
+
+    /**
+     * @depends testCreateService
+     *
+     * @group 7142
+     * @group 7144
+     */
+    public function testCreateServiceWithRequestedConfigKey()
+    {
+        $serviceLocator = $this->serviceManager;
+        $this->assertSame($this->config['MyModule'], $serviceLocator->get('MyModule\Config'));
+        $this->assertSame($this->config['phly-blog'], $serviceLocator->get('phly-blog-config'));
+    }
 }