Merge branch 'develop'

.env.dist

@@ -4,6 +4,10 @@ SHORTENED_URL_SCHEMA=
 SHORTENED_URL_HOSTNAME=
 SHORTCODE_CHARS=
 
+# Language
+DEFAULT_LOCALE=
+CLI_LOCALE=
+
 # Database
 DB_USER=
 DB_PASSWORD=

.gitignore

@@ -1,3 +1,4 @@
+.idea
 build
 composer.lock
 vendor/

.travis.yml

@@ -8,7 +8,7 @@ branches:
 php:
   - 5.6
   - 7
-  - hhvm
+  - 7.1
 
 before_script:
   - composer self-update

CHANGELOG.md

@@ -1,5 +1,32 @@
 ## CHANGELOG
 
+### 1.0.0
+
+**Enhancements:**
+
+* [33: Create a command to generate a short code charset by randomizing the default one](https://github.com/acelaya/url-shortener/issues/33)
+* [15: Return JSON/HTML responses for errors (4xx and 5xx) based on accept header (content negotiation)](https://github.com/acelaya/url-shortener/issues/15)
+* [23: Translate application literals](https://github.com/acelaya/url-shortener/issues/23)
+* [21: Allow to filter visits by date range](https://github.com/acelaya/url-shortener/issues/21)
+* [22: Save visits locations data on a visit_locations table](https://github.com/acelaya/url-shortener/issues/22)
+* [20: Inject cross domain headers in response only if the Origin header is present in the request](https://github.com/acelaya/url-shortener/issues/20)
+* [11: Separate code into multiple modules](https://github.com/acelaya/url-shortener/issues/11)
+* [18: Group routable middleware in an Action namespace](https://github.com/acelaya/url-shortener/issues/18)
+
+**Tasks**
+
+* [36: Remove hhvm from the CI matrix since it doesn't support array constants and will fail](https://github.com/acelaya/url-shortener/issues/36)
+* [4: Installation steps](https://github.com/acelaya/url-shortener/issues/4)
+* [6: Remove dependency on expressive helpers package](https://github.com/acelaya/url-shortener/issues/6)
+* [30: Replace the "services" first level config entry by "dependencies", in order to fulfill default Expressive name](https://github.com/acelaya/url-shortener/issues/30)
+* [12: Improve code coverage](https://github.com/acelaya/url-shortener/issues/12)
+* [25: Replace "Middleware" suffix on routable middlewares by "Action"](https://github.com/acelaya/url-shortener/issues/25)
+* [19: Update the vendor and app namespace from Acelaya\UrlShortener to Shlinkio\Shlink](https://github.com/acelaya/url-shortener/issues/19)
+
+**Bugs**
+
+* [24: Prevent duplicated shortcodes errors because of the case insensitive behavior on MySQL](https://github.com/acelaya/url-shortener/issues/24)
+
 ### 0.2.0
 
 **Enhancements:**

README.md

@@ -1,2 +1,9 @@
-# url-shortener
+# Shlink
+
+[![Build Status](https://travis-ci.org/shlinkio/shlink.svg?branch=master)](https://travis-ci.org/shlinkio/shlink)
+[![Code Coverage](https://scrutinizer-ci.com/g/shlinkio/shlink/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/shlinkio/shlink/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/shlinkio/shlink/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/shlinkio/shlink/?branch=master)
+[![Latest Stable Version](https://poser.pugx.org/shlinkio/shlink/v/stable.png)](https://packagist.org/packages/shlinkio/shlink)
+[![License](https://poser.pugx.org/shlinkio/shlink/license.png)](https://packagist.org/packages/shlinkio/shlink)
+
 A PHP-based URL shortener application with analytics and management

bin/cli

@@ -2,9 +2,16 @@
 <?php
 use Interop\Container\ContainerInterface;
 use Symfony\Component\Console\Application as CliApp;
+use Symfony\Component\Console\Application;
+use Zend\I18n\Translator\Translator;
 
 /** @var ContainerInterface $container */
 $container = include __DIR__ . '/../config/container.php';
 
+/** @var Translator $translator */
+$translator = $container->get('translator');
+$translator->setLocale(env('CLI_LOCALE', 'en'));
+
+/** @var Application $app */
 $app = $container->get(CliApp::class);
 $app->run();

composer.json

@@ -1,27 +1,30 @@
 {
-    "name": "acelaya/url-shortener",
+    "name": "shlinkio/shlink",
     "type": "project",
-    "homepage": "https://github.com/acelaya/url-shortener",
+    "homepage": "http://shlink.io",
+    "description": "A self-hosted and PHP-based URL shortener application with CLI and REST interfaces",
     "license": "MIT",
     "authors": [
         {
-            "name": "Alejandro Celaya ALastrué",
+            "name": "Alejandro Celaya Alastrué",
             "homepage": "http://www.alejandrocelaya.com",
             "email": "alejandro@alejandrocelaya.com"
         }
     ],
     "require": {
         "php": "^5.6 || ^7.0",
         "zendframework/zend-expressive": "^1.0",
-        "zendframework/zend-expressive-helpers": "^2.0",
         "zendframework/zend-expressive-fastroute": "^1.1",
         "zendframework/zend-expressive-twigrenderer": "^1.0",
         "zendframework/zend-stdlib": "^2.7",
         "zendframework/zend-servicemanager": "^3.0",
         "zendframework/zend-paginator": "^2.6",
+        "zendframework/zend-config": "^2.6",
+        "zendframework/zend-i18n": "^2.7",
+        "mtymek/expressive-config-manager": "^0.4",
+        "acelaya/zsm-annotated-services": "^0.2.0",
         "doctrine/orm": "^2.5",
         "guzzlehttp/guzzle": "^6.2",
-        "acelaya/zsm-annotated-services": "^0.2.0",
         "symfony/console": "^3.0"
     },
     "require-dev": {
@@ -34,12 +37,21 @@
     },
     "autoload": {
         "psr-4": {
-            "Acelaya\\UrlShortener\\": "src"
-        }
+            "Shlinkio\\Shlink\\CLI\\": "module/CLI/src",
+            "Shlinkio\\Shlink\\Rest\\": "module/Rest/src",
+            "Shlinkio\\Shlink\\Core\\": "module/Core/src",
+            "Shlinkio\\Shlink\\Common\\": "module/Common/src"
+        },
+        "files": [
+            "module/Common/functions/functions.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
-            "AcelayaTest\\UrlShortener\\": "tests"
+            "ShlinkioTest\\Shlink\\CLI\\": "module/CLI/test",
+            "ShlinkioTest\\Shlink\\Rest\\": "module/Rest/test",
+            "ShlinkioTest\\Shlink\\Core\\": "module/Core/test",
+            "ShlinkioTest\\Shlink\\Common\\": "module/Common/test"
         }
     },
     "scripts": {

config/autoload/database.global.php

@@ -3,9 +3,9 @@
 
     'database' => [
         'driver' => 'pdo_mysql',
-        'user' => getenv('DB_USER'),
-        'password' => getenv('DB_PASSWORD'),
-        'dbname' => getenv('DB_NAME') ?: 'acelaya_url_shortener',
+        'user' => env('DB_USER'),
+        'password' => env('DB_PASSWORD'),
+        'dbname' => env('DB_NAME', 'shlink'),
         'charset' => 'utf8',
         'driverOptions' => [
             PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'

config/autoload/dependencies.global.php

@@ -0,0 +1,24 @@
+<?php
+use Shlinkio\Shlink\Common\ErrorHandler\ContentBasedErrorHandler;
+use Zend\Expressive;
+use Zend\Expressive\Container;
+use Zend\Expressive\Router;
+use Zend\Expressive\Template;
+use Zend\Expressive\Twig;
+use Zend\ServiceManager\Factory\InvokableFactory;
+
+return [
+
+    'dependencies' => [
+        'factories' => [
+            Expressive\Application::class => Container\ApplicationFactory::class,
+            Router\FastRouteRouter::class => InvokableFactory::class,
+            Template\TemplateRendererInterface::class => Twig\TwigRendererFactory::class,
+        ],
+        'aliases' => [
+            Router\RouterInterface::class => Router\FastRouteRouter::class,
+            'Zend\Expressive\FinalHandler' => ContentBasedErrorHandler::class,
+        ],
+    ],
+
+];

config/autoload/errorhandler.local.php.dist

@@ -1,14 +1,13 @@
 <?php
+use Shlinkio\Shlink\Common\ErrorHandler\ContentBasedErrorHandler;
+use Zend\Expressive\Container\WhoopsErrorHandlerFactory;
 
 return [
-    'services' => [
+    'dependencies' => [
         'invokables' => [
             'Zend\Expressive\Whoops' => Whoops\Run::class,
             'Zend\Expressive\WhoopsPageHandler' => Whoops\Handler\PrettyPageHandler::class,
         ],
-        'factories' => [
-            'Zend\Expressive\FinalHandler' => Zend\Expressive\Container\WhoopsErrorHandlerFactory::class,
-        ],
     ],
 
     'whoops' => [
@@ -18,4 +17,12 @@ return [
             'ajax_only'  => true,
         ],
     ],
+
+    'error_handler' => [
+        'plugins' => [
+            'factories' => [
+                ContentBasedErrorHandler::DEFAULT_CONTENT => WhoopsErrorHandlerFactory::class,
+            ],
+        ],
+    ],
 ];

config/autoload/middleware-pipeline.global.php

@@ -1,46 +1,21 @@
 <?php
-use Acelaya\UrlShortener\Middleware;
 use Zend\Expressive\Container\ApplicationFactory;
-use Zend\Expressive\Helper;
 
 return [
 
     'middleware_pipeline' => [
-        'always' => [
-            'middleware' => [
-                Helper\ServerUrlMiddleware::class,
-            ],
-            'priority' => 10000,
-        ],
-
         'routing' => [
             'middleware' => [
                 ApplicationFactory::ROUTING_MIDDLEWARE,
             ],
             'priority' => 10,
         ],
 
-        'rest' => [
-            'path' => '/rest',
-            'middleware' => [
-                Middleware\CheckAuthenticationMiddleware::class,
-                Middleware\CrossDomainMiddleware::class,
-            ],
-            'priority' => 5,
-        ],
-
         'post-routing' => [
             'middleware' => [
-                Helper\UrlHelperMiddleware::class,
                 ApplicationFactory::DISPATCH_MIDDLEWARE,
             ],
             'priority' => 1,
         ],
-
-        'error' => [
-            'middleware' => [],
-            'error'    => true,
-            'priority' => -10000,
-        ],
     ],
 ];

config/autoload/templates.global.php

@@ -2,12 +2,6 @@
 
 return [
 
-    'templates' => [
-        'paths' => [
-            'templates'
-        ],
-    ],
-
     'twig' => [
         'cache_dir'  => 'data/cache/twig',
         'extensions' => [

config/autoload/translator.global.php

@@ -0,0 +1,8 @@
+<?php
+return [
+
+    'translator' => [
+        'locale' => env('DEFAULT_LOCALE', 'en'),
+    ],
+
+];

config/autoload/url-shortener.global.php

@@ -1,12 +1,14 @@
 <?php
+use Shlinkio\Shlink\Core\Service\UrlShortener;
+
 return [
 
     'url_shortener' => [
         'domain' => [
-            'schema' => getenv('SHORTENED_URL_SCHEMA') ?: 'http',
-            'hostname' => getenv('SHORTENED_URL_HOSTNAME'),
+            'schema' => env('SHORTENED_URL_SCHEMA', 'http'),
+            'hostname' => env('SHORTENED_URL_HOSTNAME'),
         ],
-        'shortcode_chars' => getenv('SHORTCODE_CHARS'),
+        'shortcode_chars' => env('SHORTCODE_CHARS', UrlShortener::DEFAULT_CHARS),
     ],
 
 ];