fixed minor bug in Request

Author: aleferri

example.php

@@ -0,0 +1,19 @@
+<?php
+
+require "vendor/autoload.php";
+
+use flight\Flight;
+
+$app = Flight::app( 'test', __DIR__ );
+
+$router = $app->router();
+$router->get( '/', function ($request) use ($app) {
+    error_log( json_encode( $_SERVER ) );
+
+    if ( isset( $_SERVER[ 'HTTP_ORIGIN' ] ) || isset( $_SERVER[ 'HTTP_SEC_FETCH_SITE' ] ) ) {
+        return $app->allow_cross_origin( $request );
+    }
+    echo 'hello world!';
+}, [ 'share' => '*' ] );
+
+$app->start();

public/index.php

@@ -0,0 +1,3 @@
+<?php
+
+include "../example.php";

src/flight/Engine.php

@@ -134,7 +134,7 @@ function ($view) use ($self) {
         // Register framework methods
         $methods = array(
             'start', 'stop', 'route', 'halt', 'error', 'notFound',
-            'render', 'redirect', 'etag', 'lastModified', 'json',
+            'render', 'redirect', 'allow_cross_origin', 'etag', 'lastModified', 'json',
             'jsonp', 'dispatchRoute'
         );
 
@@ -435,8 +435,7 @@ public function _error($e) {
             $this->response()
                 ->clear()
                 ->status( 500 )
-                ->write( $msg )
-                ->send();
+                ->write( $msg );
         } catch ( \Throwable $t ) {
             exit( $msg );
         }
@@ -480,6 +479,35 @@ public function _redirect($url, $code = 303): http\Response {
                 ->header( 'Location', $url );
     }
 
+    public function _allow_cross_origin(http\Request $request): http\Response {
+        $response = $this->response();
+
+        if ( isset( $_SERVER[ 'HTTP_ORIGIN' ] ) ) {
+            // Allow source
+            $response->header( 'Access-Control-Allow-Origin', $_SERVER[ 'HTTP_ORIGIN' ] )
+                ->header( 'Access-Control-Allow-Credentials', true )
+                ->header( 'Access-Control-Max-Age', 86400 );
+        } else if ( isset( $_SERVER[ 'HTTP_SEC_FETCH_SITE' ] ) ) {
+            $response->header( 'Access-Control-Allow-Origin', '*' )
+                ->header( 'Access-Control-Allow-Credentials', true )
+                ->header( 'Access-Control-Max-Age', 86400 );
+        }
+
+        // Access-Control headers are received during OPTIONS requests
+        if ( $request->method === 'OPTIONS' ) {
+            if ( isset( $_SERVER[ 'HTTP_ACCESS_CONTROL_REQUEST_METHOD' ] ) ) {
+                $response->header( 'Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS' );
+            }
+
+            if ( isset( $_SERVER[ 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' ] ) ) {
+                $response->header( 'Access-Control-Allow-Methods', $_SERVER[ 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' ] );
+            }
+            $response->status( 200 );
+        }
+
+        return $response;
+    }
+
     /**
      * Renders a template.
      *

src/flight/http/Response.php

@@ -176,14 +176,14 @@ public function sendHeaders() {
         if ( strpos( php_sapi_name(), 'cgi' ) !== false ) {
             header(
                 sprintf(
-                    'Status: %d %s', $this->status, self::$codes[ $this->status ]
+                    'Status: %d %s', $this->status, HTTPStatus::CODES[ $this->status ]
                 ), true
             );
         } else {
             header(
                 sprintf(
                     '%s %d %s', (isset( $_SERVER[ 'SERVER_PROTOCOL' ] ) ? $_SERVER[ 'SERVER_PROTOCOL' ] : 'HTTP/1.1' ),
-                    $this->status, self::$codes[ $this->status ]
+                    $this->status, HTTPStatus::CODES[ $this->status ]
                 ), true, $this->status
             );
         }

src/flight/http/Router.php

@@ -56,7 +56,7 @@ public function __construct() {
      *
      * @return array Array of routes
      */
-    public function getRoutes() {
+    public function routes() {
         return $this->routes;
     }
 
@@ -74,7 +74,7 @@ public function clear() {
      * @param callback $callback Callback function
      * @param array $config Pass the matching route object to the callback
      */
-    public function map( $pattern, $callback, array $config = [] ): Route {
+    public function map($pattern, $callback, array $config = []): Route {
         $url = trim( $pattern );
         $methods = [ 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD' ];
 
@@ -86,9 +86,9 @@ public function map( $pattern, $callback, array $config = [] ): Route {
 
         $route = new Route( $url, $callback, $methods, $config );
         foreach ( $methods as $method ) {
-            $this->routes[$method][] = $route;
+            $this->routes[ $method ][] = $route;
         }
-        
+
         return $route;
     }
 
@@ -99,51 +99,51 @@ public function map( $pattern, $callback, array $config = [] ): Route {
      * @param callback $callback Callback function
      * @param array $config Pass the matching route object to the callback
      */
-    public function head( $pattern, $callback, array $config = [] ): Route {
+    public function head($pattern, $callback, array $config = []): Route {
         return $this->map( 'HEAD ' . $pattern, $callback, $config );
     }
-    
+
     /**
      * Maps a GET URL pattern to a callback function.
      *
      * @param string $pattern URL pattern to match
      * @param callback $callback Callback function
      * @param array $config Pass the matching route object to the callback
      */
-    public function get( $pattern, $callback, array $config = [] ): Route {
+    public function get($pattern, $callback, array $config = []): Route {
         return $this->map( 'GET ' . $pattern, $callback, $config );
     }
-    
+
     /**
      * Maps a POST URL pattern to a callback function.
      *
      * @param string $pattern URL pattern to match
      * @param callback $callback Callback function
      * @param array $config Pass the matching route object to the callback
      */
-    public function post( $pattern, $callback, array $config = [] ): Route {
+    public function post($pattern, $callback, array $config = []): Route {
         return $this->map( 'POST ' . $pattern, $callback, $config );
     }
-    
+
     /**
      * Maps a PUT URL pattern to a callback function.
      *
      * @param string $pattern URL pattern to match
      * @param callback $callback Callback function
      * @param array $config Pass the matching route object to the callback
      */
-    public function put( $pattern, $callback, array $config = [] ): Route {
+    public function put($pattern, $callback, array $config = []): Route {
         return $this->map( 'PUT ' . $pattern, $callback, $config );
     }
-    
+
     /**
      * Maps a DELETE URL pattern to a callback function.
      *
      * @param string $pattern URL pattern to match
      * @param callback $callback Callback function
      * @param array $config Pass the matching route object to the callback
      */
-    public function delete( $pattern, $callback, array $config = [] ): Route {
+    public function delete($pattern, $callback, array $config = []): Route {
         return $this->map( 'DELETE ' . $pattern, $callback, $config );
     }
 
@@ -153,10 +153,10 @@ public function delete( $pattern, $callback, array $config = [] ): Route {
      * @param Request $request Request object
      * @return Route|bool Matching route or false if no match
      */
-    public function route( Request $request ) {
+    public function route(Request $request) {
         $url_decoded = urldecode( $request->url );
 
-        $bucket = $this->routes[$request->method];
+        $bucket = $this->routes[ $request->method ];
 
         foreach ( $bucket as $route ) {
             if ( $route->matchUrl( $url_decoded, $this->case_sensitive ) ) {
@@ -166,4 +166,5 @@ public function route( Request $request ) {
 
         return false;
     }
+
 }