Skip to content

Commit b306fae

Browse files
committed
Merge branch 'BrentRobert-feature/magento-2.4.4'
2 parents bab5acd + 96692c7 commit b306fae

File tree

7 files changed

+54
-9778
lines changed

7 files changed

+54
-9778
lines changed

.github/workflows/ci.yml

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@ jobs:
1111
strategy:
1212
matrix:
1313
operating-system: ['ubuntu-latest']
14-
php-versions: ['7.4', '7.4']
15-
coveralls: [false, true]
14+
php-versions: ['7.4']
15+
magento: ['2.3.7-p2', '2.4.0', '2.4.1', '2.4.2', '2.4.2-p1', '2.4.2-p2', '2.4.3', '2.4.3-p1']
16+
coveralls: [ false ]
17+
include:
18+
- php-versions: '8.1'
19+
magento: '2.4.4'
20+
operating-system: 'ubuntu-latest'
1621
steps:
1722
- name: Checkout repo
1823
uses: actions/checkout@v2
@@ -28,6 +33,42 @@ jobs:
2833
- name: Install Composer dependencies
2934
run: composer install
3035

36+
- name: Install Magento 2.3.7-p2
37+
if: matrix.magento == '2.3.7-p2'
38+
run: composer update --with-dependencies magento/framework:102.0.7-p2 laminas/laminas-code:3.4.1
39+
40+
- name: Install Magento 2.4.0
41+
if: matrix.magento == '2.4.0'
42+
run: composer update --with-dependencies magento/framework:103.0.0 laminas/laminas-code:3.4.1
43+
44+
- name: Install Magento 2.4.1
45+
if: matrix.magento == '2.4.1'
46+
run: composer update --with-dependencies magento/framework:103.0.1 laminas/laminas-code:3.4.1
47+
48+
- name: Install Magento 2.4.2
49+
if: matrix.magento == '2.4.2'
50+
run: composer update --with-dependencies magento/framework:103.0.2 laminas/laminas-code:3.4.1
51+
52+
- name: Install Magento 2.4.2-p1
53+
if: matrix.magento == '2.4.2-p1'
54+
run: composer update --with-dependencies magento/framework:103.0.2-p1 laminas/laminas-code:3.4.1
55+
56+
- name: Install Magento 2.4.2-p2
57+
if: matrix.magento == '2.4.2-p2'
58+
run: composer update --with-dependencies magento/framework:103.0.2-p1 laminas/laminas-code:3.4.1
59+
60+
- name: Install Magento 2.4.3
61+
if: matrix.magento == '2.4.3'
62+
run: composer update --with-dependencies magento/framework:103.0.3 laminas/laminas-code:3.5.1
63+
64+
- name: Install Magento 2.4.3-p1
65+
if: matrix.magento == '2.4.3-p1'
66+
run: composer update --with-dependencies magento/framework:103.0.3-p1 laminas/laminas-code:3.5.1
67+
68+
- name: Install Magento 2.4.4
69+
if: matrix.magento == '2.4.4'
70+
run: composer update --with-dependencies magento/framework:103.0.4 laminas/laminas-code:4.5.1 roave/security-advisories
71+
3172
- name: Composer license check
3273
run: composer check-license
3374

@@ -40,6 +81,7 @@ jobs:
4081
./bin/ci_markdown_neon_lint
4182
4283
- name: Static code analysis
84+
if: (matrix.magento != '2.4.0' && matrix.magento != '2.4.1')
4385
run: composer analyze
4486

4587
- name: Unittests

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
/vendor/
21
.phpunit.result.cache
2+
composer.lock
3+
/vendor/

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
}
2020
],
2121
"require": {
22-
"php": "^7.2.0 || ^8.0.0",
22+
"php": "^7.2.0 || ^8.1.0",
2323
"ext-dom": "*",
24-
"laminas/laminas-code": "~3.3.0 || ~3.4.1 || ~3.5.1",
24+
"laminas/laminas-code": "~3.3.0 || ~3.4.1 || ~3.5.1 || ~4.5.0",
2525
"phpstan/phpstan": "^1.5.0",
26-
"symfony/finder": "^3.0 || ^4.0 || ^5.0"
26+
"symfony/finder": "^3.0 || ^4.0 || ^5.0 || ^6.0"
2727
},
2828
"conflict": {
2929
"magento/framework": "<102.0.0"
@@ -41,7 +41,6 @@
4141
"phpstan/phpstan-phpunit": "^1.0.0",
4242
"phpstan/phpstan-strict-rules": "^1.1.0",
4343
"phpunit/phpunit": "^9.5.19",
44-
"roave/security-advisories": "dev-latest",
4544
"squizlabs/php_codesniffer": "^3.6.2"
4645
},
4746
"autoload": {

0 commit comments

Comments
 (0)