commit 901fbd61a3538caac50a284ead82b6907eebb618
Author: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date:   Sun Apr 10 09:38:07 2016 +0200

    First commit

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..397e34a5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+build
+composer.lock
+vendor/
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..4d90fc81
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,28 @@
+sudo: false
+
+language: php
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 5.5
+    - php: 5.6
+      env:
+        - EXECUTE_CS_CHECK=true
+    - php: 7
+    - php: hhvm
+  allow_failures:
+    - php: hhvm
+
+before_install:
+  - composer self-update
+
+install:
+  - travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source --no-scripts
+
+script:
+  - composer test
+  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer cs ; fi
+
+notifications:
+  email: true
diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000..0aaee0a0
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,52 @@
+{
+    "name": "acelaya/url-shortener",
+    "type": "project",
+    "homepage": "https://github.com/acelaya/url-shortener",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Alejandro Celaya ALastrué",
+            "homepage": "http://www.alejandrocelaya.com",
+            "email": "alejandro@alejandrocelaya.com"
+        }
+    ],
+    "require": {
+        "php": "^5.5 || ^7.0",
+        "zendframework/zend-expressive": "^1.0",
+        "zendframework/zend-expressive-helpers": "^2.0",
+        "zendframework/zend-stdlib": "^2.7",
+        "zendframework/zend-expressive-aurarouter": "^1.0",
+        "zendframework/zend-servicemanager": "^3.0",
+        "zendframework/zend-expressive-twigrenderer": "^1.0",
+        "acelaya/expressive-slim-router": "^2.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8",
+        "squizlabs/php_codesniffer": "^2.3",
+        "roave/security-advisories": "dev-master",
+        "filp/whoops": "^2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "App\\": "src/App/",
+            "Acelaya\\UrlShortener\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "AppTest\\": "tests/AppTest/",
+            "AcelayaTest\\UrlShortener\\": "tests"
+        }
+    },
+    "scripts": {
+        "check": [
+            "@cs",
+            "@test"
+        ],
+        "cs": "phpcs",
+        "cs-fix": "phpcbf",
+        "serve": "php -S 0.0.0.0:8000 -t public/",
+        "test": "phpunit",
+        "pretty-test": "phpunit -c tests/phpunit.xml --coverage-html build/coverage"
+    }
+}
diff --git a/config/autoload/.gitignore b/config/autoload/.gitignore
new file mode 100644
index 00000000..1a83fda6
--- /dev/null
+++ b/config/autoload/.gitignore
@@ -0,0 +1,2 @@
+local.php
+*.local.php
diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist
new file mode 100644
index 00000000..75c8b9c2
--- /dev/null
+++ b/config/autoload/local.php.dist
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'debug' => true,
+
+    'config_cache_enabled' => false,
+];
diff --git a/config/autoload/middleware-pipeline.global.php b/config/autoload/middleware-pipeline.global.php
new file mode 100644
index 00000000..9f5f2d63
--- /dev/null
+++ b/config/autoload/middleware-pipeline.global.php
@@ -0,0 +1,30 @@
+<?php
+use Zend\Expressive\Container\ApplicationFactory;
+use Zend\Expressive\Helper;
+
+return [
+    
+    'middleware_pipeline' => [
+        'always' => [
+            'middleware' => [
+                Helper\ServerUrlMiddleware::class,
+            ],
+            'priority' => 10000,
+        ],
+
+        'routing' => [
+            'middleware' => [
+                ApplicationFactory::ROUTING_MIDDLEWARE,
+                Helper\UrlHelperMiddleware::class,
+                ApplicationFactory::DISPATCH_MIDDLEWARE,
+            ],
+            'priority' => 1,
+        ],
+
+        'error' => [
+            'middleware' => [],
+            'error'    => true,
+            'priority' => -10000,
+        ],
+    ],
+];
diff --git a/config/autoload/routes.global.php b/config/autoload/routes.global.php
new file mode 100644
index 00000000..83650c5c
--- /dev/null
+++ b/config/autoload/routes.global.php
@@ -0,0 +1,17 @@
+<?php
+
+return [
+
+    'routes' => [
+        [
+            'name' => 'home',
+            'path' => '/',
+            'middleware' => function ($req, $resp) {
+                $resp->getBody()->write('Hello world');
+                return $resp;
+            },
+            'allowed_methods' => ['GET'],
+        ],
+    ],
+    
+];
diff --git a/config/autoload/services.global.php b/config/autoload/services.global.php
new file mode 100644
index 00000000..8f2a8816
--- /dev/null
+++ b/config/autoload/services.global.php
@@ -0,0 +1,29 @@
+<?php
+use Zend\Expressive\Application;
+use Zend\Expressive\Container;
+use Zend\Expressive\Helper;
+use Zend\Expressive\Router;
+use Zend\Expressive\Template;
+
+return [
+
+    'services' => [
+        'invokables' => [
+            Helper\ServerUrlHelper::class => Helper\ServerUrlHelper::class,
+            Router\RouterInterface::class => Router\AuraRouter::class,
+        ],
+        'factories' => [
+            Application::class => Container\ApplicationFactory::class,
+
+            // Url helpers
+            Helper\UrlHelper::class => Helper\UrlHelperFactory::class,
+            Helper\ServerUrlMiddleware::class => Helper\ServerUrlMiddlewareFactory::class,
+            Helper\UrlHelperMiddleware::class => Helper\UrlHelperMiddlewareFactory::class,
+
+            // View
+            'Zend\Expressive\FinalHandler' => Container\TemplatedErrorHandlerFactory::class,
+            Template\TemplateRendererInterface::class => Zend\Expressive\Twig\TwigRendererFactory::class,
+        ],
+    ],
+
+];
diff --git a/config/autoload/templates.global.php b/config/autoload/templates.global.php
new file mode 100644
index 00000000..b0a57959
--- /dev/null
+++ b/config/autoload/templates.global.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+
+    'templates' => [
+        'extension' => 'html.twig',
+    ],
+
+    'twig' => [
+        'cache_dir'  => 'data/cache/twig',
+        'extensions' => [
+            // extension service names or instances
+        ],
+    ],
+
+];
diff --git a/config/autoload/templates.local.php.dist b/config/autoload/templates.local.php.dist
new file mode 100644
index 00000000..13d4a711
--- /dev/null
+++ b/config/autoload/templates.local.php.dist
@@ -0,0 +1,9 @@
+<?php
+
+return [
+
+    'twig' => [
+        'cache_dir' => false,
+    ],
+
+];
diff --git a/config/autoload/zend-expressive.global.php b/config/autoload/zend-expressive.global.php
new file mode 100644
index 00000000..db5e3f38
--- /dev/null
+++ b/config/autoload/zend-expressive.global.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+    'debug' => false,
+
+    'config_cache_enabled' => false,
+
+    'zend-expressive' => [
+        'error_handler' => [
+            'template_404'   => 'error/404.html.twig',
+            'template_error' => 'error/error.html.twig',
+        ],
+    ],
+];
diff --git a/config/config.php b/config/config.php
new file mode 100644
index 00000000..a5446be7
--- /dev/null
+++ b/config/config.php
@@ -0,0 +1,35 @@
+<?php
+
+use Zend\Stdlib\ArrayUtils;
+use Zend\Stdlib\Glob;
+
+/**
+ * Configuration files are loaded in a specific order. First ``global.php``, then ``*.global.php``.
+ * then ``local.php`` and finally ``*.local.php``. This way local settings overwrite global settings.
+ *
+ * The configuration can be cached. This can be done by setting ``config_cache_enabled`` to ``true``.
+ *
+ * Obviously, if you use closures in your config you can't cache it.
+ */
+
+$cachedConfigFile = 'data/cache/app_config.php';
+
+$config = [];
+if (is_file($cachedConfigFile)) {
+    // Try to load the cached config
+    $config = include $cachedConfigFile;
+} else {
+    // Load configuration from autoload path
+    foreach (Glob::glob('config/autoload/{{,*.}global,{,*.}local}.php', Glob::GLOB_BRACE) as $file) {
+        $config = ArrayUtils::merge($config, include $file);
+    }
+
+    // Cache config if enabled
+    if (isset($config['config_cache_enabled']) && $config['config_cache_enabled'] === true) {
+        file_put_contents($cachedConfigFile, '<?php return ' . var_export($config, true) . ';');
+    }
+}
+
+// Return an ArrayObject so we can inject the config as a service in Aura.Di
+// and still use array checks like ``is_array``.
+return new ArrayObject($config, ArrayObject::ARRAY_AS_PROPS);
diff --git a/config/container.php b/config/container.php
new file mode 100644
index 00000000..07d62789
--- /dev/null
+++ b/config/container.php
@@ -0,0 +1,16 @@
+<?php
+
+use Zend\ServiceManager\Config;
+use Zend\ServiceManager\ServiceManager;
+
+// Load configuration
+$config = require __DIR__ . '/config.php';
+
+// Build container
+$container = new ServiceManager();
+(new Config($config['services']))->configureServiceManager($container);
+
+// Inject config
+$container->setService('config', $config);
+
+return $container;
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 00000000..d6b7ef32
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 00000000..51649659
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<ruleset name="Coding standard">
+    <description>Coding standard</description>
+
+    <!-- display progress -->
+    <arg value="p"/>
+    <arg name="colors"/>
+
+    <!-- inherit rules from: -->
+    <rule ref="PSR2"/>
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
+        <properties>
+            <property name="ignoreBlankLines" value="false"/>
+        </properties>
+    </rule>
+
+    <!-- Paths to check -->
+    <file>src</file>
+    <file>tests</file>
+    <file>config</file>
+    <file>public/index.php</file>
+</ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 00000000..bb69885f
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,13 @@
+<phpunit bootstrap="./vendor/autoload.php" colors="true">
+    <testsuites>
+        <testsuite name="App\\Tests">
+            <directory>./test</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/public/index.php b/public/index.php
new file mode 100644
index 00000000..8324c8d5
--- /dev/null
+++ b/public/index.php
@@ -0,0 +1,11 @@
+<?php
+
+chdir(dirname(__DIR__));
+require 'vendor/autoload.php';
+
+/** @var \Interop\Container\ContainerInterface $container */
+$container = require 'config/container.php';
+
+/** @var \Zend\Expressive\Application $app */
+$app = $container->get(\Zend\Expressive\Application::class);
+$app->run();
diff --git a/templates/app/home-page.html.twig b/templates/app/home-page.html.twig
new file mode 100644
index 00000000..fc793c1e
--- /dev/null
+++ b/templates/app/home-page.html.twig
@@ -0,0 +1,113 @@
+{% extends '@layout/default.html.twig' %}
+
+{% block title %}Home{% endblock %}
+
+{% block content %}
+    <div class="jumbotron">
+        <h1>Welcome to <span class="zf-green">zend-expressive</span></h1>
+        <p>
+            Congratulations! You have successfully installed the
+            <a href="https://github.com/zendframework/zend-expressive-skeleton" target="_blank">zend-expressive skeleton application</a>.
+            This skeleton can serve as a simple starting point for you to begin building your application.
+        </p>
+        <p>
+            Expressive builds on zend-stratigility to provide a minimalist PSR-7 middleware framework for PHP.
+        </p>
+    </div>
+
+    <div class="row">
+        <div class="col-md-4">
+            <h2>
+                <a href="https://zendframework.github.io/zend-expressive/getting-started/features/" target="_blank">
+                    <i class="fa fa-refresh"></i> Agile &amp; Lean
+                </a>
+            </h2>
+            <p>
+                Expressive is fast, small and perfect for rapid application development, prototyping and api's. You decide how you
+                extend it and choose the best packages from major framework or standalone projects.
+            </p>
+        </div>
+
+        <div class="col-md-4">
+            <h2>
+                <a href="https://github.com/zendframework/zend-diactoros" target="_blank">
+                    <i class="fa fa-exchange"></i> HTTP Messages
+                </a>
+            </h2>
+            <p>
+                HTTP messages are the foundation of web development. Web browsers and HTTP clients such as cURL create
+                HTTP request messages that are sent to a web server, which provides an HTTP response message.
+                Server-side code receives an HTTP request message, and returns an HTTP response message.
+            </p>
+        </div>
+
+        <div class="col-md-4">
+            <h2>
+                <a href="https://github.com/zendframework/zend-stratigility" target="_blank">
+                    <i class="fa fa-dot-circle-o"></i> Middleware
+                </a>
+            </h2>
+            <p>
+                Middleware is code that exists between the request and response, and which can take the incoming
+                request, perform actions based on it, and either complete the response or pass delegation on to the
+                next middleware in the queue. Your application is easily extended with custom middleware created by
+                yourself or <a href="https://packagist.org/search/?q=middleware" target="_blank">others</a>.
+            </p>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-4">
+            <h2>
+                <a href="https://zendframework.github.io/zend-expressive/features/container/intro/" target="_blank">
+                    <i class="fa fa-cube"></i> Containers
+                </a>
+            </h2>
+            <p>
+                Expressive promotes and advocates the usage of Dependency Injection/Inversion of Control containers
+                when writing your applications. Expressive supports multiple containers which typehints against
+                <a href="https://github.com/container-interop/container-interop" target="_blank">container-interop</a>.
+            </p>
+        </div>
+
+        <div class="col-md-4">
+            <h2>
+                <a href="https://zendframework.github.io/zend-expressive/features/router/intro/" target="_blank">
+                    <i class="fa fa-plane"></i> Routers
+                </a>
+            </h2>
+            <p>
+                One fundamental feature of zend-expressive is that it provides mechanisms for implementing dynamic
+                routing, a feature required in most modern web applications. Expressive ships with multiple adapters.
+            </p>
+            {% if routerName is defined %}
+                <p>
+                    <a href="{{ routerDocs }}" target="_blank">
+                        Get started with {{ routerName }}.
+                    </a>
+                </p>
+            {% endif %}
+        </div>
+
+        <div class="col-md-4">
+            <h2>
+                <a href="https://zendframework.github.io/zend-expressive/features/template/twig/" target="_blank">
+                    <i class="fa fa-files-o"></i> Templating
+                </a>
+            </h2>
+            <p>
+                By default, no middleware in Expressive is templated. We do not even provide a default templating
+                engine, as the choice of templating engine is often very specific to the project and/or organization.
+                However, Expressive does provide abstraction for templating, which allows you to write middleware that
+                is engine-agnostic.
+            </p>
+            {% if templateName is defined %}
+                <p>
+                    <a href="{{ templateDocs }}" target="_blank">
+                        Get started with {{ templateName }}.
+                    </a>
+                </p>
+            {% endif %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/templates/error/404.html.twig b/templates/error/404.html.twig
new file mode 100644
index 00000000..7b4e363e
--- /dev/null
+++ b/templates/error/404.html.twig
@@ -0,0 +1,13 @@
+{% extends 'layout/default.html.twig' %}
+
+{% block title %}404 Not Found{% endblock %}
+
+{% block content %}
+    <h1>Oops!</h1>
+    <h2>This is awkward.</h2>
+    <p>We encountered a 404 Not Found error.</p>
+    <p>
+        You are looking for something that doesn't exist or may have moved. Check out one of the links on this page
+        or head back to <a href="{{ path('home') }}">Home</a>.
+    </p>
+{% endblock %}
diff --git a/templates/error/error.html.twig b/templates/error/error.html.twig
new file mode 100644
index 00000000..c9b66893
--- /dev/null
+++ b/templates/error/error.html.twig
@@ -0,0 +1,15 @@
+{% extends 'layout/default.html.twig' %}
+
+{% block title %}{{ status }} {{ reason }}{% endblock %}
+
+{% block content %}
+    <h1>Oops!</h1>
+    <h2>This is awkward.</h2>
+    <p>We encountered a {{ status }} {{ reason }} error.</p>
+    {% if status == 404 %}
+        <p>
+            You are looking for something that doesn't exist or may have moved. Check out one of the links on this page
+            or head back to <a href="{{ path('home') }}">Home</a>.
+        </p>
+    {% endif %}
+{% endblock %}
diff --git a/templates/layout/default.html.twig b/templates/layout/default.html.twig
new file mode 100644
index 00000000..163e6437
--- /dev/null
+++ b/templates/layout/default.html.twig
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <title>{% block title %}{% endblock %} - zend-expressive</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" />
+    <style>
+        body { padding-top: 60px; }
+        .app { display: flex; min-height: 100vh; flex-direction: column; }
+        .app-content { flex: 1; }
+        .app-footer { padding-bottom: 1em; }
+        .zf-green, h2 a { color: #68b604; }
+    </style>
+    {% block stylesheets %}{% endblock %}
+</head>
+<body class="app">
+    <header class="app-header">
+        <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+            <div class="container">
+                <div class="navbar-header">
+                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                    <a class="navbar-brand" href="{{ path('home') }}">
+                        <img src="{{ asset('zf-logo.png') }}" alt="Zend Expressive" />
+                    </a>
+                </div>
+                <div class="collapse navbar-collapse">
+                    <ul class="nav navbar-nav">
+                        <li>
+                            <a href="https://zendframework.github.io/zend-expressive/" target="_blank">
+                                <i class="fa fa-book"></i> Docs
+                            </a>
+                        </li>
+                        <li>
+                            <a href="https://github.com/zendframework/zend-expressive" target="_blank">
+                                <i class="fa fa-wrench"></i> Contribute
+                            </a>
+                        </li>
+                        <li>
+                            <a href="{{ path('api.ping') }}">
+                                Ping Test
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </nav>
+    </header>
+
+    <div class="app-content">
+        <main class="container">
+            {% block content %}{% endblock %}
+        </main>
+    </div>
+
+    <footer class="app-footer">
+        <div class="container">
+            <hr />
+            {% block footer %}
+                <p>
+                    &copy; 2005 - {{ "now"|date("Y") }} by Zend Technologies Ltd. All rights reserved.
+                </p>
+            {% endblock %}
+        </div>
+    </footer>
+
+    <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+    {% block javascript %}{% endblock %}
+</body>
+</html>