Merge pull request #10 from nazg-hack/feature/psr15-implementation

Feature/psr15 implementation
nazg-hack · Jan 23, 2018 · a68c066 · a68c066
2 parents 850aea9 + 190fbcc
commit a68c066
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # Nazg Micro Framework Core Repository
 
-[![Build Status](https://travis-ci.org/nazg-hack/framework.svg?branch=master)](https://travis-ci.org/nazg-hack/framework)
+[![Packagist](https://img.shields.io/badge/HHVM-%3E=3.24-orange.svg?style=flat-square)](https://packagist.org/packages/nazg/framework)
+[![Packagist](https://img.shields.io/packagist/l/nazg/framework.svg?style=flat-square)](https://packagist.org/packages/nazg/framework)
+[![Build Status](http://img.shields.io/travis/nazg-hack/framework/master.svg?style=flat-square)](https://travis-ci.org/nazg-hack/framework)
 
 Http Application / Microframework for HHVM/Hack  
 

diff --git a/composer.json b/composer.json
@@ -26,11 +26,13 @@
     "hack-psr/psr7-http-message-hhi": "^1.0.0",
     "ytake/hh-container": "^0.5",
     "ytake/hh-config-aggregator": "^0.1.1",
-    "nazg/heredity": "^0.2.0",
+    "nazg/heredity": "^0.2.1",
     "facebook/hack-router": "^0.11",
     "zendframework/zend-diactoros": "^1.6.1",
     "monolog/monolog": "^1.23.0",
-    "libreworks/psr3-log-hhi": "^1.0.1"
+    "libreworks/psr3-log-hhi": "^1.0.1",
+    "ytake/psr-http-handlers-hhi": "^1.1.0",
+    "ytake/psr-container-hhi": "^1.1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^5.1",

diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php
@@ -25,8 +25,8 @@
 use Nazg\Foundation\Middleware\Dispatcher;
 use Nazg\Foundation\Bootstrap\BootstrapRegister;
 use Nazg\Foundation\Dependency\DependencyInterface;
-use Interop\Http\Server\RequestHandlerInterface;
-use Interop\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Container\ContainerInterface;

diff --git a/src/Foundation/Middleware/Dispatcher.php b/src/Foundation/Middleware/Dispatcher.php
@@ -7,8 +7,8 @@
 use Nazg\Foundation\Validation\Attribute;
 use Nazg\Foundation\Validation\Validator;
 use Nazg\Foundation\Validation\ValidatorFactory;
-use Interop\Http\Server\MiddlewareInterface;
-use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

diff --git a/src/Middleware/LogExceptionMiddleware.php b/src/Middleware/LogExceptionMiddleware.php
@@ -20,8 +20,8 @@
 use Psr\Log\LoggerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Interop\Http\Server\MiddlewareInterface;
-use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 class LogExceptionMiddleware implements MiddlewareInterface {
 

diff --git a/src/Middleware/SimpleCorsMiddleware.php b/src/Middleware/SimpleCorsMiddleware.php
@@ -21,8 +21,8 @@
 use Psr\Log\LoggerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Interop\Http\Server\MiddlewareInterface;
-use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 type CorsSetting = shape(
   'origin' => string,

diff --git a/src/RequestHandler/FallbackHandler.php b/src/RequestHandler/FallbackHandler.php
@@ -17,9 +17,9 @@
  */
 namespace Nazg\RequestHandler;
 
-use Interop\Http\Server\RequestHandlerInterface;
-use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response\JsonResponse;
 
 class FallbackHandler implements RequestHandlerInterface {

diff --git a/src/Routing/RouteServiceModule.php b/src/Routing/RouteServiceModule.php
@@ -24,7 +24,7 @@
 use Nazg\Exceptions\NotFoundHttpException;
 use Facebook\HackRouter\BaseRouter;
 use Facebook\HackRouter\HttpMethod as HackRouterHttpMethod;
-use Interop\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\MiddlewareInterface;
 
 class RouteServiceModule extends ServiceModule {
   <<__Override>>

diff --git a/src/Routing/Router.php b/src/Routing/Router.php
@@ -20,7 +20,7 @@
 use Nazg\Http\HttpMethod;
 use Facebook\HackRouter\BaseRouter;
 use Facebook\HackRouter\HttpMethod as HackRouterHttpMethod;
-use Interop\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\MiddlewareInterface;
 
 type TResponder = ImmVector<classname<MiddlewareInterface>>;
 type ImmRouteMap = ImmMap<HttpMethod, ImmMap<string, TResponder>>;

diff --git a/src/types.php b/src/types.php
@@ -17,5 +17,5 @@
  */
 namespace Nazg\Types;
 
-type TMiddlewareClass = classname<\Interop\Http\Server\MiddlewareInterface>;
+type TMiddlewareClass = classname<\Psr\Http\Server\MiddlewareInterface>;
 type TServiceModule = classname<\Ytake\HHContainer\ServiceModule>;
diff --git a/tests/Action/IndexAction.php b/tests/Action/IndexAction.php
@@ -5,8 +5,8 @@
 use NazgTest\Responder\IndexResponder;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Interop\Http\Server\MiddlewareInterface;
-use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 final class IndexAction implements MiddlewareInterface {
   public function process(

diff --git a/tests/Action/ParameterAction.php b/tests/Action/ParameterAction.php
@@ -4,8 +4,8 @@
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Interop\Http\Server\MiddlewareInterface;
-use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response\JsonResponse;
 
 final class ParameterAction implements MiddlewareInterface {

diff --git a/tests/Action/ValidateAction.php b/tests/Action/ValidateAction.php
@@ -5,8 +5,8 @@
 use Nazg\Foundation\Validation\Attribute;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Interop\Http\Server\MiddlewareInterface;
-use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response\JsonResponse;
 use NazgTest\Validation\MockValidateActionFaild;
 

diff --git a/tests/Middleware/FakeAttributeMiddleware.php b/tests/Middleware/FakeAttributeMiddleware.php
@@ -2,10 +2,10 @@
 
 namespace NazgTest\Middleware;
 
-use Interop\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 class FakeAttributeMiddleware implements MiddlewareInterface {
   public function process(

diff --git a/tests/Middleware/FakeThrowExceptionMiddleware.php b/tests/Middleware/FakeThrowExceptionMiddleware.php
@@ -2,10 +2,10 @@
 
 namespace NazgTest\Middleware;
 
-use Interop\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 class FakeThrowExceptionMiddleware implements MiddlewareInterface {
   public function process(

diff --git a/tests/StubRequestHandler.php b/tests/StubRequestHandler.php
@@ -2,7 +2,7 @@
 
 namespace NazgTest;
 
-use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Zend\Diactoros\Response\JsonResponse;