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

@@ -32,7 +32,7 @@
         "php"                                                : "7.0.0 - 7.0.5 || ^7.0.7",
         "ext-openssl"                                        : "*",
         "ext-fileinfo"                                       : "*",
-        "cache/chain-adapter"                                : "^0.3",
+        "cache/chain-adapter"                                : "^0.4",
         "cache/namespaced-cache"                             : "^0.1",
         "classpreloader/classpreloader"                      : "^3.0",
         "container-interop/container-interop"                : "^1.1",
@@ -47,14 +47,13 @@
         "php-di/invoker"                                     : "^1.3",
         "phpseclib/phpseclib"                                : "^2.0",
         "nesbot/carbon"                                      : "^1.21",
-        "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",
@@ -104,7 +103,7 @@
         "aws/aws-sdk-php"                                    : "^3.18",
         "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",
         "fzaninotto/faker"                                   : "^1.6",
         "guzzlehttp/guzzle"                                  : "^6.0",
@@ -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/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/Console/Application.php

@@ -15,7 +15,7 @@
 use Viserio\Console\Input\InputOption;
 use Viserio\Contracts\Console\Application as ApplicationContract;
 use Viserio\Support\Invoker;
-use Viserio\Support\Traits\ContainerAwareTrait;
+use Viserio\Contracts\Container\Traits\ContainerAwareTrait;
 
 class Application extends SymfonyConsole implements ApplicationContract
 {

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/Container/ContextualBindingBuilder.php

@@ -3,7 +3,7 @@
 namespace Viserio\Container;
 
 use Viserio\Contracts\Container\ContextualBindingBuilder as ContextualBindingBuilderContract;
-use Viserio\Support\Traits\ContainerAwareTrait;
+use Viserio\Contracts\Container\Traits\ContainerAwareTrait;
 
 /**
  * ContextualBindingBuilder.

src/Viserio/Container/Inflector.php

@@ -2,7 +2,7 @@
 declare(strict_types=1);
 namespace Viserio\Container;
 
-use Viserio\Support\Traits\ContainerAwareTrait;
+use Viserio\Contracts\Container\Traits\ContainerAwareTrait;
 
 class Inflector
 {

src/Viserio/Support/Traits/ContainerAwareTrait.php → src/Viserio/Contracts/Container/Traits/ContainerAwareTrait.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-namespace Viserio\Support\Traits;
+namespace Viserio\Contracts\Container\Traits;
 
 use Interop\Container\ContainerInterface;
 use RuntimeException;

src/Viserio/Contracts/Http/Exceptions/ByteCountingStreamException.php

@@ -0,0 +1,62 @@
+<?php
+declare(strict_types=1);
+namespace Viserio\Contracts\Http\Exceptions;
+
+use RuntimeException;
+use Throwable;
+
+class ByteCountingStreamException extends RuntimeException
+{
+    /**
+     * Expect number of bytes to be read.
+     *
+     * @var int
+     */
+    private $expectBytes;
+
+    /**
+     * Actual number of bytes remaining.
+     *
+     * @var int
+     */
+    private $actualBytes;
+
+    /**
+     * ByteCountingStreamException constructor.
+     *
+     * @param int             $expect   expected bytes to be read
+     * @param int             $actual   actual available bytes to read
+     * @param \Throwable|null $previous Exception being thrown
+     */
+    public function __construct(int $expect, int $actual, Throwable $previous = null)
+    {
+        $msg = 'The ByteCountingStream decorator expects to be able to '
+        . sprintf('read %s bytes from a stream, but the stream being decorated ', $expect)
+        . sprintf('only contains %s bytes.', $actual);
+
+        $this->expectBytes = $expect;
+        $this->actualBytes = $actual;
+
+        parent::__construct($msg, 0, $previous);
+    }
+
+    /**
+     * Get expected bytes to be read.
+     *
+     * @return int
+     */
+    public function getExpectBytes(): int
+    {
+        return $this->expectBytes;
+    }
+
+    /**
+     * Get remaining bytes available for read.
+     *
+     * @return int
+     */
+    public function getRemainingBytes(): int
+    {
+        return $this->actualBytes;
+    }
+}

src/Viserio/Contracts/Routing/Exceptions/InvalidRouteDataException.php

@@ -0,0 +1,18 @@
+<?php
+declare(strict_types=1);
+namespace Viserio\Contracts\Routing\Exceptions;
+
+use Exception;
+
+class InvalidRouteDataException extends Exception
+{
+    public function __construct($data)
+    {
+        parent::__construct(
+            sprintf(
+                'The supplied route data is invalid: expecting object or array, %s given',
+                gettype($data)
+            )
+        );
+    }
+}

src/Viserio/Contracts/Routing/Exceptions/InvalidRoutePatternException.php

@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+namespace Viserio\Contracts\Routing\Exceptions;
+
+use Exception;
+
+class InvalidRoutePatternException extends Exception
+{
+}

src/Viserio/Contracts/Routing/Exceptions/UrlGenerationException.php

@@ -0,0 +1,24 @@
+<?php
+declare(strict_types=1);
+namespace Viserio\Contracts\Routing\Exceptions;
+
+use Exception;
+
+class UrlGenerationException extends Exception
+{
+    /**
+     * Create a new exception for missing route parameters.
+     *
+     * @param \Viserio\Routing\Route $route
+     *
+     * @return static
+     */
+    public static function forMissingParameters($route)
+    {
+        return new static(sprintf(
+            'Missing required parameters for [Route: %s] [URI: %s].',
+            $route->getName(),
+            $route->getUri()
+        ));
+    }
+}