Merge remote-tracking branch 'origin/AC-3162-p10' into delivery-bunch-w22

andrewbess · andrewbess · commit 714c021c8c88 · 2022-05-31T08:12:30.000+02:00
diff --git a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesGenerator.php b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesGenerator.php
@@ -15,9 +15,9 @@
  */
 class ExtensionAttributesGenerator extends \Magento\Framework\Code\Generator\EntityAbstract
 {
-    const ENTITY_TYPE = 'extension';
+    public const ENTITY_TYPE = 'extension';
 
-    const EXTENSION_SUFFIX = 'Extension';
+    public const EXTENSION_SUFFIX = 'Extension';
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\Config
@@ -80,23 +80,23 @@ private function getTypeProcessor()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getDefaultConstructorDefinition()
     {
         return [];
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getClassProperties()
     {
         return [];
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getClassMethods()
     {
@@ -139,7 +139,7 @@ protected function _getClassMethods()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _validateData()
     {
@@ -148,7 +148,7 @@ protected function _validateData()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _generateCode()
     {
@@ -177,11 +177,11 @@ protected function getCustomAttributes()
         if (!isset($this->allCustomAttributes)) {
             $this->allCustomAttributes = $this->config->get();
         }
-        $dataInterface = ltrim($this->getSourceClassName(), '\\');
+        $dataInterface = $this->getSourceClassName() !== null ? ltrim($this->getSourceClassName(), '\\') : '';
         if (isset($this->allCustomAttributes[$dataInterface])) {
             foreach ($this->allCustomAttributes[$dataInterface] as $attributeName => $attributeMetadata) {
                 $attributeType = $attributeMetadata[Converter::DATA_TYPE];
-                if (strpos($attributeType, '\\') !== false) {
+                if ($attributeType !== null && strpos($attributeType, '\\') !== false) {
                     /** Add preceding slash to class names, while leaving primitive types as is */
                     $attributeType = $this->_getFullyQualifiedClassName($attributeType);
                     $this->allCustomAttributes[$dataInterface][$attributeName][Converter::DATA_TYPE] =
@@ -202,7 +202,7 @@ protected function getCustomAttributes()
     protected function validateResultClassName()
     {
         $result = true;
-        $sourceClassName = $this->getSourceClassName();
+        $sourceClassName = $this->getSourceClassName() ?? '';
         $resultClassName = $this->_getResultClassName();
         $interfaceSuffix = 'Interface';
         $expectedResultClassName = substr($sourceClassName, 0, -strlen($interfaceSuffix)) . self::EXTENSION_SUFFIX;
diff --git a/lib/internal/Magento/Framework/Api/ImageContentValidator.php b/lib/internal/Magento/Framework/Api/ImageContentValidator.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -87,7 +86,7 @@ protected function isMimeTypeValid($mimeType)
     protected function isNameValid($name)
     {
         // Cannot contain \ / ? * : " ; < > ( ) | { }
-        if (!preg_match('/^[^\\/?*:";<>()|{}\\\\]+$/', $name)) {
+        if ($name === null || !preg_match('/^[^\\/?*:";<>()|{}\\\\]+$/', $name)) {
             return false;
         }
         return true;
diff --git a/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php
@@ -148,7 +148,7 @@ protected function _unpackAssociativeArray($data)
      */
     public static function snakeCaseToUpperCamelCase($input)
     {
-        return str_replace('_', '', ucwords($input, '_'));
+        return $input !== null ? str_replace('_', '', ucwords($input, '_')) : '';
     }
 
     /**
@@ -172,6 +172,6 @@ public static function snakeCaseToCamelCase($input)
      */
     public static function camelCaseToSnakeCase($name)
     {
-        return strtolower(preg_replace('/(.)([A-Z])/', "$1_$2", $name));
+        return $name !== null ? strtolower(preg_replace('/(.)([A-Z])/', "$1_$2", $name)) : '';
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Config/ConfigPathResolver.php b/lib/internal/Magento/Framework/App/Config/ConfigPathResolver.php
@@ -27,6 +27,7 @@ public function __construct(ScopeCodeResolver $scopeCodeResolver)
 
     /**
      * Creates full config path for given params.
+     *
      * If $type variable was provided, it will be used as first part of path.
      *
      * @param string $path The path of configuration
@@ -43,8 +44,8 @@ public function __construct(ScopeCodeResolver $scopeCodeResolver)
      */
     public function resolve($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null, $type = null)
     {
-        $path = trim($path, '/');
-        $scope = rtrim($scope, 's');
+        $path = $path !== null ? trim($path, '/') : '';
+        $scope = $scope !== null ? rtrim($scope, 's') : '';
 
         /** Scope name is currently stored in plural form. */
         if (in_array($scope, [ScopeInterface::SCOPE_STORE, ScopeInterface::SCOPE_WEBSITE])) {
diff --git a/lib/internal/Magento/Framework/App/Config/Data.php b/lib/internal/Magento/Framework/App/Config/Data.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * Configuration data container
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\App\Config;
 
+/**
+ * Configuration data container
+ */
 class Data implements DataInterface
 {
     /**
@@ -35,6 +36,8 @@ public function __construct(MetadataProcessor $processor, array $data)
     }
 
     /**
+     * Get config source
+     *
      * @return array
      */
     public function getSource()
@@ -67,7 +70,7 @@ public function getValue($path = null)
      */
     public function setValue($path, $value)
     {
-        $keys = explode('/', $path);
+        $keys = explode('/', (string)$path);
         $lastKey = array_pop($keys);
         $currentElement = & $this->_data;
         foreach ($keys as $key) {
diff --git a/lib/internal/Magento/Framework/App/Config/Initial.php b/lib/internal/Magento/Framework/App/Config/Initial.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Initial configuration data container. Provides interface for reading initial config values
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,12 +8,15 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 
+/**
+ * Initial configuration data container. Provides interface for reading initial config values
+ */
 class Initial
 {
     /**
      * Cache identifier used to store initial config
      */
-    const CACHE_ID = 'initial_config';
+    public const CACHE_ID = 'initial_config';
 
     /**
      * Config data
@@ -69,7 +70,7 @@ public function __construct(
      */
     public function getData($scope)
     {
-        list($scopeType, $scopeCode) = array_pad(explode('|', $scope), 2, null);
+        [$scopeType, $scopeCode] = array_pad(explode('|', (string)$scope), 2, null);
 
         if (ScopeConfigInterface::SCOPE_TYPE_DEFAULT == $scopeType) {
             return $this->_data[$scopeType] ?? [];
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/CommentParser.php b/lib/internal/Magento/Framework/App/DeploymentConfig/CommentParser.php
@@ -99,7 +99,7 @@ function ($entry) {
     private function getCommentText($commentBlock)
     {
         $commentsLine = [];
-        foreach (preg_split("/(\r?\n)/", $commentBlock) as $commentLine) {
+        foreach (preg_split("/(\r?\n)/", (string)$commentBlock) as $commentLine) {
             if (preg_match('/^(?=\s+?\*[^\/])(.+)/', $commentLine, $matches)
                 && false === strpos($commentLine, 'For the section')
             ) {
diff --git a/lib/internal/Magento/Framework/App/DocRootLocator.php b/lib/internal/Magento/Framework/App/DocRootLocator.php
@@ -51,7 +51,7 @@ public function __construct(RequestInterface $request, ReadFactory $readFactory,
      */
     public function isPub()
     {
-        $rootBasePath = $this->request->getServer('DOCUMENT_ROOT');
+        $rootBasePath = $this->request->getServer('DOCUMENT_ROOT') ?? '';
         $readDirectory = $this->filesystem->getDirectoryRead(DirectoryList::ROOT);
 
         return (substr($rootBasePath, -\strlen('/pub')) === '/pub') && ! $readDirectory->isExist('setup');
diff --git a/lib/internal/Magento/Framework/App/ErrorHandler.php b/lib/internal/Magento/Framework/App/ErrorHandler.php
@@ -46,7 +46,7 @@ class ErrorHandler
      */
     public function handler($errorNo, $errorStr, $errorFile, $errorLine)
     {
-        if (strpos($errorStr, 'DateTimeZone::__construct') !== false) {
+        if ($errorStr !== null && strpos($errorStr, 'DateTimeZone::__construct') !== false) {
             // there's no way to distinguish between caught system exceptions and warnings
             return false;
         }
@@ -58,6 +58,7 @@ public function handler($errorNo, $errorStr, $errorFile, $errorLine)
 
         $msg = isset($this->errorPhrases[$errorNo]) ? $this->errorPhrases[$errorNo] : "Unknown error ({$errorNo})";
         $msg .= ": {$errorStr} in {$errorFile} on line {$errorLine}";
+        // phpcs:ignore Magento2.Exceptions.DirectThrow
         throw new \Exception($msg);
     }
 }
diff --git a/lib/internal/Magento/Framework/App/PageCache/Kernel.php b/lib/internal/Magento/Framework/App/PageCache/Kernel.php
@@ -138,7 +138,7 @@ public function process(\Magento\Framework\App\Response\Http $response)
                 && ($this->request->isGet() || $this->request->isHead())
             ) {
                 $tagsHeader = $response->getHeader('X-Magento-Tags');
-                $tags = $tagsHeader ? explode(',', $tagsHeader->getFieldValue()) : [];
+                $tags = $tagsHeader ? explode(',', $tagsHeader->getFieldValue() ?? '') : [];
 
                 $response->clearHeader('Set-Cookie');
                 if ($this->state->getMode() != AppState::MODE_DEVELOPER) {
diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -27,28 +27,24 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
     /**#@+
      * HTTP Ports
      */
-    const DEFAULT_HTTP_PORT = 80;
-    const DEFAULT_HTTPS_PORT = 443;
+    public const DEFAULT_HTTP_PORT = 80;
+    public const DEFAULT_HTTPS_PORT = 443;
     /**#@-*/
 
     // Configuration path
-    const XML_PATH_OFFLOADER_HEADER = 'web/secure/offloader_header';
+    public const XML_PATH_OFFLOADER_HEADER = 'web/secure/offloader_header';
 
     /**
      * @var string
      */
     protected $route;
 
     /**
-     * PATH_INFO
-     *
      * @var string
      */
     protected $pathInfo = '';
 
     /**
-     * ORIGINAL_PATH_INFO
-     *
      * @var string
      */
     protected $originalPathInfo = '';
@@ -330,7 +326,7 @@ public function getDistroBaseUrl()
         $headerHttpHost = $this->converter->cleanString($headerHttpHost);
         $headerScriptName = $this->getServer('SCRIPT_NAME');
 
-        if (isset($headerScriptName) && isset($headerHttpHost)) {
+        if (isset($headerScriptName) && $headerHttpHost !== '') {
             if ($secure = $this->isSecure()) {
                 $scheme = 'https://';
             } else {
@@ -381,7 +377,7 @@ public static function getUrlNoScript($url)
             return $url;
         }
 
-        if (($pos = strripos($url, basename($_SERVER['SCRIPT_NAME']))) !== false) {
+        if ($url !== null && ($pos = strripos($url, basename($_SERVER['SCRIPT_NAME']))) !== false) {
             $url = substr($url, 0, $pos);
         }
 
diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
@@ -83,7 +83,7 @@ public function create(
             ->setHeader('Pragma', 'public', true)
             ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true)
             ->setHeader('Content-type', $contentType, true)
-            ->setHeader('Content-Length', $contentLength === null ? strlen($fileContent) : $contentLength, true)
+            ->setHeader('Content-Length', $contentLength === null ? strlen((string)$fileContent) : $contentLength, true)
             ->setHeader('Content-Disposition', 'attachment; filename="' . $fileName . '"', true)
             ->setHeader('Last-Modified', date('r'), true);
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
@@ -80,7 +80,6 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->setMethods(['cleanString'])
             ->getMock();
-        $this->converterMock->expects($this->any())->method('cleanString')->willReturnArgument(0);
 
         // Stash the $_SERVER array to protect it from modification in test
         $this->serverArray = $_SERVER;
@@ -258,14 +257,16 @@ public function testIsAjax()
 
     /**
      * @param array $serverVariables
+     * @param string $cleanHeaderHttpHost
      * @param string $expectedResult
      * @dataProvider serverVariablesProvider
      */
-    public function testGetDistroBaseUrl($serverVariables, $expectedResult)
+    public function testGetDistroBaseUrl($serverVariables, $cleanHeaderHttpHost, $expectedResult)
     {
         $originalServerValue = $_SERVER;
         $_SERVER = $serverVariables;
         $this->model = $this->getModel();
+        $this->converterMock->expects($this->once())->method('cleanString')->willReturn($cleanHeaderHttpHost);
         $this->assertEquals($expectedResult, $this->model->getDistroBaseUrl());
 
         $_SERVER = $originalServerValue;
@@ -314,37 +315,53 @@ public function serverVariablesProvider()
         $secureUnusualPort = $noHttpsData = $httpsOffData = $noHostData = $noScriptNameData = $defaultServerData;
 
         unset($noScriptNameData['SCRIPT_NAME']);
-        $returnValue['no SCRIPT_NAME'] = [$noScriptNameData, 'http://localhost/'];
+        $returnValue['no SCRIPT_NAME'] = [$noScriptNameData, $noScriptNameData['HTTP_HOST'], 'http://localhost/'];
 
         unset($noHostData['HTTP_HOST']);
-        $returnValue['no HTTP_HOST'] = [$noHostData, 'http://localhost/'];
+        $returnValue['no HTTP_HOST'] = [$noHostData, '', 'http://localhost/'];
 
         $httpsOffData['HTTPS'] = 'off';
-        $returnValue['HTTPS off'] = [$httpsOffData, 'http://sample.host.com/'];
+        $returnValue['HTTPS off'] = [$httpsOffData, $httpsOffData['HTTP_HOST'], 'http://sample.host.com/'];
 
         unset($noHttpsData['HTTPS']);
-        $returnValue['no HTTPS'] = [$noHttpsData, 'http://sample.host.com/'];
+        $returnValue['no HTTPS'] = [$noHttpsData, $noHttpsData['HTTP_HOST'], 'http://sample.host.com/'];
 
         $noHttpsNoServerPort = $noHttpsData;
         unset($noHttpsNoServerPort['SERVER_PORT']);
-        $returnValue['no SERVER_PORT'] = [$noHttpsNoServerPort, 'http://sample.host.com/'];
+        $returnValue['no SERVER_PORT'] = [
+            $noHttpsNoServerPort,
+            $noHttpsNoServerPort['HTTP_HOST'],
+            'http://sample.host.com/'
+        ];
 
         $noHttpsButSecurePort = $noHttpsData;
         $noHttpsButSecurePort['SERVER_PORT'] = 443;
-        $returnValue['no HTTP but secure port'] = [$noHttpsButSecurePort, 'https://sample.host.com/'];
+        $returnValue['no HTTP but secure port'] = [
+            $noHttpsButSecurePort,
+            $noHttpsButSecurePort['HTTP_HOST'],
+            'https://sample.host.com/'
+        ];
 
         $notSecurePort = $noHttpsData;
         $notSecurePort['SERVER_PORT'] = 81;
         $notSecurePort['HTTP_HOST'] = 'sample.host.com:81';
-        $returnValue['not secure not standard port'] = [$notSecurePort, 'http://sample.host.com:81/'];
+        $returnValue['not secure not standard port'] = [
+            $notSecurePort,
+            $notSecurePort['HTTP_HOST'],
+            'http://sample.host.com:81/'
+        ];
 
         $secureUnusualPort['SERVER_PORT'] = 441;
         $secureUnusualPort['HTTP_HOST'] = 'sample.host.com:441';
-        $returnValue['not standard secure port'] = [$secureUnusualPort, 'https://sample.host.com:441/'];
+        $returnValue['not standard secure port'] = [
+            $secureUnusualPort,
+            $secureUnusualPort['HTTP_HOST'],
+            'https://sample.host.com:441/'
+        ];
 
         $customUrlPathData = $noHttpsData;
         $customUrlPathData['SCRIPT_FILENAME'] = '/some/dir/custom.php';
-        $returnValue['custom path'] = [$customUrlPathData, 'http://sample.host.com/'];
+        $returnValue['custom path'] = [$customUrlPathData, $customUrlPathData['HTTP_HOST'], 'http://sample.host.com/'];
 
         return $returnValue;
     }

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@`
`15`	`15`	`*/`
`16`	`16`	`class ExtensionAttributesGenerator extends \Magento\Framework\Code\Generator\EntityAbstract`
`17`	`17`	`{`
`18`		`- const ENTITY_TYPE = 'extension';`
	`18`	`+ public const ENTITY_TYPE = 'extension';`
`19`	`19`
`20`		`- const EXTENSION_SUFFIX = 'Extension';`
	`20`	`+ public const EXTENSION_SUFFIX = 'Extension';`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* @var \Magento\Framework\Api\ExtensionAttribute\Config`
`@@ -80,23 +80,23 @@ private function getTypeProcessor()`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/**`
`83`		`- * {@inheritdoc}`
	`83`	`+ * @inheritdoc`
`84`	`84`	`*/`
`85`	`85`	`protected function _getDefaultConstructorDefinition()`
`86`	`86`	`{`
`87`	`87`	`return [];`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/**`
`91`		`- * {@inheritdoc}`
	`91`	`+ * @inheritdoc`
`92`	`92`	`*/`
`93`	`93`	`protected function _getClassProperties()`
`94`	`94`	`{`
`95`	`95`	`return [];`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`
`99`		`- * {@inheritdoc}`
	`99`	`+ * @inheritdoc`
`100`	`100`	`*/`
`101`	`101`	`protected function _getClassMethods()`
`102`	`102`	`{`
`@@ -139,7 +139,7 @@ protected function _getClassMethods()`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`/**`
`142`		`- * {@inheritdoc}`
	`142`	`+ * @inheritdoc`
`143`	`143`	`*/`
`144`	`144`	`protected function _validateData()`
`145`	`145`	`{`
`@@ -148,7 +148,7 @@ protected function _validateData()`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`/**`
`151`		`- * {@inheritdoc}`
	`151`	`+ * @inheritdoc`
`152`	`152`	`*/`
`153`	`153`	`protected function _generateCode()`
`154`	`154`	`{`
`@@ -177,11 +177,11 @@ protected function getCustomAttributes()`
`177`	`177`	`if (!isset($this->allCustomAttributes)) {`
`178`	`178`	`$this->allCustomAttributes = $this->config->get();`
`179`	`179`	`}`
`180`		`- $dataInterface = ltrim($this->getSourceClassName(), '\\');`
	`180`	`+ $dataInterface = $this->getSourceClassName() !== null ? ltrim($this->getSourceClassName(), '\\') : '';`
`181`	`181`	`if (isset($this->allCustomAttributes[$dataInterface])) {`
`182`	`182`	`foreach ($this->allCustomAttributes[$dataInterface] as $attributeName => $attributeMetadata) {`
`183`	`183`	`$attributeType = $attributeMetadata[Converter::DATA_TYPE];`
`184`		`- if (strpos($attributeType, '\\') !== false) {`
	`184`	`+ if ($attributeType !== null && strpos($attributeType, '\\') !== false) {`
`185`	`185`	`/** Add preceding slash to class names, while leaving primitive types as is */`
`186`	`186`	`$attributeType = $this->_getFullyQualifiedClassName($attributeType);`
`187`	`187`	`$this->allCustomAttributes[$dataInterface][$attributeName][Converter::DATA_TYPE] =`
`@@ -202,7 +202,7 @@ protected function getCustomAttributes()`
`202`	`202`	`protected function validateResultClassName()`
`203`	`203`	`{`
`204`	`204`	`$result = true;`
`205`		`- $sourceClassName = $this->getSourceClassName();`
	`205`	`+ $sourceClassName = $this->getSourceClassName() ?? '';`
`206`	`206`	`$resultClassName = $this->_getResultClassName();`
`207`	`207`	`$interfaceSuffix = 'Interface';`
`208`	`208`	`$expectedResultClassName = substr($sourceClassName, 0, -strlen($interfaceSuffix)) . self::EXTENSION_SUFFIX;`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ function ($entry) {`
`99`	`99`	`private function getCommentText($commentBlock)`
`100`	`100`	`{`
`101`	`101`	`$commentsLine = [];`
`102`		`- foreach (preg_split("/(\r?\n)/", $commentBlock) as $commentLine) {`
	`102`	`+ foreach (preg_split("/(\r?\n)/", (string)$commentBlock) as $commentLine) {`
`103`	`103`	`if (preg_match('/^(?=\s+?\*[^\/])(.+)/', $commentLine, $matches)`
`104`	`104`	`&& false === strpos($commentLine, 'For the section')`
`105`	`105`	`) {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function __construct(RequestInterface $request, ReadFactory $readFactory,`
`51`	`51`	`*/`
`52`	`52`	`public function isPub()`
`53`	`53`	`{`
`54`		`- $rootBasePath = $this->request->getServer('DOCUMENT_ROOT');`
	`54`	`+ $rootBasePath = $this->request->getServer('DOCUMENT_ROOT') ?? '';`
`55`	`55`	`$readDirectory = $this->filesystem->getDirectoryRead(DirectoryList::ROOT);`
`56`	`56`
`57`	`57`	`return (substr($rootBasePath, -\strlen('/pub')) === '/pub') && ! $readDirectory->isExist('setup');`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class ErrorHandler`
`46`	`46`	`*/`
`47`	`47`	`public function handler($errorNo, $errorStr, $errorFile, $errorLine)`
`48`	`48`	`{`
`49`		`- if (strpos($errorStr, 'DateTimeZone::__construct') !== false) {`
	`49`	`+ if ($errorStr !== null && strpos($errorStr, 'DateTimeZone::__construct') !== false) {`
`50`	`50`	`// there's no way to distinguish between caught system exceptions and warnings`
`51`	`51`	`return false;`
`52`	`52`	`}`
`@@ -58,6 +58,7 @@ public function handler($errorNo, $errorStr, $errorFile, $errorLine)`
`58`	`58`
`59`	`59`	`$msg = isset($this->errorPhrases[$errorNo]) ? $this->errorPhrases[$errorNo] : "Unknown error ({$errorNo})";`
`60`	`60`	`$msg .= ": {$errorStr} in {$errorFile} on line {$errorLine}";`
	`61`	`+ // phpcs:ignore Magento2.Exceptions.DirectThrow`
`61`	`62`	`throw new \Exception($msg);`
`62`	`63`	`}`
`63`	`64`	`}`