From e3b16644dd065a59cc230c1bf06c44c6578531ce Mon Sep 17 00:00:00 2001
From: Adrian <adrian.dev@kousz.ch>
Date: Tue, 25 Oct 2016 09:37:03 +0200
Subject: [PATCH 1/3] Move config file

---
 config/{autoload/full.global.php => config.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename config/{autoload/full.global.php => config.php} (100%)

diff --git a/config/autoload/full.global.php b/config/config.php
similarity index 100%
rename from config/autoload/full.global.php
rename to config/config.php

From 3cbbc0cf243eea9b1d2938b341b1217758dbc229 Mon Sep 17 00:00:00 2001
From: Adrian <adrian.dev@kousz.ch>
Date: Tue, 25 Oct 2016 09:38:41 +0200
Subject: [PATCH 2/3] Use seperate container script

---
 config/config.php    |  4 ++--
 config/container.php | 13 +++++++++++++
 public/index.php     | 10 ++--------
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 config/container.php

diff --git a/config/config.php b/config/config.php
index 00c071f..fe9dc43 100644
--- a/config/config.php
+++ b/config/config.php
@@ -1,4 +1,4 @@
-<?php return [
+<?php return new ArrayObject([
 	'middleware_pipeline' => [
 		Zend\Expressive\Container\ApplicationFactory::ROUTING_MIDDLEWARE,
 		Zend\Expressive\Container\ApplicationFactory::DISPATCH_MIDDLEWARE,
@@ -10,4 +10,4 @@
 			'allowed_methods' => [ 'GET' ],
 		],
 	],
-];
+]);
diff --git a/config/container.php b/config/container.php
new file mode 100644
index 0000000..33cd86c
--- /dev/null
+++ b/config/container.php
@@ -0,0 +1,13 @@
+<?php
+
+use Xtreamwayz\Pimple\Container;
+use Zend\Expressive\Application;
+use Zend\Expressive\Container\ApplicationFactory;
+
+$c = new Container;
+
+$c['config'] = require 'config/config.php';
+
+$c[Application::class] = new ApplicationFactory;
+
+return $c;
diff --git a/public/index.php b/public/index.php
index 9e2d1ae..a1db82f 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,18 +1,12 @@
 <?php
 
-use Xtreamwayz\Pimple\Container;
 use Zend\Expressive\Application;
-use Zend\Expressive\Container\ApplicationFactory;
 
 chdir(dirname(__DIR__));
 require_once 'vendor/autoload.php';
 
-$c = new Container;
+$c = require 'config/container.php';
 
-$c['config'] = new ArrayObject(require 'config/autoload/full.global.php');
-
-$c[Application::class] = new ApplicationFactory;
-
-$app = $c[Application::class];
+$app = $c->get(Application::class);
 
 $app->run();

From 6aa311b35d855ae62f591ca0dbf9b4c982d34ba7 Mon Sep 17 00:00:00 2001
From: Adrian <adrian.dev@kousz.ch>
Date: Tue, 25 Oct 2016 10:48:15 +0200
Subject: [PATCH 3/3] Add UrlHelper

The helper can be used to generate URLs from named routes.
HomeAction was converted to a service
to inject the URL helper using a factory.

Also see: [Container PSR and the Service Locator](https://github.com/php-fig/fig-standards/blob/master/proposed/container-meta.md#4-recommended-usage-container-psr-and-the-service-locator)
---
 composer.json           |  3 ++-
 config/config.php       | 10 +++++++++-
 config/container.php    | 12 ++++++++++++
 src/App/HomeAction.php  | 11 ++++++++++-
 src/App/HomeFactory.php | 19 +++++++++++++++++++
 5 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 src/App/HomeFactory.php

diff --git a/composer.json b/composer.json
index b518a01..c2f3f31 100644
--- a/composer.json
+++ b/composer.json
@@ -7,6 +7,7 @@
     "require": {
         "xtreamwayz/pimple-container-interop": "^1.0",
         "zendframework/zend-expressive": "^1.0",
-        "zendframework/zend-expressive-fastroute": "^1.2"
+        "zendframework/zend-expressive-fastroute": "^1.2",
+        "zendframework/zend-expressive-helpers": "^2.1"
     }
 }
diff --git a/config/config.php b/config/config.php
index fe9dc43..754627a 100644
--- a/config/config.php
+++ b/config/config.php
@@ -1,13 +1,21 @@
 <?php return new ArrayObject([
 	'middleware_pipeline' => [
 		Zend\Expressive\Container\ApplicationFactory::ROUTING_MIDDLEWARE,
+		['middleware' => Zend\Expressive\Helper\UrlHelperMiddleware::class],
 		Zend\Expressive\Container\ApplicationFactory::DISPATCH_MIDDLEWARE,
 	],
 	'routes' => [
 		[
 			'path' => '/',
-			'middleware' => new Test\App\HomeAction,
+			'middleware' => Test\App\HomeAction::class,
 			'allowed_methods' => [ 'GET' ],
+			'name' => 'home',
+		],
+		[
+			'path' => '/test/another/path',
+			'middleware' => Test\App\HomeAction::class,
+			'allowed_methods' => [ 'GET' ],
+			'name' => 'other',
 		],
 	],
 ]);
diff --git a/config/container.php b/config/container.php
index 33cd86c..c516330 100644
--- a/config/container.php
+++ b/config/container.php
@@ -1,13 +1,25 @@
 <?php
 
+use Test\App\HomeAction;
+use Test\App\HomeFactory;
 use Xtreamwayz\Pimple\Container;
 use Zend\Expressive\Application;
 use Zend\Expressive\Container\ApplicationFactory;
+use Zend\Expressive\Helper\UrlHelper;
+use Zend\Expressive\Helper\UrlHelperFactory;
+use Zend\Expressive\Helper\UrlHelperMiddleware;
+use Zend\Expressive\Helper\UrlHelperMiddlewareFactory;
+use Zend\Expressive\Router\FastRouteRouter;
+use Zend\Expressive\Router\RouterInterface;
 
 $c = new Container;
 
 $c['config'] = require 'config/config.php';
 
+$c[RouterInterface::class] = function () { return new FastRouteRouter; };
+$c[UrlHelper::class] = new UrlHelperFactory;
+$c[UrlHelperMiddleware::class] = new UrlHelperMiddlewareFactory;
+$c[HomeAction::class] = new HomeFactory;
 $c[Application::class] = new ApplicationFactory;
 
 return $c;
diff --git a/src/App/HomeAction.php b/src/App/HomeAction.php
index 7b8e0a8..4e12097 100644
--- a/src/App/HomeAction.php
+++ b/src/App/HomeAction.php
@@ -4,11 +4,20 @@ namespace Test\App;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Zend\Expressive\Helper\UrlHelper;
 
 class HomeAction
 {
+	private $urlhelper;
+
+	public function __construct(UrlHelper $urlhelper)
+	{
+		$this->urlhelper = $urlhelper;
+	}
+
 	public function __invoke(Request $req, Response $res, callable $next)
 	{
-		$res->getBody()->write("Hello World!");
+		$result = sprintf("Hello World!<br/>\n%s", var_export($this->urlhelper->generate('other'), true));
+		$res->getBody()->write($result);
 	}
 }
diff --git a/src/App/HomeFactory.php b/src/App/HomeFactory.php
new file mode 100644
index 0000000..33ea90e
--- /dev/null
+++ b/src/App/HomeFactory.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Test\App;
+
+use Interop\Container\ContainerInterface;
+use Zend\Expressive\Helper\UrlHelper;
+
+class HomeFactory
+{
+	public function __invoke(ContainerInterface $c)
+	{
+		try {
+			$urlhelper = $c->get(UrlHelper::class);
+		} catch (\Exception $e) {
+			trigger_error("Ex: $e");
+		}
+		return new HomeAction($urlhelper);
+	}
+}