Adjust to latest ServiceManager changes

zendframework · Dec 2, 2015 · 37385bd · 37385bd
1 parent 019b92c
commit 37385bd
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "zendframework/zend-servicemanager": "dev-develop as 2.6.0",
         "zendframework/zend-hydrator": "~1.0",
         "zendframework/zend-form": "~2.6",
-        "zendframework/zend-stdlib": "~2.7",
+        "zendframework/zend-stdlib": "dev-develop as 2.8.0",
         "zendframework/zend-psr7bridge": "^0.2",
         "container-interop/container-interop": "^1.1"
     },

diff --git a/src/Router/RoutePluginManager.php b/src/Router/RoutePluginManager.php
@@ -65,7 +65,7 @@ public function __construct(ContainerInterface $container, array $config = [])
      * before passing to the parent.
      *
      * @param array $config
-     * @return void
+     * @return self
      */
     public function configure(array $config)
     {
@@ -86,7 +86,7 @@ public function configure(array $config)
             unset($config['invokables']);
         }
 
-        parent::configure($config);
+        return parent::configure($config);
     }
 
      /**

diff --git a/test/ApplicationTest.php b/test/ApplicationTest.php
@@ -246,6 +246,7 @@ public function testBootstrapRegistersConfiguredMvcEvent()
 
     public function setupPathController($addService = true)
     {
+        $this->serviceManager->setAllowOverride(true);
         $request = $this->serviceManager->get('Request');
         $request->setUri('http://example.local/path');
 
@@ -257,7 +258,7 @@ public function setupPathController($addService = true)
             ],
         ]);
         $router->addRoute('path', $route);
-        $services = $this->serviceManager->withConfig([
+        $services = $this->serviceManager->configure([
             'aliases' => [
                 'Router'     => 'HttpRouter',
             ],
@@ -268,7 +269,7 @@ public function setupPathController($addService = true)
 
         $application = $this->setApplicationServiceManager($this->application, $services);
         if ($addService) {
-            $services = $services->withConfig(['factories' => [
+            $services = $services->configure(['factories' => [
                 'ControllerManager' => function ($services) {
                     return new ControllerManager($services, ['factories' => [
                         'path' => function () {
@@ -299,7 +300,7 @@ public function setupActionController()
         ]);
         $router->addRoute('sample', $route);
 
-        $services = $this->serviceManager->withConfig(['factories' => [
+        $services = $this->serviceManager->configure(['factories' => [
             'ControllerManager' => function ($services) {
                 return new ControllerManager($services, ['factories' => [
                     'sample' => function () {
@@ -331,7 +332,7 @@ public function setupBadController($addService = true)
 
         $application = $this->application;
         if ($addService) {
-            $services = $this->serviceManager->withConfig(['factories' => [
+            $services = $this->serviceManager->configure(['factories' => [
                 'ControllerManager' => function ($services) {
                     return new ControllerManager($services, ['factories' => [
                         'bad' => function () {

diff --git a/test/Controller/Plugin/ForwardTest.php b/test/Controller/Plugin/ForwardTest.php
@@ -120,7 +120,7 @@ public function testPluginWithoutControllerLocatorRaisesServiceNotCreatedExcepti
 
     public function testDispatchRaisesDomainExceptionIfDiscoveredControllerIsNotDispatchable()
     {
-        $controllers = $this->controllers->withConfig(['factories' => [
+        $controllers = $this->controllers->configure(['factories' => [
             'bogus' => function () {
                 return new stdClass;
             },

diff --git a/test/Service/ControllerManagerFactoryTest.php b/test/Service/ControllerManagerFactoryTest.php
@@ -79,7 +79,7 @@ public function testCannotLoadControllerFromPeer()
     public function testControllerLoadedCanBeInjectedWithValuesFromPeer()
     {
         $loader = $this->services->get('ControllerManager');
-        $loader = $loader->withConfig(['invokables' => [
+        $loader = $loader->configure(['invokables' => [
             'ZendTest\Dispatchable' => TestAsset\Dispatchable::class,
         ]]);
 
@@ -91,8 +91,9 @@ public function testControllerLoadedCanBeInjectedWithValuesFromPeer()
 
     public function testCallPluginWithControllerPluginManager()
     {
+        $this->services->setAllowOverride(true);
         $controllerPluginManager = $this->services->get('ControllerPluginManager');
-        $controllerPluginManager = $controllerPluginManager->withConfig([
+        $controllerPluginManager = $controllerPluginManager->configure([
             'invokables' => [
                 'samplePlugin' => 'ZendTest\Mvc\Controller\Plugin\TestAsset\SamplePlugin',
             ],
@@ -101,7 +102,7 @@ public function testCallPluginWithControllerPluginManager()
         $controller    = new \ZendTest\Mvc\Controller\TestAsset\SampleController;
         $controllerPluginManager->setController($controller);
 
-        $services = $this->services->withConfig(['services' => [
+        $services = $this->services->configure(['services' => [
             'ControllerPluginManager' => $controllerPluginManager,
         ]]);
 

diff --git a/test/Service/ServiceManagerConfigTest.php b/test/Service/ServiceManagerConfigTest.php
@@ -48,7 +48,7 @@ public function testEventManagerAwareInterfaceIsNotInjectedIfPresentButSharedMan
         $events = new EventManager($this->services->get('SharedEventManager'));
         TestAsset\EventManagerAwareObject::$defaultEvents = $events;
 
-        $services = $this->services->withConfig(['invokables' => [
+        $services = $this->services->configure(['invokables' => [
             'EventManagerAwareObject' => TestAsset\EventManagerAwareObject::class,
         ]]);
 

diff --git a/test/Service/ViewHelperManagerFactoryTest.php b/test/Service/ViewHelperManagerFactoryTest.php
@@ -49,7 +49,7 @@ public function emptyConfiguration()
      */
     public function testDoctypeFactoryDoesNotRaiseErrorOnMissingConfiguration($config)
     {
-        $services = $this->services->withConfig(['services' => [
+        $services = $this->services->configure(['services' => [
             'config' => $config,
         ]]);
         $manager = $this->factory->__invoke($services, 'ViewHelperManager');
@@ -60,7 +60,7 @@ public function testDoctypeFactoryDoesNotRaiseErrorOnMissingConfiguration($confi
 
     public function testConsoleRequestsResultInSilentFailure()
     {
-        $services = $this->services->withConfig(['services' => [
+        $services = $this->services->configure(['services' => [
             'config'  => [],
             'Request' => new ConsoleRequest(),
         ]]);
@@ -88,7 +88,7 @@ public function testConsoleRequestWithBasePathConsole()
             $this->markTestSkipped('Cannot force console context; skipping test');
         }
 
-        $services = $this->services->withConfig(['services' => [
+        $services = $this->services->configure(['services' => [
             'config' => [
                 'view_manager' => [
                     'base_path_console' => 'http://test.com',

diff --git a/test/View/Console/ViewManagerTest.php b/test/View/Console/ViewManagerTest.php
@@ -124,7 +124,7 @@ public function testConsoleKeyWillOverrideDisplayExceptionAndExceptionMessage($c
         $request      = new ConsoleRequest();
         $response     = new ConsoleResponse();
 
-        $services = $this->services->withConfig(['services' => [
+        $services = $this->services->configure(['services' => [
             'config'       => $config,
             'Request'      => $request,
             'EventManager' => $eventManager,
@@ -152,7 +152,7 @@ public function testConsoleDisplayExceptionIsTrue()
         $request      = new ConsoleRequest();
         $response     = new ConsoleResponse();
 
-        $services = $this->services->withConfig([
+        $services = $this->services->configure([
             'services' => [
                 'config'       => [],
                 'Request'      => $request,