Skip to content

Commit d832611

Browse files
sreichelsreichel
authored
Merge branch 'main' into patch-17
2 parents 8966330 + 1be5f17 commit d832611

File tree

2,316 files changed

+13523
-126330
lines changed

Some content is hidden

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

2,316 files changed

+13523
-126330
lines changed

‎.all-contributorsrc

+27
Original file line numberDiff line numberDiff line change
@@ -1419,6 +1419,15 @@
14191419
"code"
14201420
]
14211421
},
1422+
{
1423+
"login": "Sdfendor",
1424+
"name": "Kevin Jakob",
1425+
"avatar_url": "https://avatars.githubusercontent.com/u/2728018?v=4",
1426+
"profile": "https://github.com/Sdfendor",
1427+
"contributions": [
1428+
"code"
1429+
]
1430+
},
14221431
{
14231432
"login": "leissbua",
14241433
"name": "Michael Leiss",
@@ -1445,6 +1454,24 @@
14451454
"contributions": [
14461455
"code"
14471456
]
1457+
},
1458+
{
1459+
"login": "ma4nn",
1460+
"name": "Christoph Massmann",
1461+
"avatar_url": "https://avatars.githubusercontent.com/u/26252058?v=4",
1462+
"profile": "https://www.vianetz.com/",
1463+
"contributions": [
1464+
"code"
1465+
]
1466+
},
1467+
{
1468+
"login": "ragnese",
1469+
"name": "Rob Agnese",
1470+
"avatar_url": "https://avatars.githubusercontent.com/u/7927565?v=4",
1471+
"profile": "https://github.com/ragnese",
1472+
"contributions": [
1473+
"code"
1474+
]
14481475
}
14491476
],
14501477
"contributorsPerLine": 7

‎.ddev/commands/web/magerun

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
3+
## Description: Execute n98-magerun
4+
## Usage: magerun
5+
## Example: "ddev magerun"
6+
7+
if [ ! -f vendor/bin/n98-magerun ]; then
8+
read -r -p "n98-magerun is not installed. Do you want to install it? [y/N] " INSTALL_MAGERUN
9+
INSTALL_MAGERUN=${INSTALL_MAGERUN,,} # to lower
10+
if [[ "${INSTALL_MAGERUN}" =~ ^(yes|y) ]]; then
11+
composer require --dev n98/magerun:dev-develop
12+
else
13+
exit 1
14+
fi
15+
fi
16+
17+
php -d error_reporting="E_ALL ^E_DEPRECATED" vendor/bin/n98-magerun "$@"

‎.ddev/commands/web/openmage-admin

100644100755
File mode changed.

‎.ddev/web-build/openmage.cron

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* * * * * /var/www/html/cron.sh

‎.github/labeler.yml

+1
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,7 @@
887887
'phpstan':
888888
- changed-files:
889889
- any-glob-to-any-file: [
890+
.phpstan*,
890891
phpstan*,
891892
.github/workflows/phpstan.yml
892893
]

‎.github/workflows/check-files.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575

7676
- name: Get changed files
7777
id: changed-files-specific
78-
uses: tj-actions/changed-files@v42
78+
uses: tj-actions/changed-files@v45
7979
with:
8080
files: |
8181
composer.*

‎.github/workflows/codeql-analysis.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,8 @@ name: "CodeQL"
1313

1414
on:
1515
workflow_call:
16+
# Allow manually triggering the workflow.
1617
workflow_dispatch:
17-
push:
18-
branches: [ "main", "next", "v19" ]
19-
pull_request:
20-
# The branches below must be a subset of the branches above
21-
branches: [ "main", "v20", "v19" ]
22-
paths-ignore:
23-
- '**/*.md'
24-
- '**/*.txt'
2518

2619
jobs:
2720
analyze:

‎.github/workflows/labeler.yml

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
name: Labeler
99
on:
1010
pull_request_target:
11+
# Allow manually triggering the workflow.
12+
workflow_dispatch:
1113

1214
jobs:
1315
triage:

‎.github/workflows/phpcs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ jobs:
4545

4646
- name: PHPCodeSniffer
4747
run: php vendor/bin/phpcs -s --report=full --standard=${{ matrix.rules.path }}
48-
continue-on-error: ${{ matrix.rules.path != '.phpcs.xml.dist' }}
48+
continue-on-error: ${{ matrix.rules.path == '.phpcs.ecg.xml.dist' }}

‎.github/workflows/phpstan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
operating-system: [ubuntu-latest]
15-
php-versions: ['7.4', '8.3']
15+
php-versions: ['7.4', '8.4']
1616

1717
steps:
1818
- name: Setup PHP

‎.github/workflows/syntax-php.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
php: ['7.4', '8.3']
17+
php: ['7.4', '8.4']
1818

1919
name: PHP Syntax ${{ matrix.php }}
2020

‎.github/workflows/update-copyright.yml

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Update Copyright
2+
3+
on:
4+
# Run automatically every month.
5+
schedule:
6+
- cron: '0 0 1 * *'
7+
workflow_call:
8+
# Allow manually triggering the workflow.
9+
workflow_dispatch:
10+
11+
jobs:
12+
update_copyright:
13+
name: Update Copyright
14+
runs-on: [ubuntu-latest]
15+
16+
steps:
17+
- name: Setup PHP
18+
uses: shivammathur/setup-php@v2
19+
with:
20+
php-version: 7.4
21+
22+
- name: Checkout code
23+
uses: actions/checkout@v4
24+
with:
25+
ref: main
26+
fetch-depth: 0
27+
28+
- name: Get composer cache directory
29+
id: composer-cache
30+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
31+
32+
- name: Cache dependencies
33+
uses: actions/cache@v4
34+
with:
35+
path: ${{ steps.composer-cache.outputs.dir }}
36+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
37+
restore-keys: ${{ runner.os }}-composer-
38+
39+
- name: Install dependencies
40+
run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
41+
42+
- name: Update Copyright
43+
run: php -f shell/update-copyright.php
44+
45+
- name: Create Pull Request
46+
uses: peter-evans/create-pull-request@v6
47+
with:
48+
commit-message: update copyright
49+
title: Updated Copyright
50+
body: |
51+
- Updated copyright
52+
53+
Auto-generated by [openmage/dev-copyright][1]
54+
55+
[1]: https://github.com/OpenMage/dev-copyright
56+
branch: update-copyright
57+
base: main

‎.gitignore

+5-3
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
# https://github.com/OpenMage/magento-lts/pull/1012
4040
/dev/openmage/docker-magento
4141
/dev/openmage/.env
42-
/dev/tests/functional/generated
43-
/dev/tests/functional/vendor
42+
/dev/openmage/Caddyfile
4443

4544
/media/*
4645
!/media/.htaccess
@@ -71,8 +70,11 @@
7170
.phpcs*.xml
7271
!.phpcs*.xml.dist
7372

73+
# PhpStan
74+
.phpstan*.neon
7475
phpstan*.neon
75-
!phpstan.dist.*.neon
76+
!.phpstan.dist.neon
77+
!.phpstan.dist.*.neon
7678

7779
# dev scripts loaded via composer
7880
/shell/update-copyright.php

‎.php-cs-fixer.dist.php

+14
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
*/
77
$config = new PhpCsFixer\Config();
88
return $config
9+
->setRiskyAllowed(true)
910
->setRules([
11+
// PHP arrays should be declared using the configured syntax.
12+
'array_syntax' => ['syntax' => 'short'],
1013
// There MUST be one blank line after the namespace declaration.
1114
'blank_line_after_namespace' => true,
1215
// Ensure there is no code on the same line as the PHP open tag and it is followed by a blank line.
@@ -17,6 +20,8 @@
1720
'class_definition' => true,
1821
// Remove extra spaces in a nullable typehint.
1922
'compact_nullable_typehint' => true,
23+
// Concatenation should be spaced according to configuration.
24+
'concat_space' => ['spacing' => 'one'],
2025
// The PHP constants `true`, `false`, and `null` MUST be written using the correct casing.
2126
'constant_case' => true,
2227
// Equal sign in declare statement should be surrounded by spaces or not following configuration.
@@ -33,6 +38,8 @@
3338
'indentation_type' => true,
3439
// All PHP files must use same line ending.
3540
'line_ending' => true,
41+
// Use && and || logical operators instead of and and or.
42+
'logical_operators' => true,
3643
// Cast should be written in lower case.
3744
'lowercase_cast' => true,
3845
// PHP keywords MUST be in lower case.
@@ -41,6 +48,8 @@
4148
'lowercase_static_reference' => true,
4249
// In method arguments and method call, there MUST NOT be a space before each comma and there MUST be one space after each comma. Argument lists MAY be split across multiple lines, where each subsequent line is indented once. When doing so, the first item in the list MUST be on the next line, and there MUST be only one argument per line.
4350
'method_argument_space' => true,
51+
// Replaces intval, floatval, doubleval, strval and boolval function calls with according type casting operator.
52+
'modernize_types_casting' => true,
4453
// All instances created with new keyword must be followed by braces.
4554
'new_with_braces' => true,
4655
// There should be no empty lines after class opening brace.
@@ -63,6 +72,8 @@
6372
'no_trailing_whitespace_in_comment' => true,
6473
// Remove trailing whitespace at the end of blank lines.
6574
'no_whitespace_in_blank_line' => true,
75+
// Adds or removes ? before single type declarations or |null at the end of union types when parameters have a default null value.
76+
'nullable_type_declaration_for_default_null_value' => true,
6677
// Orders the elements of classes/interfaces/traits.
6778
'ordered_class_elements' => false,
6879
// Ordering `use` statements.
@@ -81,6 +92,8 @@
8192
'single_import_per_statement' => true,
8293
// Each namespace use MUST go on its own line and there MUST be one blank line after the use statements block.
8394
'single_line_after_imports' => true,
95+
// Convert double quotes to single quotes for simple strings.
96+
'single_quote' => true,
8497
// Each trait `use` must be done as single statement.
8598
'single_trait_insert_per_statement' => true,
8699
// A case should be followed by a colon and not a semicolon.
@@ -96,6 +109,7 @@
96109
PhpCsFixer\Finder::create()
97110
->in([
98111
'app/code/core/Mage/',
112+
'errors/',
99113
'lib/Mage/',
100114
'lib/Magento/',
101115
'lib/Varien/',

‎.phpcs.ecg.xml.dist

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<file>install.php</file>
88
<file>app/Mage.php</file>
99
<file>app/code/core/Mage/</file>
10+
<file>errors/</file>
1011
<file>lib/Mage/</file>
1112
<file>lib/Magento/</file>
1213
<file>lib/Varien/</file>
@@ -66,6 +67,7 @@
6667
<exclude-pattern>*/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php*</exclude-pattern>
6768
<exclude-pattern>*/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php*</exclude-pattern>
6869
<exclude-pattern>*/core/Mage/Catalog/Model/Resource/Product/Option/Value.php*</exclude-pattern>
70+
<exclude-pattern>*/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php*</exclude-pattern>
6971
<exclude-pattern>*/core/Mage/CatalogIndex/Model/Indexer.php*</exclude-pattern>
7072
<exclude-pattern>*/core/Mage/CatalogInventory/Model/Observer.php*</exclude-pattern>
7173
<exclude-pattern>*/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php*</exclude-pattern>
@@ -111,6 +113,7 @@
111113
<exclude-pattern>*/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php*</exclude-pattern>
112114
<exclude-pattern>*/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php*</exclude-pattern>
113115
<exclude-pattern>*/core/Mage/Index/controllers/Adminhtml/ProcessController.php*</exclude-pattern>
116+
<exclude-pattern>*/core/Mage/Index/Model/Observer.php*</exclude-pattern>
114117
<exclude-pattern>*/core/Mage/Index/Model/Process.php*</exclude-pattern>
115118
<exclude-pattern>*/core/Mage/Index/Model/Resource/Event.php*</exclude-pattern>
116119
<exclude-pattern>*/core/Mage/Log/Model/Resource/Log.php*</exclude-pattern>
@@ -148,6 +151,7 @@
148151
<exclude-pattern>*/core/Mage/Sales/Model/Order/Shipment.php*</exclude-pattern>
149152
<exclude-pattern>*/core/Mage/SalesRule/Model/Observer.php*</exclude-pattern>
150153
<exclude-pattern>*/core/Mage/SalesRule/Model/Rule.php*</exclude-pattern>
154+
<exclude-pattern>*/core/Mage/SalesRule/Model/Coupon/Massgenerator.php*</exclude-pattern>
151155
<exclude-pattern>*/core/Mage/Tag/controllers/IndexController.php*</exclude-pattern>
152156
<exclude-pattern>*/core/Mage/Tag/Model/Api.php*</exclude-pattern>
153157
<exclude-pattern>*/core/Mage/Tag/Model/Resource/Product/Collection.php*</exclude-pattern>
@@ -163,6 +167,7 @@
163167
<exclude-pattern>*/lib/Varien/Cache/Backend/Memcached.php*</exclude-pattern>
164168
<exclude-pattern>*/lib/Varien/Convert/Parser/Csv.php*</exclude-pattern>
165169
<exclude-pattern>*/lib/Varien/Object/Cache.php*</exclude-pattern>
170+
<exclude-pattern>*/shell/indexer.php*</exclude-pattern>
166171
<exclude-pattern>*/core/Mage/*/data/*</exclude-pattern>
167172
<exclude-pattern>*/core/Mage/*/sql/*</exclude-pattern>
168173
</rule>

‎.phpcs.php.xml.dist

+54
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<file>install.php</file>
88
<file>app/Mage.php</file>
99
<file>app/code/core/Mage/</file>
10+
<file>errors/</file>
1011
<file>lib/Mage/</file>
1112
<file>lib/Magento/</file>
1213
<file>lib/Varien/</file>
@@ -18,4 +19,57 @@
1819
<exclude-pattern>*/Varien/Db/Tree.php*</exclude-pattern>
1920
<exclude-pattern>*/Varien/Directory/Collection.php*</exclude-pattern>
2021
</rule>
22+
<rule ref="PHPCompatibility.Constants.RemovedConstants.mcrypt_blowfishDeprecatedRemoved">
23+
<exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
24+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
25+
</rule>
26+
<rule ref="PHPCompatibility.Constants.RemovedConstants.mcrypt_mode_cbcDeprecatedRemoved">
27+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
28+
</rule>
29+
<rule ref="PHPCompatibility.Constants.RemovedConstants.mcrypt_mode_ecbDeprecatedRemoved">
30+
<exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
31+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
32+
</rule>
33+
<rule ref="PHPCompatibility.Constants.RemovedConstants.mcrypt_randDeprecatedRemoved">
34+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
35+
</rule>
36+
<rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_create_ivDeprecatedRemoved">
37+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
38+
</rule>
39+
<rule ref="PHPCompatibility.Extensions.RemovedExtensions.mcryptDeprecatedRemoved">
40+
<exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
41+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
42+
</rule>
43+
<rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_enc_get_iv_sizeDeprecatedRemoved">
44+
<exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
45+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
46+
</rule>
47+
<rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_enc_get_key_sizeDeprecatedRemoved">
48+
<exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
49+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
50+
</rule>
51+
<rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_genericDeprecatedRemoved">
52+
<exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
53+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
54+
</rule>
55+
<rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_generic_deinitDeprecatedRemoved">
56+
<exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
57+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
58+
</rule>
59+
<rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_generic_initDeprecatedRemoved">
60+
<exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
61+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
62+
</rule>
63+
<rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_module_closeDeprecatedRemoved">
64+
<exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
65+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
66+
</rule>
67+
<rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_module_openDeprecatedRemoved">
68+
<exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
69+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
70+
</rule>
71+
<rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mdecrypt_genericDeprecatedRemoved">
72+
<exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
73+
<exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
74+
</rule>
2175
</ruleset>

‎.phpcs.xml.dist

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<file>install.php</file>
88
<file>app/Mage.php</file>
99
<file>app/code/core/Mage/</file>
10+
<file>errors/</file>
1011
<file>lib/Mage/</file>
1112
<file>lib/Magento/</file>
1213
<file>lib/Varien/</file>

0 commit comments

Comments
 (0)