Merge branch 'main' into cypress/update-store-switcher

Author: sreichel

.php-cs-fixer.dist.php

@@ -12,10 +12,38 @@
         'logical_operators' => true,
         // RISKY: Replaces intval, floatval, doubleval, strval and boolval function calls with according type casting operator.
         'modernize_types_casting' => true,
+        // There should not be empty PHPDoc blocks.
+        'no_empty_phpdoc' => true,
         // PHP84: Adds or removes ? before single type declarations or |null at the end of union types when parameters have a default null value.
         '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,
         // 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.
+        'phpdoc_annotation_without_dot' => true,
+        // Docblocks should have the same indentation as the documented subject.
+        'phpdoc_indent' => true,
+        // Annotations in PHPDoc should be ordered in defined sequence.
+        'phpdoc_order' => true,
+        // Orders all @param annotations in DocBlocks according to method signature.
+        'phpdoc_param_order' => true,
+        // PHPDoc should start and end with content, excluding the very first and last line of the docblocks.
+        'phpdoc_trim' => true,
+        // Removes extra blank lines after summary and after description in PHPDoc.
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
+        // Scalar types should always be written in the same form. int not integer, bool not boolean, float not real or double.
+        'phpdoc_scalar' => true,
+        // Single line @var PHPDoc should have proper spacing.
+        'phpdoc_single_line_var_spacing' => true,
+        // Fixes casing of PHPDoc tags.
+        'phpdoc_tag_casing' => true,
+        // Sorts PHPDoc types.
+        'phpdoc_types_order' => true,
+        // @var and @type annotations must have type and name in the correct order.
+        'phpdoc_var_annotation_correct_order' => true,
+        // @var and @type annotations of classy properties should not contain the name.
+        'phpdoc_var_without_name' => 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.
@@ -30,7 +58,6 @@
             ])
             ->exclude([
                 __DIR__ . '/shell/translations.php',
-                __DIR__ . '/shell/update-copyright.php',
             ])
             ->name('*.php')
             ->ignoreDotFiles(true)

.phpstan.dist.baseline.neon

@@ -4236,12 +4236,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Sales/Block/Order/Details.php
 
-		-
-			rawMessage: 'Property Mage_Sales_Block_Recurring_Profiles::$_profiles (Mage_Sales_Model_Resource_Recurring_Profile_Collection) does not accept Mage_Core_Model_Resource_Db_Collection_Abstract.'
-			identifier: assign.propertyType
-			count: 1
-			path: app/code/core/Mage/Sales/Block/Recurring/Profiles.php
-
 		-
 			rawMessage: 'Parameter #2 $code of method Mage_Api2_Model_Resource::_critical() expects int|null, string given.'
 			identifier: argument.type
@@ -4284,12 +4278,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php
 
-		-
-			rawMessage: 'Cannot call method addAttributeToFilter() on Mage_Core_Model_Resource_Db_Collection_Abstract|false.'
-			identifier: method.nonObject
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Order/Invoice.php
-
 		-
 			rawMessage: 'Parameter #1 $incrementId of method Mage_Sales_Model_Order_Invoice::loadByIncrementId() expects string, int given.'
 			identifier: argument.type

.phpstorm.meta.php/magento_helpers.meta.php

@@ -90,6 +90,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,

.phpstorm.meta.php/magento_helpers_methods.meta.php

@@ -90,6 +90,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -288,6 +289,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -486,6 +488,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -684,6 +687,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -882,6 +886,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1080,6 +1085,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1278,6 +1284,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1476,6 +1483,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1674,6 +1682,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1872,6 +1881,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2070,6 +2080,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2268,6 +2279,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2466,6 +2478,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2664,6 +2677,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2862,6 +2876,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -3060,6 +3075,7 @@
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
             'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
+            'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,

.rector.php

@@ -122,7 +122,6 @@
             # skip: use static methods
             PreferPHPUnitThisCallRector::class,
             __DIR__ . '/shell/translations.php',
-            __DIR__ . '/shell/update-copyright.php',
             __DIR__ . '/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php',
         ])
         ->withPreparedSets(