Merge branch 'hotfix/81' into release-2.7

Close #81

CHANGELOG.md

@@ -6,7 +6,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#81](https://github.com/zendframework/zend-servicemanager/pull/81) adds a
+  test covering forwards-compatibility features for plugin manager
+  implementations.
 
 ### Deprecated
 

test/AbstractPluginManagerTest.php

@@ -17,7 +17,9 @@
 use Zend\ServiceManager\Exception\RuntimeException;
 use Zend\ServiceManager\ServiceManager;
 use ZendTest\ServiceManager\TestAsset\FooPluginManager;
+use ZendTest\ServiceManager\TestAsset\InvokableObject;
 use ZendTest\ServiceManager\TestAsset\MockSelfReturningDelegatorFactory;
+use ZendTest\ServiceManager\TestAsset\V2v3PluginManager;
 
 class AbstractPluginManagerTest extends \PHPUnit_Framework_TestCase
 {
@@ -333,4 +335,10 @@ public function testPassingArgumentsOtherThanNullConfigOrContainerAsFirstConstru
         $this->setExpectedException(InvalidArgumentException::class);
         new FooPluginManager($arg);
     }
+
+    public function testV2v3PluginManager()
+    {
+        $pluginManager = new V2v3PluginManager(new ServiceManager());
+        $this->assertInstanceOf(InvokableObject::class, $pluginManager->get('foo'));
+    }
 }

test/TestAsset/V2v3PluginManager.php

@@ -0,0 +1,51 @@
+<?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;
+
+use Zend\ServiceManager\AbstractPluginManager;
+use Zend\ServiceManager\Exception\InvalidServiceException;
+use Zend\ServiceManager\Factory\InvokableFactory;
+
+class V2v3PluginManager extends AbstractPluginManager
+{
+    protected $aliases = [
+        'foo' => InvokableObject::class,
+    ];
+
+    protected $factories = [
+        InvokableObject::class                           => InvokableFactory::class,
+        // Legacy (v2) due to alias resolution
+        'zendtestservicemanagertestassetinvokableobject' => InvokableFactory::class,
+    ];
+
+    protected $instanceOf = InvokableObject::class;
+
+
+    public function validate($plugin)
+    {
+        if ($plugin instanceof $this->instanceOf) {
+            return;
+        }
+
+        throw new InvalidServiceException(sprintf(
+            "'%s' is not an instance of '%s'",
+            get_class($plugin),
+            $this->instanceOf
+        ));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function validatePlugin($plugin)
+    {
+        $this->validate($plugin);
+    }
+}