Merge branch 'main' into validation

Author: sreichel

.php-cs-fixer.dist.php

@@ -18,6 +18,8 @@
         'nullable_type_declaration_for_default_null_value' => true,
         // Operators - when multiline - must always be at the beginning or at the end of the line.
         'operator_linebreak' => true,
+        // Sort union types and intersection types using configured order.
+        'ordered_types' => true,
         // Calls to PHPUnit\Framework\TestCase static methods must all be of the same type, either $this->, self:: or static::
         'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
         // PHPDoc annotation descriptions should not be a sentence.
@@ -44,12 +46,16 @@
         'phpdoc_var_annotation_correct_order' => true,
         // @var and @type annotations of classy properties should not contain the name.
         'phpdoc_var_without_name' => true,
+        // There MUST NOT be more than one property or constant declared per statement.
+        'single_class_element_per_statement' => true,
         // Convert double quotes to single quotes for simple strings.
         'single_quote' => true,
         // Arguments lists, array destructuring lists, arrays that are multi-line, match-lines and parameters lists must have a trailing comma.
         // removed "match" and "parameters" for PHP7
         // see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8308
         'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arguments', 'array_destructuring', 'arrays']],
+        // A single space or none should be around union type and intersection type operators.
+        'types_spaces' => true,
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()

app/code/core/Mage/Admin/Model/Resource/User.php

@@ -194,6 +194,7 @@ public function delete(Mage_Core_Model_Abstract $object)
      *
      * @param Mage_Admin_Model_User $user
      * @throws Mage_Core_Exception
+     * @throws Zend_Db_Adapter_Exception
      * @return $this|Mage_Admin_Model_User|Mage_Core_Model_Abstract
      */
     public function _saveRelations(Mage_Core_Model_Abstract $user)
@@ -239,7 +240,10 @@ public function _saveRelations(Mage_Core_Model_Abstract $user)
             }
 
             $adapter->commit();
-        } catch (Mage_Core_Exception|Exception $exception) {
+        } catch (Mage_Core_Exception $mageCoreException) {
+            $adapter->rollBack();
+            throw $mageCoreException;
+        } catch (Exception $exception) {
             $adapter->rollBack();
             throw $exception;
         }

app/code/core/Mage/Adminhtml/Helper/Data.php

@@ -65,7 +65,7 @@ public function setPageHelpUrl($url = null, $suffix = null)
     /**
      * Add suffix for help page url
      *
-     * @param string $suffix
+     * @param null|string $suffix
      * @return $this
      * @deprecated
      */

app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php

@@ -105,7 +105,7 @@ protected function _initValidator()
     /**
      * Initialize messages templates with translating
      *
-     * @return Mage_Adminhtml_Model_LayoutUpdate_Validator
+     * @return $this
      */
     protected function _initMessageTemplates()
     {

app/code/core/Mage/Api/Model/Server/Adapter/Soap.php

@@ -153,8 +153,10 @@ public function run()
                             $this->_soap->handle(),
                         ),
                     );
-            } catch (Zend_Soap_Server_Exception|Exception $e) {
-                $this->fault($e->getCode(), $e->getMessage());
+            } catch (Zend_Soap_Server_Exception $zendSoapServerException) {
+                $this->fault($zendSoapServerException->getCode(), $zendSoapServerException->getMessage());
+            } catch (Exception $exception) {
+                $this->fault($exception->getCode(), $exception->getMessage());
             }
         }
 

app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php

@@ -66,8 +66,10 @@ public function run()
                     ->setHeader('Content-Type', 'text/xml; charset=' . $apiConfigCharset)
                     ->setHeader('Content-Length', strlen($content), true)
                     ->setBody($content);
-            } catch (Zend_Soap_Server_Exception|Exception $e) {
-                $this->fault($e->getCode(), $e->getMessage());
+            } catch (Zend_Soap_Server_Exception $zendSoapServerException) {
+                $this->fault($zendSoapServerException->getCode(), $zendSoapServerException->getMessage());
+            } catch (Exception $exception) {
+                $this->fault($exception->getCode(), $exception->getMessage());
             }
         }
 

app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php

@@ -87,8 +87,10 @@ public function run()
                     ->setHeader('Content-Type', 'text/xml; charset=' . $apiConfigCharset)
                     ->setHeader('Content-Length', strlen($content), true)
                     ->setBody($content);
-            } catch (Zend_Soap_Server_Exception|Exception $e) {
-                $this->fault($e->getCode(), $e->getMessage());
+            } catch (Zend_Soap_Server_Exception $zendSoapServerException) {
+                $this->fault($zendSoapServerException->getCode(), $zendSoapServerException->getMessage());
+            } catch (Exception $exception) {
+                $this->fault($exception->getCode(), $exception->getMessage());
             }
         }
 

app/code/core/Mage/Catalog/Model/Category/Api.php

@@ -274,8 +274,10 @@ public function create($parentId, $categoryData, $store = null)
             }
 
             $category->save();
-        } catch (Mage_Core_Exception|Exception $e) {
-            $this->_fault('data_invalid', $e->getMessage());
+        } catch (Mage_Core_Exception $mageCoreException) {
+            $this->_fault('data_invalid', $mageCoreException->getMessage());
+        } catch (Exception $exception) {
+            $this->_fault('data_invalid', $exception->getMessage());
         }
 
         return $category->getId();

app/code/core/Mage/Wishlist/Model/Item.php

@@ -382,6 +382,7 @@ public function addToCart(Mage_Checkout_Model_Cart $cart, $delete = false)
      *
      * If product has required options add special key to URL
      *
+     * @throws Mage_Core_Exception
      * @return string
      */
     public function getProductUrl()
@@ -509,6 +510,7 @@ public function isRepresent($product, $buyRequest)
      * Check product representation in item
      *
      * @param   Mage_Catalog_Model_Product $product
+     * @throws  Mage_Core_Exception
      * @return  bool
      */
     public function representProduct($product)
@@ -661,6 +663,7 @@ public function getOptionByCode($code)
     /**
      * Returns whether Qty field is valid for this item
      *
+     * @throws Mage_Core_Exception
      * @return bool
      */
     public function canHaveQty()
@@ -679,11 +682,14 @@ public function getCustomDownloadUrl()
 
     /**
      * Sets custom option download url
+     *
      * @param string $url
+     * @return $this
      */
     public function setCustomDownloadUrl($url)
     {
         $this->_customOptionDownloadUrl = $url;
+        return $this;
     }
 
     /**

tests/unit/Base/DefaultConfigTest.php

@@ -22,7 +22,7 @@ final class DefaultConfigTest extends TestCase
     /**
      * @dataProvider provideGetStoreConfig
      */
-    public function testGetStoreConfig(string $expectedResult, string $path, bool|int|Mage_Core_Model_Store|null|string $store = null): void
+    public function testGetStoreConfig(string $expectedResult, string $path, null|bool|int|Mage_Core_Model_Store|string $store = null): void
     {
         self::assertSame($expectedResult, Mage::getStoreConfig($path, $store));
     }