Initial commit

Author: designcise

.gitignore

@@ -0,0 +1,5 @@
+/vendor/
+/.idea
+.DS_Store
+*.cache
+composer.lock

LICENSE.md

@@ -1,7 +1,18 @@
-Copyright (c) 2017-2018 Daniyal Hamid (https://designcise.com).
+# License
+
+### Copyright (c) 2017-2019 Daniyal Hamid (https://designcise.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+### Third-party software used in BitFrame Microframework
+
+Portions of this package either build-upon or take inspiration from the work done by:
+
+- **FastRoute Router**
+  * Credit For: FastRoute Library
+  * Copyright (c) 2013 by Nikita Popov.
+  * MIT License

README.md

@@ -1,50 +1,54 @@
-# BitFrame\Router\FastRouteRouter
+# BitFrame\FastRoute
 
 FastRoute wrapper class to manage http routes as a middleware.
 
-### Installation
+## Installation
 
-See [installation docs](https://www.bitframephp.com/middleware/router/fastroute) for instructions on installing and using this middleware.
+Install using composer:
 
-### Usage Example
+```
+$ composer require designcise/bitframe-fastroute
+```
+
+Please note that this package requires PHP 7.4.0 or newer.
+
+## Usage Example
 
 ```
-use \BitFrame\Router\FastRouteRouter;
+use BitFrame\App;
+use BitFrame\Emitter\SapiEmitter;
+use BitFrame\FastRoute\Router;
 
 require 'vendor/autoload.php';
 
-$app = new \BitFrame\Application;
+$app = new App();
+$router = new Router();
 
-$app->map(['GET', 'POST'], '/test', function ($request, $response, $next) {
-    $response->getBody()->write('Test Page');
-    
-    return $response;
+$router->map(['GET', 'POST'], '/test', function ($request, $handler) {
+    $handler->write('Test Page');
+    return $handler->handle($request);
 });
 
 $app->run([
-    /* In order to output response from the router (or router middleware), 
-     * make sure you include a response emitter middleware, for example:
-     * \BitFrame\Message\DiactorosResponseEmitter::class, */
-    // router should normally be the last middleware to run
-    FastRouteRouter::class
+    SapiEmitter::class,
+    $router,
+    // ...
 ]);
 ```
 
-### Tests
+## Tests
 
 To execute the test suite, you will need [PHPUnit](https://phpunit.de/).
 
-### Contributing
+## Contributing
 
 * File issues at https://github.com/designcise/bitframe-fastroute/issues
 * Issue patches to https://github.com/designcise/bitframe-fastroute/pulls
 
-### Documentation
-
-Documentation is available at:
+## Documentation
 
-* https://www.bitframephp.com/middleware/router/fastroute/
+Complete documentation for v2.0 will be available soon.
 
-### License
+## License
 
 Please see [License File](LICENSE.md) for licensing information.

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "designcise/bitframe-fastroute",
-    "version": "1.0.4",
+    "version": "2.0.0",
     "type": "library",
     "description": "FastRoute router middleware for BitFrame microframework",
     "license": "MIT",
@@ -11,22 +11,30 @@
         }
     ],
     "require": {
-        "php": ">=7.1.0",
-        "designcise/bitframe": "^1.0",
+        "php": ">=7.4.0",
         "psr/http-server-middleware": "~1.0",
-        "nikic/fast-route": "^1.3"
+        "designcise/bitframe": "2.x-dev"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.4"
+        "phpunit/phpunit": "^8.5",
+        "squizlabs/php_codesniffer": "3.*",
+        "phpmd/phpmd": "@stable"
     },
     "autoload": {
         "psr-4": {
-            "BitFrame\\Router\\": "src/"
+            "BitFrame\\FastRoute\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "BitFrame\\Test\\": "test/"
+            "BitFrame\\FastRoute\\Test\\": "test/"
         }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "scripts": {
+        "style": "vendor/bin/phpcs --standard=PSR12 src",
+        "test": "vendor/bin/phpunit --configuration phpunit.xml --testsuite unit"
     }
 }

phpunit.xml

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="vendor/autoload.php"
-		 backupGlobals="false"
+<phpunit backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         syntaxCheck="false"
-        >
+    >
     <testsuites>
-        <testsuite name="BitFrame Tests">
-            <directory>./test/</directory>
+        <testsuite name="unit">
+            <directory suffix="Test.php">./test</directory>
         </testsuite>
     </testsuites>
 

src/Exception/BadRouteException.php

@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * BitFrame Framework (https://www.bitframephp.com)
+ *
+ * @author    Daniyal Hamid
+ * @copyright Copyright (c) 2017-2019 Daniyal Hamid (https://designcise.com)
+ * @license   https://bitframephp.com/about/license MIT License
+ */
+
+declare(strict_types=1);
+
+namespace BitFrame\FastRoute\Exception;
+
+class BadRouteException extends \LogicException
+{
+}

src/Exception/HttpException.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * BitFrame Framework (https://www.bitframephp.com)
+ *
+ * @author    Daniyal Hamid
+ * @copyright Copyright (c) 2017-2019 Daniyal Hamid (https://designcise.com)
+ * @license   https://bitframephp.com/about/license MIT License
+ */
+
+declare(strict_types=1);
+
+namespace BitFrame\FastRoute\Exception;
+
+/**
+ * Represents an HTTP error.
+ */
+class HttpException extends \RuntimeException 
+{
+    /**
+     * @param string $message
+     * @param int $code Status code
+     */
+    public function __construct(string $message, int $code = 500)
+    {
+        http_response_code($code);
+        parent::__construct($message, $code);
+    }
+}

src/Exception/MethodNotAllowedException.php

@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * BitFrame Framework (https://www.bitframephp.com)
+ *
+ * @author    Daniyal Hamid
+ * @copyright Copyright (c) 2017-2019 Daniyal Hamid (https://designcise.com)
+ * @license   https://bitframephp.com/about/license MIT License
+ */
+
+declare(strict_types=1);
+
+namespace BitFrame\FastRoute\Exception;
+
+/**
+ * Represents an HTTP 405 error.
+ */
+class MethodNotAllowedException extends HttpException
+{
+    /**
+     * @param string $method Name of the method
+     */
+    public function __construct(string $method)
+    {
+        parent::__construct(\sprintf('Method "%s" Not Allowed', $method), 405);
+    }
+}

src/Exception/RouteNotFoundException.php

@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * BitFrame Framework (https://www.bitframephp.com)
+ *
+ * @author    Daniyal Hamid
+ * @copyright Copyright (c) 2017-2019 Daniyal Hamid (https://designcise.com)
+ * @license   https://bitframephp.com/about/license MIT License
+ */
+
+declare(strict_types=1);
+
+namespace BitFrame\FastRoute\Exception;
+
+/**
+ * Represents a route not found error.
+ */
+class RouteNotFoundException extends HttpException
+{
+    /**
+     * @param string $type
+     */
+    public function __construct(string $type)
+    {
+        parent::__construct(\sprintf('Route "%s" cannot be found', $type), 404);
+    }
+}