Merged in release/3.2.2 (pull request #6038)

Release/3.2.2 Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-09-06 17:59:57 +00:00
parent 936a93fecc 54689744d0
commit 43642c9f86
20 changed files with 423 additions and 429 deletions
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -486,6 +486,7 @@ class WebApplication
        // Change storage path
        app()->useStoragePath(realpath(PATH_DATA));
        app()->make(Kernel::class)->bootstrap();
+        restore_error_handler();
        error_reporting(error_reporting() & ~E_STRICT & ~E_DEPRECATED);

        Bootstrap::setLanguage();