Merge branch 'hotfix/122'

Close #122

Author: weierophinney

CHANGELOG.md

@@ -2,29 +2,20 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.8.0 - TBD
+## 2.7.4 - TBD
 
 ### Added
 
 - Nothing.
 
-### Deprecated
+### Changes
 
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 2.7.4 - TBD
-
-### Added
-
-- Nothing.
+- [#122](https://github.com/zendframework/zend-inputfilter/pull/122) maps the
+  `Zend\InputFilter\InputFilterPluginManager` service to
+  `Zend\InputFilter\InputFilterPluginManagerFactory`, and adds an alias from
+  `InputFitlerPluginManager` to the fully qualified class name. This change
+  allows you to request the service using either the original short name, or the
+  fully qualified class name.
 
 ### Deprecated
 

src/ConfigProvider.php

@@ -29,11 +29,14 @@ public function __invoke()
     public function getDependencyConfig()
     {
         return [
+            'aliases' => [
+                'InputFilterManager' => InputFilterPluginManager::class,
+            ],
             'abstract_factories' => [
                 InputFilterAbstractServiceFactory::class,
             ],
             'factories' => [
-                'InputFilterManager' => InputFilterPluginManagerFactory::class,
+                InputFilterPluginManager::class => InputFilterPluginManagerFactory::class,
             ],
         ];
     }

test/ConfigProviderTest.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-inputfilter for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\InputFilter;
+
+use Zend\InputFilter\ConfigProvider;
+use Zend\InputFilter\InputFilterAbstractServiceFactory;
+use Zend\InputFilter\InputFilterPluginManager;
+use Zend\InputFilter\InputFilterPluginManagerFactory;
+
+final class ConfigProviderTest extends \PHPUnit_Framework_TestCase
+{
+    public function testProvidesExpectedConfiguration()
+    {
+        $provider = new ConfigProvider();
+
+        $expected = [
+            'abstract_factories' => [
+                InputFilterAbstractServiceFactory::class,
+            ],
+            'aliases' => [
+                'InputFilterManager' => InputFilterPluginManager::class,
+            ],
+            'factories' => [
+                InputFilterPluginManager::class => InputFilterPluginManagerFactory::class,
+            ],
+        ];
+
+        $this->assertEquals($expected, $provider->getDependencyConfig());
+    }
+
+    public function testInvocationProvidesDependencyConfiguration()
+    {
+        $provider = new ConfigProvider();
+
+        $expected = [
+            'dependencies' => $provider->getDependencyConfig(),
+        ];
+        $this->assertEquals($expected, $provider());
+    }
+}