Fix psr/log dependency (#21)

Vectorface · Jan 21, 2024 · c31be2c · c31be2c
1 parent 9c4b605
commit c31be2c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2']
+        php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
 
     steps:
       - name: Checkout

diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     "vectorface/whip": "^0.4",
     "twig/twig": "^2.0",
     "nikic/fast-route":"^1.0.0",
-    "psr/log": "^1.0",
+    "psr/log": "^1.0 || ^2.0 || ^3.0",
     "ext-json": "*"
   },
   "require-dev": {

diff --git a/src/Vectorface/SnappyRouter/Handler/AbstractRequestHandler.php b/src/Vectorface/SnappyRouter/Handler/AbstractRequestHandler.php
@@ -47,7 +47,9 @@ public function handleException(Exception $e)
         if ($e instanceof RouterExceptionInterface) {
             $responseCode = $e->getAssociatedStatusCode();
         }
-        http_response_code($responseCode);
+        if (!headers_sent()) {
+            http_response_code($responseCode);
+        }
         return parent::handleException($e);
     }
 

diff --git a/src/Vectorface/SnappyRouter/Handler/ControllerHandler.php b/src/Vectorface/SnappyRouter/Handler/ControllerHandler.php
@@ -122,7 +122,9 @@ public function performRoute()
         $action = null;
         $this->determineControllerAndAction($controller, $action);
         $response = $this->invokeControllerAction($controller, $action);
-        http_response_code($response->getStatusCode());
+        if (!headers_sent()) {
+            http_response_code($response->getStatusCode());
+        }
         return $this->getEncoder()->encode($response);
     }
 

diff --git a/src/Vectorface/SnappyRouter/SnappyRouter.php b/src/Vectorface/SnappyRouter/SnappyRouter.php
@@ -186,7 +186,9 @@ private function handleInvocationException($exception, $activeHandler, $isCli)
             if ($exception instanceof RouterExceptionInterface) {
                 $responseCode = $exception->getAssociatedStatusCode();
             }
-            http_response_code($responseCode);
+            if (!headers_sent()) {
+                http_response_code($responseCode);
+            }
         }
         return $exception->getMessage();
     }