From 16f87e6d4f82d870753a138cae6058177790650e Mon Sep 17 00:00:00 2001 From: Brian Faust Date: Sun, 6 Sep 2020 05:15:00 +0300 Subject: [PATCH 1/6] support laravel 8 --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 2dfd9ae0ba..03d6f818dd 100644 --- a/composer.json +++ b/composer.json @@ -28,11 +28,11 @@ "clue/buzz-react": "^2.5", "facade/ignition-contracts": "^1.0", "guzzlehttp/psr7": "^1.5", - "illuminate/broadcasting": "5.8.*|^6.0|^7.0", - "illuminate/console": "5.8.*|^6.0|^7.0", - "illuminate/http": "5.8.*|^6.0|^7.0", - "illuminate/routing": "5.8.*|^6.0|^7.0", - "illuminate/support": "5.8.*|^6.0|^7.0", + "illuminate/broadcasting": "5.8.*|^6.0|^7.0|^8.0", + "illuminate/console": "5.8.*|^6.0|^7.0|^8.0", + "illuminate/http": "5.8.*|^6.0|^7.0|^8.0", + "illuminate/routing": "5.8.*|^6.0|^7.0|^8.0", + "illuminate/support": "5.8.*|^6.0|^7.0|^8.0", "pusher/pusher-php-server": "^3.0|^4.0", "react/dns": "^1.1", "symfony/http-kernel": "^4.0|^5.0", From d85ba70e5871a6e9961b20928c9ba4856c746c52 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Sep 2020 08:34:39 +0300 Subject: [PATCH 2/6] Deprecated 5.8.* --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 03d6f818dd..da6188657f 100644 --- a/composer.json +++ b/composer.json @@ -28,11 +28,11 @@ "clue/buzz-react": "^2.5", "facade/ignition-contracts": "^1.0", "guzzlehttp/psr7": "^1.5", - "illuminate/broadcasting": "5.8.*|^6.0|^7.0|^8.0", - "illuminate/console": "5.8.*|^6.0|^7.0|^8.0", - "illuminate/http": "5.8.*|^6.0|^7.0|^8.0", - "illuminate/routing": "5.8.*|^6.0|^7.0|^8.0", - "illuminate/support": "5.8.*|^6.0|^7.0|^8.0", + "illuminate/broadcasting": "^6.0|^7.0|^8.0", + "illuminate/console": "^6.0|^7.0|^8.0", + "illuminate/http": "^6.0|^7.0|^8.0", + "illuminate/routing": "^6.0|^7.0|^8.0", + "illuminate/support": "^6.0|^7.0|^8.0", "pusher/pusher-php-server": "^3.0|^4.0", "react/dns": "^1.1", "symfony/http-kernel": "^4.0|^5.0", @@ -40,7 +40,7 @@ }, "require-dev": { "mockery/mockery": "^1.3", - "orchestra/testbench": "3.8.*|^4.0|^5.0", + "orchestra/testbench": "^4.0|^5.0|^6.0", "phpunit/phpunit": "^8.0|^9.0" }, "autoload": { From c85b925c9d352927003aa1d191996e2f290c3500 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Sep 2020 08:35:39 +0300 Subject: [PATCH 3/6] Updated CI for 8.0 --- .github/workflows/run-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 6d3b074274..8d03aa5ecb 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,15 +10,15 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] php: [7.4, 7.3, 7.2] - laravel: [5.8.*, 6.*, 7.*] + laravel: [6.*, 7.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: + - laravel: 8.* + testbench: 6.* - laravel: 7.* testbench: 5.* - laravel: 6.* testbench: 4.* - - laravel: 5.8.* - testbench: 3.8.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} From bf0986bcda66b6aa9504c1993b1b40f302f742e1 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Sep 2020 08:48:46 +0300 Subject: [PATCH 4/6] updated constraints --- .github/workflows/run-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8d03aa5ecb..047207d36a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -15,6 +15,10 @@ jobs: include: - laravel: 8.* testbench: 6.* + php: 7.3 + - laravel: 8.* + testbench: 6.* + php: 7.4 - laravel: 7.* testbench: 5.* - laravel: 6.* From 21f1349befcb5814f9eef60ea4d71e3260b51fb1 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Sep 2020 08:53:12 +0300 Subject: [PATCH 5/6] Update run-tests.yml --- .github/workflows/run-tests.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 047207d36a..38794a2e75 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -15,10 +15,6 @@ jobs: include: - laravel: 8.* testbench: 6.* - php: 7.3 - - laravel: 8.* - testbench: 6.* - php: 7.4 - laravel: 7.* testbench: 5.* - laravel: 6.* @@ -45,8 +41,8 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --ignore-platform-reqs + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest --ignore-platform-reqs - name: Execute tests run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml From 4fb318a56bec05484f9737337ec7901912e5d10f Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Sep 2020 09:24:14 +0300 Subject: [PATCH 6/6] Update run-tests.yml --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 38794a2e75..8d03aa5ecb 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -41,8 +41,8 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --ignore-platform-reqs - composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest --ignore-platform-reqs + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest - name: Execute tests run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml