ENGCOM-6242: Implement catching for all Errors - ref Magento issue #23350 #25250

magento-engcom-team · magento-engcom-team · commit a683fb4344d2 · 2019-12-10T10:05:17.000-06:00
- Merge Pull Request #25250 from miszyman/magento2:2.3-develop - Merged commits: 1. ee8373f 2. 5c054e1 3. 627ac5a
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -267,7 +267,7 @@ public function run(AppInterface $application)
                     throw $e;
                 }
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->terminate($e);
         }
     } // phpcs:enable
@@ -418,12 +418,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
`@@ -267,7 +267,7 @@ public function run(AppInterface $application)`
`267`	`267`	`throw $e;`
`268`	`268`	`}`
`269`	`269`	`}`
`270`		`- } catch (\Exception $e) {`
	`270`	`+ } catch (\Throwable $e) {`
`271`	`271`	`$this->terminate($e);`
`272`	`272`	`}`
`273`	`273`	`} // phpcs:enable`
`@@ -418,12 +418,12 @@ public function isDeveloperMode()`
`418`	`418`	`/**`
`419`	`419`	`* Display an exception and terminate program execution`
`420`	`420`	`*`
`421`		`- * @param \Exception $e`
	`421`	`+ * @param \Throwable $e`
`422`	`422`	`* @return void`
`423`	`423`	`*`
`424`	`424`	`* phpcs:disable Magento2.Security.LanguageConstruct, Squiz.Commenting.FunctionCommentThrowTag`
`425`	`425`	`*/`
`426`		`- protected function terminate(\Exception $e)`
	`426`	`+ protected function terminate(\Throwable $e)`
`427`	`427`	`{`
`428`	`428`
`429`	`429`	`if ($this->isDeveloperMode()) {`