Merge pull request #46 from modulusphp/feature/unit-testing-bug-fix

Feature/unit testing bug fix

Author: donaldp

Upstart.php

@@ -57,7 +57,7 @@ public function boot(?bool $isConsole = false) : Upstart
     /**
      * Add cors to the request
      */
-    $this->addCors();
+    $this->addCors($isConsole);
 
     /**
      * Don't load framework components, if
@@ -113,6 +113,9 @@ class_alias($class, $alias);
    */
   private function startApp(bool $isConsole)
   {
+    /**
+     * Start the App Service Resolver
+     */
     (new AppServiceResolver)->start(Application::prototype($isConsole));
 
     /**

Upstart/HandleCors.php

@@ -5,24 +5,38 @@
 trait HandleCors
 {
   /**
-   * add Cors
+   * Add cors to request
    *
+   * @param bool $isConsole
    * @return void
    */
-  public function addCors()
+  public function addCors(bool $isConsole = false)
   {
+    /**
+     * Don't add Cors if this is a console application.
+     * Application might fail if this is a PHPUnit test
+     */
+    if ($isConsole) return;
+
+    /**
+     * This is not a console application, let's add
+     * Cors!
+     */
     header('Access-Control-Allow-Credentials: 0');
     header('Access-Control-Allow-Origin: *');
     header('Access-Control-Allow-Headers: *');
     header('Access-Control-Allow-Methods: *');
 
+    /**
+     * Let's exit if the request type is "options"
+     */
     if (isset($_SERVER["REQUEST_METHOD"]) && $_SERVER["REQUEST_METHOD"] === "OPTIONS") {
       exit;
     }
   }
 
   /**
-   * remove Cors
+   * Remove cors to request
    *
    * @return void
    */

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "modulusphp/framework",
   "description": "Framework component for Modulus",
-  "version": "1.9.9.2",
+  "version": "1.9.9.3",
   "license": "MIT",
   "type": "package",
   "authors": [{