Issue 16 Refactor Routing

benchmarks/Routing/RouteParserBench.php

@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+namespace Narrowspark\Routing;
+
+use Benchmark;
+
+class RouteParserBench implements Benchmark
+{
+
+}

composer.json

@@ -47,14 +47,13 @@
         "narrowspark/http-status"                            : "^2.0",
         "php-di/invoker"                                     : "^1.3",
         "phpseclib/phpseclib"                                : "^2.0",
-        "nikic/fast-route"                                   : "^0.6",
-        "ramsey/uuid"                                        : "^3.4",
         "paragonie/constant_time_encoding"                   : "^2.0",
         "paragonie/password_lock"                            : "^3.0",
         "psr/cache"                                          : "^1.0",
         "psr/log"                                            : "^1.0",
         "psr/http-message"                                   : "^1.0",
         "psy/psysh"                                          : "^0.6",
+        "ramsey/uuid"                                        : "^3.4",
         "roave/security-advisories"                          : "dev-master",
         "schnittstabil/csrf-tokenservice"                    : "^2.0",
         "stecman/symfony-console-completion"                 : "^0.6",
@@ -133,9 +132,10 @@
     },
     "autoload": {
         "psr-4": {
-            "Viserio\\"                                      : "src/Viserio/"
+            "Viserio\\"                                      : "src/Viserio/",
+            "Narrowspark\\"                                  : "benchmarks/"
         },
-        "exclude-from-classmap"                              : ["src/Viserio/**/Tests/"]
+        "exclude-from-classmap"                              : ["src/Viserio/**/Tests/", "benchmarks/"]
     },
     "extra": {
         "branch-alias": {

phpbench.json

@@ -0,0 +1,5 @@
+{
+    "bootstrap": "vendor/autoload.php",
+    "path": "benchmarks",
+    "progress": "dots"
+}

phpunit.xml.dist

@@ -90,9 +90,9 @@
         <testsuite name="Narrowspark Queue Component Test Suite">
             <directory>./src/Viserio/Queue/Tests</directory>
         </testsuite>
-<!--        <testsuite name="Narrowspark Routing Component Test Suite">
+       <testsuite name="Narrowspark Routing Component Test Suite">
             <directory>./src/Viserio/Routing/Tests</directory>
-        </testsuite> -->
+        </testsuite>
         <testsuite name="Narrowspark Session Component Test Suite">
             <directory>./src/Viserio/Session/Tests</directory>
         </testsuite>

src/Viserio/Bus/Dispatcher.php

@@ -8,7 +8,7 @@
 use Viserio\Contracts\Bus\Dispatcher as DispatcherContract;
 use Viserio\Pipeline\Pipeline;
 use Viserio\Support\Invoker;
-use Viserio\Support\Traits\ContainerAwareTrait;
+use Viserio\Contracts\Container\Traits\ContainerAwareTrait;
 
 class Dispatcher implements DispatcherContract
 {

src/Viserio/Cache/CacheManager.php

@@ -23,7 +23,6 @@
 use Memcached;
 use MongoDB\Driver\Manager as MongoDBManager;
 use Predis\Client as PredisClient;
-use Psr\Cache\CacheItemPoolInterface;
 use Redis;
 use Viserio\{
     Filesystem\FilesystemManager,

src/Viserio/Cache/composer.json

@@ -39,16 +39,16 @@
     ],
     "require": {
         "php"                             : "7.0.0 - 7.0.5 || ^7.0.7",
-        "cache/chain-adapter"             : "^0.3",
+        "cache/chain-adapter"             : "^0.4",
         "cache/namespaced-cache"          : "^0.1",
         "psr/cache"                       : "^1.0",
         "viserio/config"                  : "self.version",
         "viserio/cotracts"                : "self.version"
     },
     "require-dev": {
-        "cache/array-adapter"             : "^0.2",
+        "cache/array-adapter"             : "^0.4",
         "cache/filesystem-adapter"        : "^0.3",
-        "cache/session-handler"           : "^0.1",
+        "cache/session-handler"           : "^0.2",
         "cache/void-adapter"              : "^0.3",
         "narrowspark/php-cs-fixer-config" : "^1.1",
         "narrowspark/testing-helper"      : "^1.5",
@@ -76,13 +76,13 @@
     "suggest": {
         "cache/apc-adapter"               : "Required to use the Apc cache (^0.3).",
         "cache/apcu-adapter"              : "Required to use the Apcu cache (^0.3).",
-        "cache/array-adapter"             : "Required to use the Array cache (^0.2)",
+        "cache/array-adapter"             : "Required to use the Array cache (^0.4)",
         "cache/filesystem-adapter"        : "Required to use the Filesystem cache (^0.3).",
         "cache/memcache-adapter"          : "Required to use the Memcache cache (^0.3).",
         "cache/memcached-adapter"         : "Required to use the Memcached cache (^0.3).",
         "cache/mongodb-adapter"           : "Required to use the Mongodb cache (^0.2).",
         "cache/predis-adapter"            : "Required to use the Predis cache (^0.4).",
-        "cache/session-handler"           : "Required to use the Session cache (^0.1).",
+        "cache/session-handler"           : "Required to use the Session cache (^0.2).",
         "cache/void-adapter"              : "Required to use the Void cache (^0.3)."
     },
     "minimum-stability"                   : "dev",

src/Viserio/Connect/ConnectManager.php

@@ -106,9 +106,9 @@ protected function createMariadbConnection(array $config): PDO
      *
      * @param array $config
      *
-     * @return \Mongo|\MongoClient|\MongoDB\Client
+     * @return \Mongo
      */
-    protected function createMongoConnection(array $config): PDO
+    protected function createMongoConnection(array $config)
     {
         return (new MongoConnector())->connect($config);
     }

src/Viserio/Console/Application.php

@@ -2,20 +2,27 @@
 declare(strict_types=1);
 namespace Viserio\Console;
 
+use Closure;
 use Interop\Container\ContainerInterface as ContainerContract;
 use Invoker\Exception\InvocationException;
 use RuntimeException;
-use Symfony\Component\Console\Application as SymfonyConsole;
-use Symfony\Component\Console\Command\Command as SymfonyCommand;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Viserio\Console\Command\Command as ViserioCommand;
-use Viserio\Console\Command\ExpressionParser as Parser;
-use Viserio\Console\Input\InputOption;
-use Viserio\Contracts\Console\Application as ApplicationContract;
+use Symfony\Component\Console\{
+    Application as SymfonyConsole,
+    Command\Command as SymfonyCommand,
+    Input\InputDefinition,
+    Input\InputInterface,
+    Output\OutputInterface
+};
+use Viserio\Console\{
+    Command\Command as ViserioCommand,
+    Command\ExpressionParser as Parser,
+    Input\InputOption
+};
+use Viserio\Contracts\{
+    Console\Application as ApplicationContract,
+    Container\Traits\ContainerAwareTrait
+};
 use Viserio\Support\Invoker;
-use Viserio\Support\Traits\ContainerAwareTrait;
 
 class Application extends SymfonyConsole implements ApplicationContract
 {
@@ -59,9 +66,9 @@ class Application extends SymfonyConsole implements ApplicationContract
     /**
      * Create a new Cerebro console application.
      *
-     * @param ContainerContract $container
-     * @param string            $version
-     * @param string            $name
+     * @param \Interop\Container\ContainerInterface $container
+     * @param string                                $version
+     * @param string                                $name
      */
     public function __construct(
         ContainerContract $container,
@@ -70,23 +77,22 @@ public function __construct(
     ) {
         $this->name = $name;
         $this->version = $version;
-
-        $this->setContainer($container);
+        $this->container = $container;
         $this->expressionParser = new Parser();
-        $this->initInvoker();
 
+        $this->initInvoker();
         $this->setAutoExit(false);
         $this->setCatchExceptions(false);
 
-        parent::__construct($this->getName(), $this->getVersion());
+        parent::__construct($name, $version);
     }
 
     /**
      * Add a command to the console.
      *
      * @param \Symfony\Component\Console\Command\Command $command
      *
-     * @return SymfonyCommand|null
+     * @return null|\Symfony\Component\Console\Command\Command
      */
     public function add(SymfonyCommand $command)
     {
@@ -105,10 +111,11 @@ public function add(SymfonyCommand $command)
      * @param callable|string|array $callable   Called when the command is called.
      *                                          When using a container, this can be a "pseudo-callable"
      *                                          i.e. the name of the container entry to invoke.
+     * @param array                 $aliases An array of aliases for the command.
      *
-     * @return SymfonyCommand
+     * @return \Symfony\Component\Console\Command\Command
      */
-    public function command(string $expression, $callable): SymfonyCommand
+    public function command(string $expression, $callable, array $aliases = []): SymfonyCommand
     {
         $commandFunction = function (InputInterface $input, OutputInterface $output) use ($callable) {
             $parameters = array_merge(
@@ -120,18 +127,23 @@ public function command(string $expression, $callable): SymfonyCommand
                 $input->getOptions()
             );
 
+            if ($callable instanceof Closure) {
+                $callable = $callable->bindTo($this, $this);
+            }
+
             try {
                 $this->getInvoker()->call($callable, $parameters);
-            } catch (InvocationException $e) {
+            } catch (InvocationException $exception) {
                 throw new RuntimeException(sprintf(
                     "Impossible to call the '%s' command: %s",
                     $input->getFirstArgument(),
-                    $e->getMessage()
-                ), 0, $e);
+                    $exception->getMessage()
+                ), 0, $exception);
             }
         };
 
         $command = $this->createCommand($expression, $commandFunction);
+        $command->setAliases($aliases);
 
         $this->add($command);
 
@@ -208,7 +220,7 @@ protected function getEnvironmentOption(): InputOption
      * @param string   $expression
      * @param callable $callable
      *
-     * @return SymfonyCommand
+     * @return \Symfony\Component\Console\Command\Command
      */
     protected function createCommand(string $expression, callable $callable): SymfonyCommand
     {

src/Viserio/Console/Command/Command.php

@@ -18,11 +18,11 @@
     Question\Question
 };
 use Viserio\Console\Style\NarrowsparkStyle;
-use Viserio\Contracts\Support\Arrayable;
-use Viserio\Support\{
-    Invoker,
-    Traits\ContainerAwareTrait
+use Viserio\Contracts\{
+    Support\Arrayable,
+    Container\Traits\ContainerAwareTrait
 };
+use Viserio\Support\Invoker;
 
 abstract class Command extends BaseCommand implements CompletionAwareInterface
 {

src/Viserio/Console/Command/ExpressionParser.php

@@ -2,9 +2,11 @@
 declare(strict_types=1);
 namespace Viserio\Console\Command;
 
-use Viserio\Console\Input\InputArgument;
-use Viserio\Console\Input\InputOption;
-use Viserio\Contracts\Console\InvalidCommandExpression;
+use Viserio\Console\Input\{
+    InputArgument,
+    InputOption
+};
+use Viserio\Contracts\Console\Exceptions\InvalidCommandExpression;
 use Viserio\Support\Str;
 
 class ExpressionParser

src/Viserio/Console/Tests/ApplicationTest.php

@@ -4,12 +4,16 @@
 
 use Mockery as Mock;
 use Narrowspark\TestingHelper\ArrayContainer;
-use stdClass;
-use Symfony\Component\Console\Input\StringInput;
-use Symfony\Component\Console\Output\OutputInterface;
-use Viserio\Console\Application;
-use Viserio\Console\Tests\Fixture\SpyOutput;
-use Viserio\Console\Tests\Fixture\ViserioCommand;
+use StdClass;
+use Symfony\Component\Console\{
+    Input\StringInput,
+    Output\OutputInterface
+};
+use Viserio\Console\{
+    Application,
+    Tests\Fixture\SpyOutput,
+    Tests\Fixture\ViserioCommand
+};
 
 class ApplicationTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,9 +24,9 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $stdClass = new stdClass();
+        $stdClass = new StdClass();
         $stdClass->foo = 'hello';
-        $stdClass2 = new stdClass();
+        $stdClass2 = new StdClass();
         $stdClass2->foo = 'nope!';
 
         $container = new ArrayContainer([
@@ -139,7 +143,7 @@ public function testItShouldRunACommandWitMultipleOptions()
 
     public function testItShouldInjectTypeHintInPriority()
     {
-        $this->application->command('greet', function (OutputInterface $output, stdClass $param) {
+        $this->application->command('greet', function (OutputInterface $output, StdClass $param) {
             $output->write($param->foo);
         });
 
@@ -149,20 +153,23 @@ public function testItShouldInjectTypeHintInPriority()
     public function testItCanResolveCallableStringFromContainer()
     {
         $this->application->command('greet', 'command.greet');
+
         $this->assertOutputIs('greet', 'hello');
     }
 
     public function testItCanResolveCallableArrayFromContainer()
     {
         $this->application->command('greet', 'command.arr.greet');
+
         $this->assertOutputIs('greet', 'hello');
     }
 
     public function testItcanInjectUsingTypeHints()
     {
-        $this->application->command('greet', function (OutputInterface $output, stdClass $stdClass) {
+        $this->application->command('greet', function (OutputInterface $output, StdClass $stdClass) {
             $output->write($stdClass->foo);
         });
+
         $this->assertOutputIs('greet', 'hello');
     }
 
@@ -171,6 +178,7 @@ public function testItCanInjectUsingParameterNames()
         $this->application->command('greet', function (OutputInterface $output, $stdClass) {
             $output->write($stdClass->foo);
         });
+
         $this->assertOutputIs('greet', 'hello');
     }
 
@@ -182,9 +190,31 @@ public function testItShouldThrowIfAParameterCannotBeResolved()
     {
         $this->application->command('greet', function ($fbo) {
         });
+
         $this->assertOutputIs('greet', '');
     }
 
+    public function testRunsACommandViaItsAliasAndReturnsExitCode()
+    {
+        $this->application->command('foo', function ($output) {
+            $output->write(1);
+        }, ['bar']);
+
+        $this->assertOutputIs('bar', 1);
+    }
+
+    public function testitShouldRunACommandInTheScopeOfTheApplication()
+    {
+        $whatIsThis = null;
+
+        $this->application->command('foo', function () use (&$whatIsThis) {
+            $whatIsThis = $this;
+        });
+
+        $this->assertOutputIs('foo', '');
+        $this->assertSame($this->application, $whatIsThis);
+    }
+
     /**
      * Fixture method.
      *
@@ -204,6 +234,7 @@ private function assertOutputIs($command, $expected)
         $output = new SpyOutput();
 
         $this->application->run(new StringInput($command), $output);
+
         $this->assertEquals($expected, $output->output);
     }
 }