Renamed factory to incorporate verbiage "Abstract"

- per @Ocramius

Author: weierophinney

doc/book/cookbook/automating-controller-factories.md

@@ -4,23 +4,23 @@ Writing a factory class for each and every controller that has dependencies
 can be tedious, particularly in early development as you are still sorting
 out dependencies.
 
-As of version 3.0.1, zend-mvc ships with `Zend\Mvc\Controller\LazyControllerFactory`,
+As of version 3.0.1, zend-mvc ships with `Zend\Mvc\Controller\LazyControllerAbstractFactory`,
 which provides a reflection-based approach to controller instantiation,
 resolving constructor dependencies to the relevant services. The factory may be
 used as either an abstract factory, or mapped to specific controller names as a
 factory:
 
 ```php
-use Zend\Mvc\Controller\LazyControllerFactory;
+use Zend\Mvc\Controller\LazyControllerAbstractFactory;
 
 return [
     /* ... */
     'controllers' => [
         'abstract_factories' => [
-            LazyControllerFactory::class,
+            LazyControllerAbstractFactory::class,
         ],
         'factories' => [
-            'MyModule\Controller\FooController' => LazyControllerFactory::class,
+            'MyModule\Controller\FooController' => LazyControllerAbstractFactory::class,
         ],
     ],
     /* ... */

src/Controller/LazyControllerFactory.php renamed to src/Controller/LazyControllerAbstractFactory.php

@@ -36,7 +36,7 @@
  * <code>
  * 'controllers' => [
  *     'abstract_factories' => [
- *         LazyControllerFactory::class,
+ *         LazyControllerAbstractFactory::class,
  *     ],
  * ],
  * </code>
@@ -46,7 +46,7 @@
  * <code>
  * 'controllers' => [
  *     'factories' => [
- *         MyControllerWithDependencies::class => LazyControllerFactory::class,
+ *         MyControllerWithDependencies::class => LazyControllerAbstractFactory::class,
  *     ],
  * ],
  * </code>
@@ -70,7 +70,7 @@
  * `$options` passed to the factory are ignored in all cases, as we cannot
  * make assumptions about which argument(s) they might replace.
  */
-class LazyControllerFactory implements AbstractFactoryInterface
+class LazyControllerAbstractFactory implements AbstractFactoryInterface
 {
     /**
      * Maps known classes/interfaces to the service that provides them; only

test/Controller/LazyControllerFactoryTest.php renamed to test/Controller/LazyControllerAbstractFactoryTest.php

@@ -9,11 +9,11 @@
 
 use Interop\Container\ContainerInterface;
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\Mvc\Controller\LazyControllerFactory;
+use Zend\Mvc\Controller\LazyControllerAbstractFactory;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use Zend\Validator\ValidatorPluginManager;
 
-class LazyControllerFactoryTest extends TestCase
+class LazyControllerAbstractFactoryTest extends TestCase
 {
     public function setUp()
     {
@@ -41,34 +41,34 @@ public function nonClassRequestedNames()
      */
     public function testCanCreateReturnsFalseForNonClassRequestedNames($requestedName)
     {
-        $factory = new LazyControllerFactory();
+        $factory = new LazyControllerAbstractFactory();
         $this->assertFalse($factory->canCreate($this->container->reveal(), $requestedName));
     }
 
     public function testCanCreateReturnsFalseForClassesThatDoNotImplementDispatchableInterface()
     {
-        $factory = new LazyControllerFactory();
+        $factory = new LazyControllerAbstractFactory();
         $this->assertFalse($factory->canCreate($this->container->reveal(), __CLASS__));
     }
 
     public function testFactoryInstantiatesClassDirectlyIfItHasNoConstructor()
     {
-        $factory = new LazyControllerFactory();
+        $factory = new LazyControllerAbstractFactory();
         $controller = $factory($this->container->reveal(), TestAsset\SampleController::class);
         $this->assertInstanceOf(TestAsset\SampleController::class, $controller);
     }
 
     public function testFactoryInstantiatesClassDirectlyIfConstructorHasNoArguments()
     {
-        $factory = new LazyControllerFactory();
+        $factory = new LazyControllerAbstractFactory();
         $controller = $factory($this->container->reveal(), TestAsset\ControllerWithEmptyConstructor::class);
         $this->assertInstanceOf(TestAsset\ControllerWithEmptyConstructor::class, $controller);
     }
 
     public function testFactoryRaisesExceptionWhenUnableToResolveATypeHintedService()
     {
         $this->container->has(TestAsset\SampleInterface::class)->willReturn(false);
-        $factory = new LazyControllerFactory();
+        $factory = new LazyControllerAbstractFactory();
         $this->setExpectedException(
             ServiceNotFoundException::class,
             sprintf(
@@ -82,7 +82,7 @@ public function testFactoryRaisesExceptionWhenUnableToResolveATypeHintedService(
 
     public function testFactoryPassesNullForScalarParameters()
     {
-        $factory = new LazyControllerFactory();
+        $factory = new LazyControllerAbstractFactory();
         $controller = $factory($this->container->reveal(), TestAsset\ControllerWithScalarParameters::class);
         $this->assertInstanceOf(TestAsset\ControllerWithScalarParameters::class, $controller);
         $this->assertNull($controller->foo);
@@ -95,7 +95,7 @@ public function testFactoryInjectsConfigServiceForConfigArgumentsTypeHintedAsArr
         $this->container->has('config')->willReturn(true);
         $this->container->get('config')->willReturn($config);
 
-        $factory = new LazyControllerFactory();
+        $factory = new LazyControllerAbstractFactory();
         $controller = $factory($this->container->reveal(), TestAsset\ControllerAcceptingConfigToConstructor::class);
         $this->assertInstanceOf(TestAsset\ControllerAcceptingConfigToConstructor::class, $controller);
         $this->assertEquals($config, $controller->config);
@@ -107,7 +107,7 @@ public function testFactoryCanInjectKnownTypeHintedServices()
         $this->container->has(TestAsset\SampleInterface::class)->willReturn(true);
         $this->container->get(TestAsset\SampleInterface::class)->willReturn($sample);
 
-        $factory = new LazyControllerFactory();
+        $factory = new LazyControllerAbstractFactory();
         $controller = $factory($this->container->reveal(), TestAsset\ControllerWithTypeHintedConstructorParameter::class);
         $this->assertInstanceOf(TestAsset\ControllerWithTypeHintedConstructorParameter::class, $controller);
         $this->assertSame($sample, $controller->sample);
@@ -119,7 +119,7 @@ public function testFactoryResolvesTypeHintsForServicesToWellKnownServiceNames()
         $this->container->has('ValidatorManager')->willReturn(true);
         $this->container->get('ValidatorManager')->willReturn($validators);
 
-        $factory = new LazyControllerFactory();
+        $factory = new LazyControllerAbstractFactory();
         $controller = $factory(
             $this->container->reveal(),
             TestAsset\ControllerAcceptingWellKnownServicesAsConstructorParameters::class
@@ -145,7 +145,7 @@ public function testFactoryCanSupplyAMixOfParameterTypes()
         $this->container->has('config')->willReturn(true);
         $this->container->get('config')->willReturn($config);
 
-        $factory = new LazyControllerFactory();
+        $factory = new LazyControllerAbstractFactory();
         $controller = $factory($this->container->reveal(), TestAsset\ControllerWithMixedConstructorParameters::class);
         $this->assertInstanceOf(TestAsset\ControllerWithMixedConstructorParameters::class, $controller);