fixed phpunit error

tastphp · Jul 18, 2017 · 16dc671 · 16dc671
1 parent 525acb7
commit 16dc671
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/src/Framework/Event/HttpEvent.php b/src/Framework/Event/HttpEvent.php
@@ -2,7 +2,6 @@
 
 namespace TastPHP\Framework\Event;
 
-use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 final class HttpEvent extends Event
@@ -11,7 +10,7 @@ final class HttpEvent extends Event
 
     protected $response;
 
-    public function __construct(ServerRequestInterface $request = null, $response = null)
+    public function __construct($request = null, $response = null)
     {
         $this->request = $request;
         $this->response = $response;

diff --git a/src/Framework/Request/RequestServiceProvider.php b/src/Framework/Request/RequestServiceProvider.php
@@ -18,18 +18,20 @@ public function register()
             return Request::createFromGlobals();
         });
 
-        $this->app->singleton('psr7Factory', function () {
-            return new DiactorosFactory();
-        });
-
-        $this->app->singleton('httpFoundationFactory', function () {
-            return new HttpFoundationFactory();
-        });
-
-        $this->app->singleton('Request', function () {
-            return RequestAdapter::convertPsr7Request(Request::createFromGlobals());
-        });
-
-
+        if (!$this->app->runningInConsole()) {
+            $this->app->singleton('psr7Factory', function () {
+                return new DiactorosFactory();
+            });
+
+            $this->app->singleton('httpFoundationFactory', function () {
+                return new HttpFoundationFactory();
+            });
+
+            $this->app->singleton('Request', function () {
+                return RequestAdapter::convertPsr7Request(Request::createFromGlobals());
+            });
+        } else {
+            $this->app['Request'] = $this->app['symfonyRequest'];
+        }
     }
 }