Extra benchmark, renamed test assets to be more wholesome

Author: GeeH

benchmarks/FetchNewServicesBench.php

@@ -156,6 +156,14 @@ public function benchBuildAbstractFactoryFoo()
     public function benchFetchConfigAbstractFactoryBar()
     {
         $sm = clone $this->sm;
+
+        $sm->get(BenchAsset\Bar::class);
+    }
+
+    public function benchBuildConfigAbstractFactoryBar()
+    {
+        $sm = clone $this->sm;
+
         $sm->get(BenchAsset\Bar::class);
     }
 }

src/AbstractFactory/ConfigAbstractFactory.php

@@ -69,7 +69,7 @@ public function __invoke(\Interop\Container\ContainerInterface $container, $requ
         ) {
             throw new ServiceNotCreatedException('Dependencies config must exist and be an array of strings');
         }
-        $dependencies = $dependencies[$requestedName];  
+        $dependencies = $dependencies[$requestedName];
         $arguments = array_map([$container, 'get'], $dependencies);
 
         return new $requestedName(...$arguments);

test/AbstractFactory/ConfigAbstractFactoryTest.php

@@ -17,6 +17,7 @@
 use ZendTest\ServiceManager\TestAsset\ComplexDependencyObject;
 use ZendTest\ServiceManager\TestAsset\FailingFactory;
 use ZendTest\ServiceManager\TestAsset\InvokableObject;
+use ZendTest\ServiceManager\TestAsset\SecondComplexDependencyObject;
 use ZendTest\ServiceManager\TestAsset\SimpleDependencyObject;
 
 class ConfigAbstractFactoryTest extends \PHPUnit_Framework_TestCase
@@ -106,10 +107,8 @@ public function testInvokeWithSimpleArguments()
             [
                 ConfigAbstractFactory::class => [
                     InvokableObject::class => [],
-                    FailingFactory::class => [],
                     SimpleDependencyObject::class => [
                         InvokableObject::class,
-                        FailingFactory::class,
                     ],
                 ]
             ]
@@ -126,31 +125,21 @@ public function testInvokeWithComplexArguments()
     {
         $abstractFactory = new ConfigAbstractFactory();
         $serviceManager = new ServiceManager();
-        $serviceManager->setService(
-            LazyLoadingValueHolderFactory::class . '.config',
-            [
-                'Proxies' => 'Suck',
-            ]
-        );
         $serviceManager->setService(
             'config',
             [
                 ConfigAbstractFactory::class => [
                     InvokableObject::class => [],
-                    FailingFactory::class => [],
                     SimpleDependencyObject::class => [
                         InvokableObject::class,
-                        FailingFactory::class,
                     ],
-                    LazyLoadingValueHolderFactory::class => [],
                     ComplexDependencyObject::class => [
                         SimpleDependencyObject::class,
-                        LazyServiceFactory::class,
-                    ],
-                    LazyServiceFactory::class => [
-                        LazyLoadingValueHolderFactory::class,
-                        LazyLoadingValueHolderFactory::class . '.config',
+                        SecondComplexDependencyObject::class,
                     ],
+                   SecondComplexDependencyObject::class => [
+                       InvokableObject::class,
+                   ],
                 ]
             ]
         );

test/TestAsset/ComplexDependencyObject.php

@@ -9,11 +9,11 @@
 
 namespace ZendTest\ServiceManager\TestAsset;
 
-use Zend\ServiceManager\Proxy\LazyServiceFactory;
-
 class ComplexDependencyObject
 {
-    public function __construct(SimpleDependencyObject $simpleDependencyObject, LazyServiceFactory $lazyServiceFactory)
-    {
+    public function __construct(
+        SimpleDependencyObject $simpleDependencyObject,
+        SecondComplexDependencyObject $secondComplexDependencyObject
+    ) {
     }
 }

test/TestAsset/SecondComplexDependencyObject.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\ServiceManager\TestAsset;
+
+class SecondComplexDependencyObject
+{
+    public function __construct(InvokableObject $invokableObject)
+    {
+    }
+}

test/TestAsset/SimpleDependencyObject.php

@@ -11,7 +11,7 @@
 
 class SimpleDependencyObject
 {
-    public function __construct(InvokableObject $invokableObject, FailingFactory $failingFactory)
+    public function __construct(InvokableObject $invokableObject)
     {
     }
 }