Merge branch 'hotfix/5' into release-1.0.0

Forward port #5

Conflicts:
	CHANGELOG.md

CHANGELOG.md

@@ -27,6 +27,30 @@ Versions prior to 0.2.0 were released as the package "webimpress/zend-auradi-con
 
 - Nothing.
 
+## 0.2.1 - 2018-01-23
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#5](https://github.com/zendframework/zend-auradi-config/pull/5) fixes an
+  issue whereby factories would not receive the service name as the second
+  argument, preventing their re-use for additional services.
+
 ## 0.2.0 - 2017-11-21
 
 ### Added

src/Config.php

@@ -92,7 +92,7 @@ public function define(Container $container)
                 if (! $container->has($factory)) {
                     $container->set($factory, $container->lazyNew($factory));
                 }
-                $container->set($service, $container->lazyGetCall($factory, '__invoke', $container));
+                $container->set($service, $container->lazyGetCall($factory, '__invoke', $container, $service));
             }
         }
 

test/ConfigTest.php

@@ -12,6 +12,7 @@
 use Aura\Di\ContainerBuilder;
 use PHPUnit\Framework\TestCase;
 use Zend\AuraDi\Config\Config;
+use ZendTest\AuraDi\Config\TestAsset\FactoryWithName;
 
 class ConfigTest extends TestCase
 {
@@ -214,4 +215,25 @@ public function testInjectMultipleDelegators()
             $service->injected
         );
     }
+
+    public function testFactoryGetsServiceName()
+    {
+        $factory = new FactoryWithName();
+
+        $dependencies = [
+            'services'  => [
+                'factory' => $factory,
+            ],
+            'factories' => [
+                'foo-bar' => 'factory',
+            ],
+        ];
+
+        $container = $this->builder->newConfiguredInstance([new Config(['dependencies' => $dependencies])]);
+        $args = $container->get('foo-bar');
+
+        self::assertCount(2, $args);
+        self::assertSame($container, array_shift($args));
+        self::assertEquals('foo-bar', array_shift($args));
+    }
 }

test/TestAsset/FactoryWithName.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-auradi-config for the canonical source repository
+ * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-auradi-config/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\AuraDi\Config\TestAsset;
+
+class FactoryWithName
+{
+    public function __invoke()
+    {
+        return func_get_args();
+    }
+}