Merge pull request #14 from tastphp/v1.4.1

clean code && add Response compoment
tastphp · Jul 19, 2017 · 9d2fe60 · 9d2fe60
2 parents d08e518 + ed0342d
commit 9d2fe60
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 5 deletions.
diff --git a/src/Framework/Container/NotFoundException.php b/src/Framework/Container/NotFoundException.php
@@ -4,6 +4,10 @@
 
 use Psr\Container\NotFoundExceptionInterface;
 
+/**
+ * Class NotFoundException
+ * @package TastPHP\Framework\Container
+ */
 class NotFoundException extends \InvalidArgumentException implements NotFoundExceptionInterface
 {
 

diff --git a/src/Framework/Listener/MiddlewareListener.php b/src/Framework/Listener/MiddlewareListener.php
@@ -2,7 +2,6 @@
 
 namespace TastPHP\Framework\Listener;
 
-use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
 use Symfony\Component\EventDispatcher\Event;
 use TastPHP\Service\ServiceKernel;
 use TastPHP\Framework\Event\AppEvent;

diff --git a/src/Framework/Listener/ResponseListener.php b/src/Framework/Listener/ResponseListener.php
@@ -13,13 +13,17 @@ public function onResponseAction(Event $event)
     {
         $response = $event->getResponse();
 
-        if ($response instanceof Response || $response instanceof RedirectResponse || $response instanceof JsonResponse) {
+        if ($response instanceof Response
+            || $response instanceof RedirectResponse
+            || $response instanceof JsonResponse
+        ) {
             $response->send();
         }
 
         if (is_string($response)) {
             echo $response;
         }
+
         if (function_exists('fastcgi_finish_request')) {
             fastcgi_finish_request();
         }

diff --git a/src/Framework/Request/RequestAdapter.php b/src/Framework/Request/RequestAdapter.php
@@ -10,7 +10,7 @@ class RequestAdapter
 {
     /**
      * @param Request $symfonyRequest
-     * @return mixed
+     * @return psrRequest
      */
     public static function convertPsr7Request(Request $symfonyRequest)
     {
@@ -22,12 +22,13 @@ public static function convertPsr7Request(Request $symfonyRequest)
 
     /**
      * @param $psrRequest
-     * @return mixed
+     * @return SymfonyRequest
      */
     public static function convertSymfonyRequest($psrRequest)
     {
         $app = \Kernel::getInstance();
-        $httpFoundationFactory = $app['httpFoundationFactory'];;
+        $httpFoundationFactory = $app['httpFoundationFactory'];
+
         return $httpFoundationFactory->createRequest($psrRequest);
     }
 }
diff --git a/src/Framework/Response/Response.php b/src/Framework/Response/Response.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace TastPHP\Framework\Response;
+
+use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
+
+/**
+ * Class Response
+ * @package TastPHP\Framework\Request
+ */
+class Response extends SymfonyResponse
+{
+
+}
diff --git a/src/Framework/Response/ResponseAdapter.php b/src/Framework/Response/ResponseAdapter.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace TastPHP\Framework\Response;
+
+/**
+ * Class ResponseAdapter
+ * @package TastPHP\Framework\Response
+ */
+class ResponseAdapter
+{
+    /**
+     * @param Response $symfonyResponse
+     * @return psrResponse
+     */
+    public static function convertPsr7Response(Response $symfonyResponse)
+    {
+        $app = \Kernel::getInstance();
+        $psr7Factory = $app['psr7Factory'];
+
+        return $psr7Factory->createResponse($symfonyResponse);
+    }
+
+    /**
+     * @param $psrResponse
+     * @return SymfonyResponse
+     */
+    public static function convertSymfonyResponse($psrResponse)
+    {
+        $app = \Kernel::getInstance();
+        $httpFoundationFactory = $app['httpFoundationFactory'];
+
+        return $httpFoundationFactory->createResponse($psrResponse);
+    }
+}