ENGCOM-4696: fatalErrorHandler returns 500 only on fatal errors #22200

Author: sidolov

pub/health_check.php

@@ -4,11 +4,17 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * phpcs:disable PSR1.Files.SideEffects
+ * phpcs:disable Squiz.Functions.GlobalFunction
+ */
 use Magento\Framework\Config\ConfigOptionsListConstants;
 
+// phpcs:ignore Magento2.Functions.DiscouragedFunction
 register_shutdown_function("fatalErrorHandler");
 
 try {
+    // phpcs:ignore Magento2.Security.IncludeFile
     require __DIR__ . '/../app/bootstrap.php';
     /** @var \Magento\Framework\App\ObjectManagerFactory $objectManagerFactory */
     $objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, []);
@@ -20,6 +26,7 @@
     $logger = $objectManager->get(\Psr\Log\LoggerInterface::class);
 } catch (\Exception $e) {
     http_response_code(500);
+    // phpcs:ignore Magento2.Security.LanguageConstruct
     exit(1);
 }
 
@@ -35,6 +42,7 @@
     } catch (\Exception $e) {
         http_response_code(500);
         $logger->error("MySQL connection failed: " . $e->getMessage());
+        // phpcs:ignore Magento2.Security.LanguageConstruct
         exit(1);
     }
 }
@@ -47,6 +55,7 @@
             !isset($cacheConfig[ConfigOptionsListConstants::CONFIG_PATH_BACKEND_OPTIONS])) {
             http_response_code(500);
             $logger->error("Cache configuration is invalid");
+            // phpcs:ignore Magento2.Security.LanguageConstruct
             exit(1);
         }
         $cacheBackendClass = $cacheConfig[ConfigOptionsListConstants::CONFIG_PATH_BACKEND];
@@ -57,6 +66,7 @@
         } catch (\Exception $e) {
             http_response_code(500);
             $logger->error("Cache storage is not accessible");
+            // phpcs:ignore Magento2.Security.LanguageConstruct
             exit(1);
         }
     }
@@ -70,7 +80,7 @@
 function fatalErrorHandler()
 {
     $error = error_get_last();
-    if ($error !== null) {
+    if ($error !== null && $error['type'] === E_ERROR) {
         http_response_code(500);
     }
 }