Skip to content

Commit

Permalink
Merge pull request #77 from shochdoerfer/feature/magento-2.4.4
Browse files Browse the repository at this point in the history
Make module compatible with Magento 2.4.4
  • Loading branch information
shochdoerfer authored Apr 23, 2022
2 parents fbf9907 + cfff3aa commit 6d33685
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 12,156 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
coveralls: [ false ]
include:
- operating-system: 'ubuntu-latest'
php-versions: '7.4'
magento: '2.4.3'
php-versions: '8.1'
magento: '2.4.4'
coveralls: true

steps:
Expand Down Expand Up @@ -55,6 +55,10 @@ jobs:
if: matrix.magento == '2.4.3'
run: composer update --with-dependencies magento/framework:103.0.3 magento/module-catalog:104.0.3 magento/module-cms:104.0.3 magento/module-customer:103.0.3 magento/module-user:101.2.3

- name: Install Magento 2.4.4
if: matrix.magento == '2.4.4'
run: composer update --with-dependencies magento/framework:103.0.4 magento/module-catalog:104.0.4 magento/module-cms:104.0.4 magento/module-customer:103.0.4 magento/module-user:101.2.4

- name: Codesniffer
run: composer cs-check

Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
/vendor
/dist
/build
/tags
/src
.phpunit.result.cache
clover.xml
composer.lock
composer.phar
infection.log
rootCA.pem
2 changes: 1 addition & 1 deletion bin/download
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -o errexit

VERSION=${1:-2.4.3-p1}
VERSION=${1:-2.4.4}
EDITION=${2:-community}

bin/stop
Expand Down
32 changes: 18 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,24 @@
}
],
"require": {
"php": "~7.4.0|~8.0.0",
"magento/framework": "~102.0.7-p2|~103.0.0|~103.0.1|~103.0.2|~103.0.3",
"magento/module-catalog": "~103.0.7-p2|~104.0.0|~104.0.1|~104.0.2|~104.0.3",
"magento/module-cms": "~103.0.7-p2|~104.0.0|~104.0.1|~104.0.2|~104.0.3",
"magento/module-customer": "~102.0.7-p2|~103.0.0|~103.0.1|~103.0.2|~103.0.3",
"magento/module-user": "~101.1.7|~101.2.0|~101.2.1|~101.2.2|~101.2.3"
"php": "~7.4.0|~8.0.0|~8.1.0",
"magento/framework": "~102.0.7-p2|~103.0.0|~103.0.1|~103.0.2|~103.0.3|~103.0.4",
"magento/module-catalog": "~103.0.7-p2|~104.0.0|~104.0.1|~104.0.2|~104.0.3|~104.0.4",
"magento/module-cms": "~103.0.7-p2|~104.0.0|~104.0.1|~104.0.2|~104.0.3|~104.0.4",
"magento/module-customer": "~102.0.7-p2|~103.0.0|~103.0.1|~103.0.2|~103.0.3|~103.0.4",
"magento/module-user": "~101.1.7|~101.2.0|~101.2.1|~101.2.2|~101.2.3|~101.2.4"
},
"require-dev": {
"bitexpert/captainhook-infection": "^0.6.0",
"bitexpert/phpstan-magento": "^0.19.0",
"captainhook/captainhook": "^5.10",
"captainhook/plugin-composer": "^5.3",
"infection/infection": "0.22.0|^0.26.1",
"bitexpert/phpstan-magento": "^0.20.0",
"captainhook/captainhook": "^5.10.8",
"captainhook/plugin-composer": "^5.3.3",
"infection/infection": "0.22.0|^0.26.6",
"magento/magento-coding-standard": "^15",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.4",
"phpstan/phpstan": "^1.5.4",
"phpstan/phpstan-strict-rules": "^1.1",
"phpunit/phpunit": "^9.5.10",
"roave/security-advisories": "dev-latest",
"phpunit/phpunit": "^9.5.20",
"squizlabs/php_codesniffer": "^3.6"
},
"conflict": {
Expand Down Expand Up @@ -73,6 +72,11 @@
"coverage": "vendor/bin/phpunit --coverage-clover clover.xml"
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"infection/extension-installer": true,
"captainhook/plugin-composer": true,
"phpstan/extension-installer": true
}
}
}
Loading

0 comments on commit 6d33685

Please sign in to comment.