Skip to content

Commit 87577d4

Browse files
sreichelsreichel
authored
Merge branch 'main' into rector/php81/FirstClassCallableRector
2 parents f246960 + fb5f95d commit 87577d4

File tree

1,642 files changed

+7495
-6749
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,642 files changed

+7495
-6749
lines changed

‎.github/workflows/cypress.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
autostart: false
2222

2323
# install DDEV configuration
24-
- run: ddev config --project-type=magento --php-version=8.1 --webserver-type=${{ matrix.webserver }} --web-environment="MAGE_IS_DEVELOPER_MODE=1"
24+
- run: ddev config --project-type=magento --php-version=8.1 --webserver-type=${{ matrix.webserver }} --web-environment="MAGE_IS_DEVELOPER_MODE=1,OPENMAGE_CONFIG_OVERRIDE_ALLOWED=1,OPENMAGE_CONFIG__DEFAULT__GENERAL__STORE_INFORMATION__NAME=ENV name default,OPENMAGE_CONFIG__WEBSITES__BASE__GENERAL__STORE_INFORMATION__PHONE=ENV phone website,OPENMAGE_CONFIG__STORES__GERMAN__GENERAL__STORE_INFORMATION__ADDRESS=ENV address store"
2525

2626
# install composer dependencies
2727
- run: ddev composer install

‎.php-cs-fixer.dist.php‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,50 @@
1212
'logical_operators' => true,
1313
// RISKY: Replaces intval, floatval, doubleval, strval and boolval function calls with according type casting operator.
1414
'modernize_types_casting' => true,
15+
// There should not be empty PHPDoc blocks.
16+
'no_empty_phpdoc' => true,
1517
// PHP84: Adds or removes ? before single type declarations or |null at the end of union types when parameters have a default null value.
1618
'nullable_type_declaration_for_default_null_value' => true,
19+
// Operators - when multiline - must always be at the beginning or at the end of the line.
20+
'operator_linebreak' => true,
21+
// Sort union types and intersection types using configured order.
22+
'ordered_types' => true,
1723
// Calls to PHPUnit\Framework\TestCase static methods must all be of the same type, either $this->, self:: or static::
1824
'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
25+
// PHPDoc annotation descriptions should not be a sentence.
26+
'phpdoc_annotation_without_dot' => true,
27+
// Docblocks should have the same indentation as the documented subject.
28+
'phpdoc_indent' => true,
29+
// Annotations in PHPDoc should be ordered in defined sequence.
30+
'phpdoc_order' => true,
31+
// Orders all @param annotations in DocBlocks according to method signature.
32+
'phpdoc_param_order' => true,
33+
// PHPDoc should start and end with content, excluding the very first and last line of the docblocks.
34+
'phpdoc_trim' => true,
35+
// Removes extra blank lines after summary and after description in PHPDoc.
36+
'phpdoc_trim_consecutive_blank_line_separation' => true,
37+
// Scalar types should always be written in the same form. int not integer, bool not boolean, float not real or double.
38+
'phpdoc_scalar' => true,
39+
// Single line @var PHPDoc should have proper spacing.
40+
'phpdoc_single_line_var_spacing' => true,
41+
// Fixes casing of PHPDoc tags.
42+
'phpdoc_tag_casing' => true,
43+
// Sorts PHPDoc types.
44+
'phpdoc_types_order' => true,
45+
// @var and @type annotations must have type and name in the correct order.
46+
'phpdoc_var_annotation_correct_order' => true,
47+
// @var and @type annotations of classy properties should not contain the name.
48+
'phpdoc_var_without_name' => true,
49+
// There MUST NOT be more than one property or constant declared per statement.
50+
'single_class_element_per_statement' => true,
1951
// Convert double quotes to single quotes for simple strings.
2052
'single_quote' => true,
2153
// Arguments lists, array destructuring lists, arrays that are multi-line, match-lines and parameters lists must have a trailing comma.
2254
// removed "match" and "parameters" for PHP7
2355
// see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8308
2456
'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arguments', 'array_destructuring', 'arrays']],
57+
// A single space or none should be around union type and intersection type operators.
58+
'types_spaces' => true,
2559
])
2660
->setFinder(
2761
PhpCsFixer\Finder::create()
@@ -30,7 +64,6 @@
3064
])
3165
->exclude([
3266
__DIR__ . '/shell/translations.php',
33-
__DIR__ . '/shell/update-copyright.php',
3467
])
3568
->name('*.php')
3669
->ignoreDotFiles(true)

‎.phpmd.dist.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
[-] LongClassName
7777
[x] ShortClassName
7878
[-] LongVariable
79-
[x] ShortVariable
79+
[-] ShortVariable
8080
[x] ShortMethodName - TMP disabled
8181
-->
8282
<rule ref="rulesets/naming.xml">

‎.phpstan.dist.baseline.neon‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,12 +1530,6 @@ parameters:
15301530
count: 1
15311531
path: app/code/core/Mage/Catalog/Model/Layer.php
15321532

1533-
-
1534-
rawMessage: 'Parameter #2 $filterBlock (Varien_Object) of method Mage_Catalog_Model_Layer_Filter_Attribute::apply() should be compatible with parameter $filterBlock (null) of method Mage_Catalog_Model_Layer_Filter_Abstract::apply()'
1535-
identifier: method.childParameterType
1536-
count: 1
1537-
path: app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php
1538-
15391533
-
15401534
rawMessage: 'Parameter #1 $range of method Mage_Catalog_Model_Layer_Filter_Decimal::_renderItemLabel() expects int, string given.'
15411535
identifier: argument.type
@@ -1548,18 +1542,6 @@ parameters:
15481542
count: 1
15491543
path: app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php
15501544

1551-
-
1552-
rawMessage: 'Parameter #2 $filterBlock (Mage_Catalog_Block_Layer_Filter_Decimal) of method Mage_Catalog_Model_Layer_Filter_Decimal::apply() should be compatible with parameter $filterBlock (null) of method Mage_Catalog_Model_Layer_Filter_Abstract::apply()'
1553-
identifier: method.childParameterType
1554-
count: 1
1555-
path: app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php
1556-
1557-
-
1558-
rawMessage: 'Parameter #2 $filterBlock of method Mage_Catalog_Model_Layer_Filter_Abstract::apply() expects null, Mage_Catalog_Block_Layer_Filter_Decimal given.'
1559-
identifier: argument.type
1560-
count: 1
1561-
path: app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php
1562-
15631545
-
15641546
rawMessage: 'Parameter #2 $range of method Mage_Catalog_Model_Resource_Layer_Filter_Decimal::applyFilterToCollection() expects float, string given.'
15651547
identifier: argument.type
@@ -2160,12 +2142,6 @@ parameters:
21602142
count: 1
21612143
path: app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
21622144

2163-
-
2164-
rawMessage: 'Return type (int) of method Mage_CatalogRule_Model_Action_Index_Refresh_Row::_getProduct() should be compatible with return type (null) of method Mage_CatalogRule_Model_Action_Index_Refresh::_getProduct()'
2165-
identifier: method.childReturnType
2166-
count: 1
2167-
path: app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php
2168-
21692145
-
21702146
rawMessage: 'Parameter #1 $combine of method Mage_CatalogRule_Model_Observer::_removeAttributeFromConditions() expects Mage_CatalogRule_Model_Rule_Condition_Combine, Mage_Rule_Model_Condition_Combine given.'
21712147
identifier: argument.type
@@ -2622,18 +2598,6 @@ parameters:
26222598
count: 1
26232599
path: app/code/core/Mage/Core/Model/Encryption.php
26242600

2625-
-
2626-
rawMessage: Negated boolean expression is always false.
2627-
identifier: booleanNot.alwaysFalse
2628-
count: 2
2629-
path: app/code/core/Mage/Core/Model/File/Storage.php
2630-
2631-
-
2632-
rawMessage: Result of || is always false.
2633-
identifier: booleanOr.alwaysFalse
2634-
count: 1
2635-
path: app/code/core/Mage/Core/Model/File/Storage.php
2636-
26372601
-
26382602
rawMessage: 'Parameter #1 $params of method Mage_Core_Model_File_Storage_Database_Abstract::__construct() expects array, string|null given.'
26392603
identifier: argument.type
@@ -4272,12 +4236,6 @@ parameters:
42724236
count: 1
42734237
path: app/code/core/Mage/Sales/Block/Order/Details.php
42744238

4275-
-
4276-
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.'
4277-
identifier: assign.propertyType
4278-
count: 1
4279-
path: app/code/core/Mage/Sales/Block/Recurring/Profiles.php
4280-
42814239
-
42824240
rawMessage: 'Parameter #2 $code of method Mage_Api2_Model_Resource::_critical() expects int|null, string given.'
42834241
identifier: argument.type
@@ -4320,12 +4278,6 @@ parameters:
43204278
count: 1
43214279
path: app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php
43224280

4323-
-
4324-
rawMessage: 'Cannot call method addAttributeToFilter() on Mage_Core_Model_Resource_Db_Collection_Abstract|false.'
4325-
identifier: method.nonObject
4326-
count: 1
4327-
path: app/code/core/Mage/Sales/Model/Order/Invoice.php
4328-
43294281
-
43304282
rawMessage: 'Parameter #1 $incrementId of method Mage_Sales_Model_Order_Invoice::loadByIncrementId() expects string, int given.'
43314283
identifier: argument.type

‎.phpstan.dist.neon‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ parameters:
2727
- tests/unit
2828
excludePaths:
2929
#incompatible interfaces
30-
- app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php
31-
- app/code/core/Mage/Admin/Model/Acl/Assert/Time.php
32-
- app/code/core/Mage/Api/Model/Acl/Assert/Ip.php
33-
- app/code/core/Mage/Api/Model/Acl/Assert/Time.php
3430
- app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
3531
- lib/Varien/Directory/Collection.php
3632
- lib/Varien/Directory/Factory.php

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
'core' => \Mage_Core_Helper_Data::class,
9191
'core/data' => \Mage_Core_Helper_Data::class,
9292
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
93+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
9394
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
9495
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
9596
'core/hint' => \Mage_Core_Helper_Hint::class,

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
'core' => \Mage_Core_Helper_Data::class,
9191
'core/data' => \Mage_Core_Helper_Data::class,
9292
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
93+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
9394
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
9495
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
9596
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -288,6 +289,7 @@
288289
'core' => \Mage_Core_Helper_Data::class,
289290
'core/data' => \Mage_Core_Helper_Data::class,
290291
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
292+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
291293
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
292294
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
293295
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -486,6 +488,7 @@
486488
'core' => \Mage_Core_Helper_Data::class,
487489
'core/data' => \Mage_Core_Helper_Data::class,
488490
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
491+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
489492
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
490493
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
491494
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -684,6 +687,7 @@
684687
'core' => \Mage_Core_Helper_Data::class,
685688
'core/data' => \Mage_Core_Helper_Data::class,
686689
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
690+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
687691
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
688692
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
689693
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -882,6 +886,7 @@
882886
'core' => \Mage_Core_Helper_Data::class,
883887
'core/data' => \Mage_Core_Helper_Data::class,
884888
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
889+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
885890
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
886891
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
887892
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1080,6 +1085,7 @@
10801085
'core' => \Mage_Core_Helper_Data::class,
10811086
'core/data' => \Mage_Core_Helper_Data::class,
10821087
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
1088+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
10831089
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
10841090
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
10851091
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1278,6 +1284,7 @@
12781284
'core' => \Mage_Core_Helper_Data::class,
12791285
'core/data' => \Mage_Core_Helper_Data::class,
12801286
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
1287+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
12811288
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
12821289
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
12831290
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1476,6 +1483,7 @@
14761483
'core' => \Mage_Core_Helper_Data::class,
14771484
'core/data' => \Mage_Core_Helper_Data::class,
14781485
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
1486+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
14791487
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
14801488
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
14811489
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1674,6 +1682,7 @@
16741682
'core' => \Mage_Core_Helper_Data::class,
16751683
'core/data' => \Mage_Core_Helper_Data::class,
16761684
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
1685+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
16771686
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
16781687
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
16791688
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1872,6 +1881,7 @@
18721881
'core' => \Mage_Core_Helper_Data::class,
18731882
'core/data' => \Mage_Core_Helper_Data::class,
18741883
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
1884+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
18751885
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
18761886
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
18771887
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2070,6 +2080,7 @@
20702080
'core' => \Mage_Core_Helper_Data::class,
20712081
'core/data' => \Mage_Core_Helper_Data::class,
20722082
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
2083+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
20732084
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
20742085
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
20752086
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2268,6 +2279,7 @@
22682279
'core' => \Mage_Core_Helper_Data::class,
22692280
'core/data' => \Mage_Core_Helper_Data::class,
22702281
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
2282+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
22712283
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
22722284
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
22732285
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2466,6 +2478,7 @@
24662478
'core' => \Mage_Core_Helper_Data::class,
24672479
'core/data' => \Mage_Core_Helper_Data::class,
24682480
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
2481+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
24692482
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
24702483
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
24712484
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2664,6 +2677,7 @@
26642677
'core' => \Mage_Core_Helper_Data::class,
26652678
'core/data' => \Mage_Core_Helper_Data::class,
26662679
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
2680+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
26672681
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
26682682
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
26692683
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2862,6 +2876,7 @@
28622876
'core' => \Mage_Core_Helper_Data::class,
28632877
'core/data' => \Mage_Core_Helper_Data::class,
28642878
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
2879+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
28652880
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
28662881
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
28672882
'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -3060,6 +3075,7 @@
30603075
'core' => \Mage_Core_Helper_Data::class,
30613076
'core/data' => \Mage_Core_Helper_Data::class,
30623077
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
3078+
'core/environmentConfigLoader_override' => \Mage_Core_Helper_EnvironmentConfigLoader_Override::class,
30633079
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
30643080
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
30653081
'core/hint' => \Mage_Core_Helper_Hint::class,

0 commit comments

Comments
 (0)