Moved CommonPluginManagerTrait to src/Test, updated docs

Author: Matt Kynaston

doc/book/migration.md

@@ -1240,11 +1240,12 @@ instance of your plugin manager and override  `getV2InvalidPluginException()`
 to return the classname of the exception your `validatePlugin()` method throws:
 
 ```php
+use MyNamespace\ObserverInterface;
 use MyNamespace\ObserverPluginManager;
 use MyNamespace\Exception\RuntimeException;
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\ServiceManager\ServiceManager;
-use ZendTest\ServiceManager\TestAsset\V2v3PluginManager;
+use Zend\ServiceManager\Test\CommonPluginManagerTrait;
 
 class MigrationTest extends TestCase
 {
@@ -1259,6 +1260,11 @@ class MigrationTest extends TestCase
     {
         return RuntimeException::class;
     }
+
+    protected function getInstanceOf()
+    {
+        return ObserverInterface::class;
+    }
 }
 ```
 
@@ -1269,17 +1275,6 @@ This will check that:
 - That requesting an invalid plugin throws the right exception
 - That all your aliases resolve
 
-Note that you will need to include ServiceManager's test directory in the `autoload-dev` section of your `compoer.json`
-for this test to work:
-
-```
-    "autoload-dev": {
-        "psr-4": {
-            "MyNamespaceTest\ObserverPluginManager\\": "test/",
-            "ZendTest\\ServiceManager\\": "vendor/zendframework/zend-servicemanager/test/"
-        }
-    }
-```
 
 ### Post migration
 

test/CommonPluginManagerTrait.php renamed to src/Test/CommonPluginManagerTrait.php

@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\ServiceManager;
+namespace Zend\ServiceManager\Test;
 
 use ReflectionClass;
 use ReflectionProperty;
@@ -22,12 +22,12 @@
  */
 trait CommonPluginManagerTrait
 {
-    public function testInstanceOfIsSet()
+    public function testInstanceOfMatches()
     {
         $manager = $this->getPluginManager();
         $reflection = new ReflectionProperty($manager, 'instanceOf');
         $reflection->setAccessible(true);
-        $this->assertNotNull($reflection->getValue($manager), 'instanceOf property not set');
+        $this->assertEquals($this->getInstanceOf(), $reflection->getValue($manager), 'instanceOf does not match');
     }
 
     public function testShareByDefaultAndSharedByDefault()
@@ -107,4 +107,10 @@ abstract protected function getPluginManager();
      * @return mixed
      */
     abstract protected function getV2InvalidPluginException();
+
+    /**
+     * Returns the value the instanceOf property has been set to
+     * @return string
+     */
+    abstract protected function getInstanceOf();
 }

test/ExamplePluginManagerTest.php

@@ -11,6 +11,8 @@
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\ServiceManager\ServiceManager;
+use Zend\ServiceManager\Test\CommonPluginManagerTrait;
+use ZendTest\ServiceManager\TestAsset\InvokableObject;
 use ZendTest\ServiceManager\TestAsset\V2v3PluginManager;
 
 /**
@@ -29,4 +31,9 @@ protected function getV2InvalidPluginException()
     {
         return \RuntimeException::class;
     }
+
+    protected function getInstanceOf()
+    {
+        return InvokableObject::class;
+    }
 }