Implement catching for all Errors - ref Magento issue #23350

accmiszyman · accmiszyman · commit ee8373fa2772 · 2019-10-23T20:04:10.000+02:00
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -269,6 +269,8 @@ public function run(AppInterface $application)
             }
         } catch (\Exception $e) {
             $this->terminate($e);
+        } catch (\Error $e) {
+            $this->terminate($e);
         }
     } // phpcs:enable
 
@@ -418,12 +420,12 @@ public function isDeveloperMode()
     /**
      * Display an exception and terminate program execution
      *
-     * @param \Exception $e
+     * @param \Throwable $e
      * @return void
      *
      * phpcs:disable Magento2.Security.LanguageConstruct, Squiz.Commenting.FunctionCommentThrowTag
      */
-    protected function terminate(\Exception $e)
+    protected function terminate(\Throwable $e)
     {
 
         if ($this->isDeveloperMode()) {

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,8 @@ public function run(AppInterface $application)`
`269`	`269`	`}`
`270`	`270`	`} catch (\Exception $e) {`
`271`	`271`	`$this->terminate($e);`
	`272`	`+ } catch (\Error $e) {`
	`273`	`+ $this->terminate($e);`
`272`	`274`	`}`
`273`	`275`	`} // phpcs:enable`
`274`	`276`
`@@ -418,12 +420,12 @@ public function isDeveloperMode()`
`418`	`420`	`/**`
`419`	`421`	`* Display an exception and terminate program execution`
`420`	`422`	`*`
`421`		`- * @param \Exception $e`
	`423`	`+ * @param \Throwable $e`
`422`	`424`	`* @return void`
`423`	`425`	`*`
`424`	`426`	`* phpcs:disable Magento2.Security.LanguageConstruct, Squiz.Commenting.FunctionCommentThrowTag`
`425`	`427`	`*/`
`426`		`- protected function terminate(\Exception $e)`
	`428`	`+ protected function terminate(\Throwable $e)`
`427`	`429`	`{`
`428`	`430`
`429`	`431`	`if ($this->isDeveloperMode()) {`