diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 761b46a..def8624 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,9 +11,9 @@ jobs: strategy: matrix: operating-system: ['ubuntu-latest'] - php-versions: ['7.4'] - magento: ['2.4.0', '2.4.1', '2.4.2', '2.4.3'] - coveralls: [ false ] + php-versions: ['8.1', '8.2'] + magento: ['2.4.4', '2.4.5', '2.4.6'] + coveralls: [ true ] include: - operating-system: 'ubuntu-latest' php-versions: '8.1' @@ -22,7 +22,6 @@ jobs: - operating-system: 'ubuntu-latest' php-versions: '8.1' magento: '2.4.5' - coveralls: true steps: - name: Checkout repo uses: actions/checkout@v2 @@ -31,37 +30,13 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} - tools: composer:v1 + tools: composer:v2 coverage: xdebug extensions: bcmath, gd - name: Install Composer dependencies run: composer install - - name: Install Magento 2.4.0 - if: matrix.magento-versions == '2.4.0' - run: | - composer remove --no-update magento/framework magento/module-backend magento/module-customer magento/module-store magento/module-ui - composer require magento/framework:103.0.0 magento/module-backend:102.0.0 magento/module-customer:103.0.0 magento/module-store:101.1.0 magento/module-ui:101.2.0 - - - name: Install Magento 2.4.1 - if: matrix.magento-versions == '2.4.1' - run: | - composer remove --no-update magento/framework magento/module-backend magento/module-customer magento/module-store magento/module-ui - composer require magento/framework:103.0.1 magento/module-backend:102.0.1 magento/module-customer:103.0.1 magento/module-store:101.1.1 magento/module-ui:101.2.1 - - - name: Install Magento 2.4.2 - if: matrix.magento-versions == '2.4.2' - run: | - composer remove --no-update magento/framework magento/module-backend magento/module-customer magento/module-store magento/module-ui - composer require magento/framework:103.0.2 magento/module-backend:102.0.2 magento/module-customer:103.0.2 magento/module-store:101.1.2 magento/module-ui:101.2.2 - - - name: Install Magento 2.4.3 - if: matrix.magento-versions == '2.4.3' - run: | - composer remove --no-update magento/framework magento/module-backend magento/module-customer magento/module-store magento/module-ui - composer require magento/framework:103.0.3 magento/module-backend:102.0.3 magento/module-customer:103.0.3 magento/module-store:101.1.3 magento/module-ui:101.2.3 - - name: Install Magento 2.4.4 if: matrix.magento-versions == '2.4.4' run: | @@ -74,6 +49,12 @@ jobs: composer remove --no-update magento/framework magento/module-backend magento/module-customer magento/module-store magento/module-ui composer require magento/framework:103.0.5 magento/module-backend:102.0.5 magento/module-customer:103.0.5 magento/module-store:101.1.5 magento/module-ui:101.2.5 + - name: Install Magento 2.4.6 + if: matrix.magento-versions == '2.4.6' + run: | + composer remove --no-update magento/framework magento/module-backend magento/module-customer magento/module-store magento/module-ui + composer require magento/framework:103.0.6 magento/module-backend:102.0.6 magento/module-customer:103.0.6 magento/module-store:101.1.6 magento/module-ui:101.2.6 + - name: Codesniffer run: composer cs-check diff --git a/composer.json b/composer.json index b1d4424..9a5aa2c 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "bitexpert/magento2-force-customer-login", "description": "The Force Login module for Magento2 redirects a storefront visitor to the Magento2 Frontend login page, if the visitor is not logged in. It is possible to configure the whitelisted urls to add custom definitions.", "type": "magento2-module", - "version": "5.1.0", + "version": "6.0.0", "minimum-stability": "stable", "license": "Apache-2.0", "authors": [ @@ -18,21 +18,21 @@ } ], "require": { - "php": "~7.3.0|~7.4.0|~8.1.0", - "magento/framework": "~103.0.0|~103.0.1|~103.0.2|~103.0.3|~103.0.4|~103.0.5", - "magento/module-backend": "~102.0.0|~102.0.1|~102.0.2|~102.0.3|~102.0.4|~102.0.5", - "magento/module-customer": "~103.0.0|~103.0.1|~103.0.2|~103.0.3|~103.0.4|~103.0.5", - "magento/module-store": "~101.1.0|~101.1.1|~101.1.2|~101.1.3|~101.1.4|~101.1.5", - "magento/module-ui": "~101.2.0|~101.2.1|~101.2.2|~101.2.3|~101.2.4|~101.2.5" + "php": "~8.1.0|~8.2.0", + "magento/framework": "^103.0.4", + "magento/module-backend": "^102.0.4", + "magento/module-customer": "^103.0.4", + "magento/module-store": "^101.1.4", + "magento/module-ui": "^101.2.4" }, "require-dev": { "phpunit/phpunit": "^9.5.2", - "captainhook/captainhook": "^5.10.8", + "captainhook/captainhook": "^5.16.4", "captainhook/plugin-composer": "^5.3.3", - "phpstan/extension-installer": "^1.1.0", - "phpstan/phpstan": "^1.7.2", - "bitexpert/phpstan-magento": "^0.23.0", - "magento/magento-coding-standard": "^15" + "phpstan/extension-installer": "^1.3.1", + "phpstan/phpstan": "^1.10.33", + "bitexpert/phpstan-magento": "^0.30.0", + "magento/magento-coding-standard": "^31" }, "autoload": { "files": [ @@ -50,10 +50,10 @@ }, "scripts": { "post-install-cmd": [ - "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths vendor/magento/magento-coding-standard/)" + "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/,../../phpcompatibility/php-compatibility)" ], "post-update-cmd": [ - "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths vendor/magento/magento-coding-standard/)" + "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/,../../phpcompatibility/php-compatibility)" ], "check": [ "@cs-check", diff --git a/phpstan.neon b/phpstan.neon index 5d5ecb2..3d845cf 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -29,6 +29,3 @@ parameters: - message: '~Call to an undefined method Magento\\Framework\\App\\RequestInterface::isPost\(\)~' path: Controller/LoginCheck.php - - - message: '~Parameter #3 \$data of method~' - path: Block/Adminhtml/Manage/Create.php