Pass Mage_Core_Model_Store_Exception to error reporting (#627)

Author: fballiano

.phpstan.dist.baseline.neon

@@ -42,18 +42,6 @@ parameters:
 			count: 1
 			path: app/Mage.php
 
-		-
-			rawMessage: 'Method Mage::printException() has no return type specified.'
-			identifier: missingType.return
-			count: 1
-			path: app/Mage.php
-
-		-
-			rawMessage: 'Method Mage::printException() has parameter $extra with no type specified.'
-			identifier: missingType.parameter
-			count: 1
-			path: app/Mage.php
-
 		-
 			rawMessage: 'Method Mage::register() has no return type specified.'
 			identifier: missingType.return
@@ -10431,7 +10419,7 @@ parameters:
 		-
 			rawMessage: Variable $query might not be defined.
 			identifier: variable.undefined
-			count: 2
+			count: 1
 			path: app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php
 
 		-

app/Mage.php

@@ -623,11 +623,9 @@ public static function init($code = '', $type = 'store', $options = [], $modules
             header('Location: ' . self::getBaseUrl());
             die;
         } catch (Mage_Core_Model_Store_Exception $e) {
-            Maho::errorReport([], 404);
-            die;
+            self::printException($e, '', 404);
         } catch (Exception $e) {
             self::printException($e);
-            die;
         }
     }
 
@@ -663,13 +661,11 @@ public static function run($code = '', $type = 'store', $options = [])
             header('Location: ' . self::getBaseUrl());
             die();
         } catch (Mage_Core_Model_Store_Exception $e) {
-            Maho::errorReport([], 404);
-            die();
+            self::printException($e, '', 404);
         } catch (Exception $e) {
             if (self::isInstalled()) {
                 self::dispatchEvent('mage_run_installed_exception', ['exception' => $e]);
                 self::printException($e);
-                exit();
             }
             try {
                 self::dispatchEvent('mage_run_exception', ['exception' => $e]);
@@ -821,7 +817,7 @@ public static function getIsDeveloperMode()
     /**
      * Display exception
      */
-    public static function printException(Throwable $e, $extra = '')
+    public static function printException(Throwable $e, string $extra = '', int $httpResponseCode = 503): never
     {
         if (self::$_isDeveloperMode) {
             print '<pre>';
@@ -847,7 +843,7 @@ public static function printException(Throwable $e, $extra = '')
                 $reportData['script_name'] = $_SERVER['SCRIPT_NAME'];
             }
 
-            Maho::errorReport($reportData);
+            Maho::errorReport($reportData, $httpResponseCode);
         }
 
         die();

app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php

@@ -45,8 +45,6 @@ public function _loadEntities($printQuery = false, $logQuery = false)
             $rows = $this->_fetchAll($query);
         } catch (Exception $e) {
             Mage::printException($e, $query);
-            $this->printLogQuery(true, true, $query);
-            throw $e;
         }
 
         foreach ($rows as $v) {

app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php

@@ -1013,8 +1013,6 @@ public function _loadEntities($printQuery = false, $logQuery = false)
             $rows = $this->_fetchAll($query);
         } catch (Exception $e) {
             Mage::printException($e, $query);
-            $this->printLogQuery(true, true, $query);
-            throw $e;
         }
 
         foreach ($rows as $v) {
@@ -1088,8 +1086,6 @@ public function _loadAttributes($printQuery = false, $logQuery = false)
                     $values = $this->getConnection()->fetchAll($select);
                 } catch (Exception $e) {
                     Mage::printException($e, $select);
-                    $this->printLogQuery(true, true, $select);
-                    throw $e;
                 }
 
                 foreach ($values as $value) {

app/code/core/Mage/Install/Model/Observer.php

@@ -26,6 +26,6 @@ public function installFailure(Maho\Event\Observer $observer): void
     {
         echo '<h2>There was a problem proceeding with Maho installation.</h2>';
         echo '<p>Please contact developers with error messages on this page.</p>';
-        echo Mage::printException($observer->getEvent()->getException());
+        Mage::printException($observer->getEvent()->getException());
     }
 }