Updates to zend-expressive-helper 5.0.0alpha3

Needed to update due to invalid config provider namespace in alpha2.

This patch also updates the configuration to register the
zend-expressive and zend-expressive-helpers config providers, and to
create a pipeline that is compatible with zend-expressive alpha2+.

composer.json

@@ -39,7 +39,7 @@
         "zendframework/zend-component-installer": "^2.0",
         "zendframework/zend-config-aggregator": "^1.0",
         "zendframework/zend-expressive": "^3.0.0alpha3 || ^3.0",
-        "zendframework/zend-expressive-helpers": "^5.0.0alpha2 || ^5.0",
+        "zendframework/zend-expressive-helpers": "^5.0.0alpha3 || ^5.0",
         "zendframework/zend-stdlib": "^3.1"
     },
     "require-dev": {

config/config.php

@@ -16,6 +16,9 @@
     // Include cache configuration
     new ArrayProvider($cacheConfig),
 
+    \Zend\Expressive\Helper\ConfigProvider::class,
+    \Zend\Expressive\ConfigProvider::class,
+
     // Default App module config
     App\ConfigProvider::class,
 

config/pipeline.php

@@ -6,7 +6,7 @@
 use Zend\Expressive\Helper\UrlHelperMiddleware;
 use Zend\Expressive\Middleware\ImplicitHeadMiddleware;
 use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
-use Zend\Expressive\Middleware\NotFoundHandler;
+use Zend\Expressive\Middleware\NotFoundMiddleware;
 use Zend\Expressive\Router\DispatchMiddleware;
 use Zend\Expressive\Router\PathBasedRoutingMiddleware;
 use Zend\Stratigility\Middleware\ErrorHandler;
@@ -56,6 +56,6 @@
 $app->pipe(DispatchMiddleware::class);
 
 // At this point, if no Response is returned by any middleware, the
-// NotFoundHandler kicks in; alternately, you can provide other fallback
+// NotFoundMiddleware kicks in; alternately, you can provide other fallback
 // middleware to execute.
-$app->pipe(NotFoundHandler::class);
+$app->pipe(NotFoundMiddleware::class);

test/ExpressiveInstallerTest/ContainersTest.php

@@ -79,7 +79,6 @@ public function testContainer(
         $this->assertTrue($container->has(Expressive\Helper\UrlHelper::class));
         $this->assertTrue($container->has(Expressive\Helper\ServerUrlHelper::class));
         $this->assertTrue($container->has(Expressive\Application::class));
-        $this->assertTrue($container->has(Expressive\Router\RouterInterface::class));
 
         // Test home page
         $setupRoutes = strpos($copyFilesKey, 'minimal') !== 0;