diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8914e953..2500dfb4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,43 +16,44 @@ jobs: strategy: fail-fast: true matrix: - php: [7.2, 7.3, 7.4, '8.0', 8.1, 8.2, 8.3] - laravel: [6, 7, 8, 9, 10] - exclude: - - php: 7.2 - laravel: 8 - - php: 7.2 + php: [8.1, 8.2, 8.3, 8.4] + laravel: [10, 11] + include: + - php: 8.2 laravel: 9 - - php: 7.2 - laravel: 10 - - php: 7.3 + - php: 8.1 laravel: 9 - - php: 7.3 - laravel: 10 - - php: 7.4 + - php: '8.0' laravel: 9 + - php: 8.1 + laravel: 8 + - php: '8.0' + laravel: 8 - php: 7.4 - laravel: 10 + laravel: 8 + - php: 7.3 + laravel: 8 - php: '8.0' - laravel: 10 - - php: 8.1 - laravel: 6 - - php: 8.1 laravel: 7 - - php: 8.2 - laravel: 6 - - php: 8.2 + - php: 7.4 laravel: 7 - - php: 8.2 - laravel: 8 - - php: 8.3 - laravel: 6 - - php: 8.3 + - php: 7.3 laravel: 7 - - php: 8.3 - laravel: 8 - - php: 8.3 - laravel: 9 + - php: 7.2 + laravel: 7 + - php: '8.0' + laravel: 6 + - php: 7.4 + laravel: 6 + - php: 7.3 + laravel: 6 + - php: 7.2 + laravel: 6 + exclude: + - php: 8.4 + laravel: 10 + - php: 8.1 + laravel: 11 name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} @@ -71,8 +72,7 @@ jobs: - name: Install dependencies run: | - composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update - composer update --prefer-dist --no-interaction --no-progress + composer update --prefer-dist --no-interaction --no-progress --with="illuminate/contracts=^${{ matrix.laravel }}" - name: Execute tests - run: vendor/bin/phpunit + run: vendor/bin/phpunit ${{ matrix.laravel >= 10 && '--display-deprecations --fail-on-deprecation' || '' }} diff --git a/.styleci.yml b/.styleci.yml index 215fbcfe..92888875 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -1,4 +1,6 @@ php: preset: laravel + enabled: + - nullable_type_declarations js: true css: true diff --git a/composer.json b/composer.json index 2ce853e6..08dbef90 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "league/oauth1-client": "^1.10.1", + "league/oauth1-client": "^1.11", "phpseclib/phpseclib": "^3.0" }, "require-dev": {