refactor: update dependencies (#114)

monicahq · Jan 30, 2022 · 59074be · 59074be
1 parent d2f7178
commit 59074be
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -27,13 +27,13 @@ jobs:
       fail-fast: false
       matrix:
         php-version: ['7.4', '8.0', '8.1']
-        laravel_version: [7.*, 8.*, 9.*]
+        laravel-version: [7.*, 8.*, 9.*]
         exclude:
           - php-version: 7.4
-            laravel_version: 9.*
+            laravel-version: 9.*
           - php-version: 8.1
-            laravel_version: 7.*
-    name: PHP ${{ matrix.php-version }} | Laravel ${{ matrix.laravel_version }}
+            laravel-version: 7.*
+    name: PHP ${{ matrix.php-version }} | Laravel ${{ matrix.laravel-version }}
 
     steps:
       - name: Checkout sources
@@ -62,17 +62,18 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}-${{ matrix.laravel_version }}
+          key: ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}-${{ matrix.laravel-version }}
           restore-keys: |
-            ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}-${{ matrix.laravel_version }}
+            ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}-${{ matrix.laravel-version }}
             ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}
             ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}
             ${{ runner.os }}-composer-v4-
 
-      - name: Install dependencies with Laravel ${{ matrix.laravel_version }}
+      - name: Install dependencies with Laravel ${{ matrix.laravel-version }}
         run: |
-          export COMPOSER_ROOT_VERSION=dev-master
-          composer require "illuminate/console:${{ matrix.laravel_version }}" "illuminate/http:${{ matrix.laravel_version }}" "illuminate/routing:${{ matrix.laravel_version }}" "illuminate/support:${{ matrix.laravel_version }}" --no-interaction --no-progress --prefer-stable --prefer-dist
+          export COMPOSER_ROOT_VERSION=dev-main
+          composer require "illuminate/support:${{ matrix.laravel-version }}" --no-update
+          composer update --no-interaction --no-progress --prefer-dist
 
       - name: Run test suite
         run: phpdbg -dmemory_limit=4G -qrr vendor/bin/phpunit -c phpunit.xml --log-junit ./results/results.xml --coverage-clover ./results/coverage.xml
@@ -82,7 +83,7 @@ jobs:
         working-directory: results
 
       - name: Store results
-        if: matrix.php-version == env.default-php-version && matrix.laravel_version == env.default-laravel-version
+        if: matrix.php-version == env.default-php-version && matrix.laravel-version == env.default-laravel-version
         uses: actions/upload-artifact@v2
         with:
           name: results

diff --git a/composer.json b/composer.json
@@ -20,25 +20,21 @@
         }
     ],
     "require": {
-        "illuminate/contracts": "^5.6 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "illuminate/http": "^5.6 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "illuminate/routing": "^5.6 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "illuminate/support": "^5.6 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/support": "^7.0 || ^8.0 || ^9.0",
         "sabre/dav": "^4.0",
         "thecodingmachine/safe": "^1.0"
     },
     "require-dev": {
-        "laravel/framework": "^5.6 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
         "mockery/mockery": "^1.4",
-        "nunomaduro/larastan": "^0 || ^1.0",
+        "nunomaduro/larastan": "^1.0",
         "ocramius/package-versions": "^1.9 || ^2.0",
-        "orchestra/testbench": "^3.5 || ^5.0 || ^6.0 || ^7.0",
+        "orchestra/testbench": "^5.0 || ^6.0 || ^7.0",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^9.0",
         "thecodingmachine/phpstan-safe-rule": "^1.0",
-        "vimeo/psalm": "^3.0 || ^4.0"
+        "vimeo/psalm": "^4.0"
     },
     "autoload": {
         "psr-4": {