Move getServiceLocator() to service manager

Since the container passed to factories is always the creation context
container in v3, `getServiceLocator()` will always be the service
manager itself, not a plugin manager. By pushing the method into the
service manager, we achieve backwards compatibility with v2; by marking
it deprecated, we can remove it in the future.

Author: weierophinney

src/AbstractPluginManager.php

@@ -140,24 +140,6 @@ public function validate($instance)
         ));
     }
 
-    /**
-     * Implemented for backwards compatibility only.
-     *
-     * Returns the creation context.
-     *
-     * @deprecated since 3.0.0. Factories using 3.0 should use the container
-     *     instance passed to the factory instead.
-     * @return ContainerInterface
-     */
-    public function getServiceLocator()
-    {
-        trigger_error(sprintf(
-            'Usage of %s is deprecated since v3.0.0; please use the container passed to the factory instead',
-            __METHOD__
-        ), E_USER_DEPRECATED);
-        return $this->creationContext;
-    }
-
     /**
      * Implemented for backwards compatibility only.
      *

src/ServiceManager.php

@@ -140,6 +140,24 @@ public function __construct(array $config = [])
         $this->configure($config);
     }
 
+    /**
+     * Implemented for backwards compatibility with previous plugin managers only.
+     *
+     * Returns the creation context.
+     *
+     * @deprecated since 3.0.0. Factories using 3.0 should use the container
+     *     instance passed to the factory instead.
+     * @return ContainerInterface
+     */
+    public function getServiceLocator()
+    {
+        trigger_error(sprintf(
+            'Usage of %s is deprecated since v3.0.0; please use the container passed to the factory instead',
+            __METHOD__
+        ), E_USER_DEPRECATED);
+        return $this->creationContext;
+    }
+
     /**
      * {@inheritDoc}
      */

test/AbstractPluginManagerTest.php

@@ -180,19 +180,6 @@ public function testGetRaisesExceptionWhenNoFactoryIsResolved()
         $pluginManager->get('Some\Unknown\Service');
     }
 
-    /**
-     * @group migration
-     */
-    public function testCanRetrieveParentContainerViaGetServiceLocatorWithDeprecationNotice()
-    {
-        $container = $this->createContainer();
-        set_error_handler(function ($errno, $errstr) {
-            $this->assertEquals(E_USER_DEPRECATED, $errno);
-        }, E_USER_DEPRECATED);
-        $this->assertSame($this->creationContext, $container->getServiceLocator());
-        restore_error_handler();
-    }
-
     /**
      * @group migration
      */

test/CommonServiceLocatorBehaviorsTrait.php

@@ -770,4 +770,17 @@ public function testAllowOverrideFlagIsMutable($container)
         $container->setAllowOverride(true);
         $this->assertTrue($container->getAllowOverride());
     }
+
+    /**
+     * @group migration
+     */
+    public function testCanRetrieveParentContainerViaGetServiceLocatorWithDeprecationNotice()
+    {
+        $container = $this->createContainer();
+        set_error_handler(function ($errno, $errstr) {
+            $this->assertEquals(E_USER_DEPRECATED, $errno);
+        }, E_USER_DEPRECATED);
+        $this->assertSame($this->creationContext, $container->getServiceLocator());
+        restore_error_handler();
+    }
 }