Version 0.5.8 👾

Improved `system/error.php` for use `Inphinit\Response` and `Inphinit\Viewing\View` class
inphinit · Jan 6, 2020 · 66c07b1 · 66c07b1
1 parent b6e1d07
commit 66c07b1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 19 deletions.
diff --git a/src/Inphinit/App.php b/src/Inphinit/App.php
@@ -16,7 +16,7 @@
 class App
 {
     /** Inphinit framework version */
-    const VERSION = '0.5.7';
+    const VERSION = '0.5.8';
 
     private static $events = array();
     private static $configs = array();
@@ -142,11 +142,14 @@ public static function stop($code, $msg = null)
             self::trigger('changestatus', array($code, $msg));
         }
 
+        self::trigger('finish');
+
         if (self::$state < 4) {
-            self::trigger('finish');
             self::$state = 4;
         }
 
+        self::dispatch();
+
         exit;
     }
 
@@ -161,10 +164,10 @@ public static function exec()
             return null;
         }
 
-        self::$state = 1;
-
         self::trigger('init');
 
+        self::$state = 1;
+
         if (self::env('maintenance')) {
             $resp = 503;
         } else {
@@ -177,15 +180,14 @@ public static function exec()
         }
 
         if (is_integer($resp)) {
-            if (ob_get_level() === 0) {
-                ob_start();
-            }
-
-            \UtilsSandboxLoader('error.php', array( 'status' => $resp ));
+            self::on('finish', function () use ($resp) {
+                \UtilsSandboxLoader('error.php', array( 'status' => $resp ));
+            });
+
             self::stop($resp);
         }
 
-        $callback = $resp['callback'];
+        $callback = &$resp['callback'];
 
         if (is_string($callback)) {
             $parsed = explode(':', $callback, 2);
@@ -196,13 +198,7 @@ public static function exec()
 
         $output = call_user_func_array($callback, $resp['args']);
 
-        if (class_exists('\\Inphinit\\Http\\Response', false)) {
-            Response::dispatch();
-        }
-
-        if (class_exists('\\Inphinit\\Viewing\\View', false)) {
-            View::dispatch();
-        }
+        self::dispatch();
 
         if (self::$state < 2) {
             self::$state = 2;
@@ -217,10 +213,26 @@ public static function exec()
         if (self::$state < 3) {
             self::$state = 3;
         }
+
+        self::trigger('finish');
 
         if (self::$state < 4) {
-            self::trigger('finish');
             self::$state = 4;
         }
     }
+
+    /**
+     * Dispatch before ready event if exec is Ok,
+     * or dispatch after finish event if stop() is executed
+     */
+    private static function dispatch()
+    {
+        if (class_exists('\\Inphinit\\Http\\Response', false)) {
+            Response::dispatch();
+        }
+
+        if (class_exists('\\Inphinit\\Viewing\\View', false)) {
+            View::dispatch();
+        }
+    }
 }
diff --git a/src/Inphinit/Http/Status.php b/src/Inphinit/Http/Status.php
@@ -151,7 +151,7 @@ final class Status
      *
      * @param int    $code
      * @param string $alternative
-     * @return void
+     * @return mixed
      */
     public static function message($code, $alternative = null)
     {