diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e785353..abd787c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,17 +11,20 @@ jobs: strategy: matrix: operating-system: ['ubuntu-latest'] - php-versions: ['8.1', '8.2'] - magento: ['2.4.4', '2.4.5', '2.4.6'] + php-versions: ['8.3', '8.4', '8.5'] + magento: ['2.4.7', '2.4.8', '2.4.9'] coveralls: [ true ] - include: - - operating-system: 'ubuntu-latest' - php-versions: '8.1' - magento: '2.4.4' - coveralls: false - - operating-system: 'ubuntu-latest' - php-versions: '8.1' - magento: '2.4.5' + exclude: + - php-versions: '8.4' + magento: '2.4.7' + - php-versions: '8.5' + magento: '2.4.7' + - php-versions: '8.5' + magento: '2.4.8' + - php-versions: '8.3' + magento: '2.4.9' + - php-versions: '8.4' + magento: '2.4.9' steps: - name: Checkout repo uses: actions/checkout@v2 @@ -34,26 +37,26 @@ jobs: coverage: xdebug extensions: bcmath, gd - - name: Install Composer dependencies - run: composer install - - - name: Install Magento 2.4.4 - if: matrix.magento-versions == '2.4.4' + - name: Install Magento 2.4.7 + if: matrix.magento == '2.4.7' 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.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 + composer require magento/framework:~103.0.7.0 magento/module-backend:~102.0.7.0 magento/module-customer:~103.0.7.0 magento/module-store:~101.1.7.0 magento/module-ui:~101.2.7.0 - - name: Install Magento 2.4.5 - if: matrix.magento-versions == '2.4.5' + - name: Install Magento 2.4.8 + if: matrix.magento == '2.4.8' 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.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 + composer require magento/framework:~103.0.8.0 magento/module-backend:~102.0.8.0 magento/module-customer:~103.0.8.0 magento/module-store:101.1.8 magento/module-ui:~101.2.8.0 - - name: Install Magento 2.4.6 - if: matrix.magento-versions == '2.4.6' + - name: Install Magento 2.4.9 + if: matrix.magento == '2.4.9' 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 + composer require magento/framework:~103.0.9.0 magento/module-backend:~102.0.9.0 magento/module-customer:~103.0.9.0 magento/module-store:~101.1.9.0 magento/module-ui:~101.2.9.0 + + - name: Install Composer dependencies + run: composer install - name: Codesniffer run: composer cs-check diff --git a/Api/Data/Collection/WhitelistEntrySearchResultInterface.php b/Api/Data/Collection/WhitelistEntrySearchResultInterface.php index c644716..2b31b5e 100644 --- a/Api/Data/Collection/WhitelistEntrySearchResultInterface.php +++ b/Api/Data/Collection/WhitelistEntrySearchResultInterface.php @@ -31,5 +31,5 @@ public function getItems(); * @param \BitExpert\ForceCustomerLogin\Api\Data\WhitelistEntryInterface[] $items * @return $this */ - public function setItems(array $items = null); + public function setItems(array $items); } diff --git a/composer.json b/composer.json index 7ef8e44..3bcb293 100644 --- a/composer.json +++ b/composer.json @@ -18,23 +18,22 @@ } ], "require": { - "php": "~8.1.0|~8.2.0|~8.3.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" + "php": "~8.3.0|~8.4.0|~8.5.0", + "magento/framework": "~103.0.7", + "magento/module-backend": "~102.0.7", + "magento/module-customer": "~103.0.7", + "magento/module-store": "~101.1.7", + "magento/module-ui": "~101.2.7" }, "require-dev": { - "phpunit/phpunit": "^9.5.2", "captainhook/captainhook": "^5.16.4", "captainhook/plugin-composer": "^5.3.3", "phpstan/extension-installer": "^1.3.1", - "phpstan/phpstan": "^1.10.33", - "bitexpert/phpstan-magento": "^0.30.0", "magento/magento-coding-standard": "^31", - "php-coveralls/php-coveralls": "^2.7" - }, + "php-coveralls/php-coveralls": "^2.7", + "phpunit/phpunit": "^9.5.2", + "bitexpert/phpstan-magento": "^0.11.0" + }, "autoload": { "files": [ "registration.php" diff --git a/phpstan.neon b/phpstan.neon index 4ba490c..4af7a37 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,7 +1,6 @@ parameters: level: 7 inferPrivatePropertyTypeFromConstructor: true - checkMissingIterableValueType: false fileExtensions: - php - phtml @@ -20,6 +19,8 @@ parameters: magento: checkServiceContracts: false ignoreErrors: + - + identifier: missingType.iterableValue - message: '~Parameter #1 \$modelId of method Magento\\Framework\\Model\\AbstractModel::load\(\) expects int, string given~' path: Repository/WhitelistRepository.php @@ -29,3 +30,6 @@ parameters: - message: '~Call to an undefined method Magento\\Framework\\App\\RequestInterface::isPost\(\)~' path: Controller/LoginCheck.php + - + message: '~Parameter #3 \$data of method Magento\\Backend\\Block\\Widget\\Button\\ButtonList::update\(\) expects string, array<.*> given.~' + path: Block/Adminhtml/Manage/Create.php