From 25acffeed8b4665767fdea96b0b6dfbe2465fe7d Mon Sep 17 00:00:00 2001 From: Matteo Maggioni Date: Mon, 24 Oct 2022 14:39:50 +0200 Subject: [PATCH 1/9] change laravel version and testbench --- .github/workflows/run-tests.yml | 6 +++--- composer.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 58fd68a..ac92d3e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,11 +14,11 @@ jobs: matrix: os: [ubuntu-latest] php: [7.4, 8.0] - laravel: [8.*] + laravel: [8.*, 9.*] stability: [prefer-lowest, prefer-stable] include: - - laravel: 8.* - testbench: ^6.6 + - laravel: 9.* + testbench: ^7.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index 6711b45..5cef10e 100644 --- a/composer.json +++ b/composer.json @@ -17,9 +17,9 @@ ], "require": { "php": "^7.4|^8.0", - "illuminate/contracts": "^8.37", - "illuminate/support": "^8.37", - "illuminate/http": "^8.37", + "illuminate/contracts": "^8.37|^9.0", + "illuminate/support": "^8.37|^9.0", + "illuminate/http": "^8.37|^9.0", "symfony/process": "^5.1.4" }, "require-dev": { From 1bf002d7fd3bb90c43024634eb418631c1e30a95 Mon Sep 17 00:00:00 2001 From: Matteo Maggioni Date: Mon, 24 Oct 2022 16:51:56 +0200 Subject: [PATCH 2/9] change php v for test and maintain laravel 8 with testbench ^6 --- .github/workflows/run-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ac92d3e..9ea69dc 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,12 +13,14 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [7.4, 8.0] + php: [8.0, 8.1] laravel: [8.*, 9.*] stability: [prefer-lowest, prefer-stable] include: + - laravel: 8.* + testbench: ^6.6 - laravel: 9.* - testbench: ^7.0 + testbench: 7.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 36cfff4d698ebaa9ffd7c50fe15a4483b91ad847 Mon Sep 17 00:00:00 2001 From: Matteo Maggioni Date: Tue, 25 Oct 2022 08:56:42 +0200 Subject: [PATCH 3/9] removed php 7.4 in composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 5cef10e..d919dc0 100644 --- a/composer.json +++ b/composer.json @@ -16,11 +16,11 @@ } ], "require": { - "php": "^7.4|^8.0", + "php": "^8.0", "illuminate/contracts": "^8.37|^9.0", "illuminate/support": "^8.37|^9.0", "illuminate/http": "^8.37|^9.0", - "symfony/process": "^5.1.4" + "symfony/process": "^5.1.4|^6.0" }, "require-dev": { "brianium/paratest": "^6.2", From 56cd06c9b137861df4f7cf564f5c233dcf81c08a Mon Sep 17 00:00:00 2001 From: Alessio Vertemati Date: Tue, 25 Oct 2022 09:39:06 +0200 Subject: [PATCH 4/9] Allow collision and testbench upgrades --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d919dc0..2e8462d 100644 --- a/composer.json +++ b/composer.json @@ -24,8 +24,8 @@ }, "require-dev": { "brianium/paratest": "^6.2", - "nunomaduro/collision": "^5.3", - "orchestra/testbench": "^6.15", + "nunomaduro/collision": "^5.3|^6.1", + "orchestra/testbench": "^6.6|^7.0", "phpunit/phpunit": "^9.3", "vimeo/psalm": "^4.8", "guzzlehttp/guzzle": "^7.0.1" From 244d62201581a848e0215b35a52450ccc08d8df0 Mon Sep 17 00:00:00 2001 From: Alessio Vertemati Date: Tue, 25 Oct 2022 09:39:35 +0200 Subject: [PATCH 5/9] Rework test matrix --- .github/workflows/run-tests.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 9ea69dc..f2bfcd5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,13 +14,8 @@ jobs: matrix: os: [ubuntu-latest] php: [8.0, 8.1] - laravel: [8.*, 9.*] + laravel: ['^8.37', '^9.0'] stability: [prefer-lowest, prefer-stable] - include: - - laravel: 8.* - testbench: ^6.6 - - laravel: 9.* - testbench: 7.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} @@ -47,7 +42,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: Execute tests From 025132baf84c89d4f3e5a829f43e05f3facd7b05 Mon Sep 17 00:00:00 2001 From: Alessio Vertemati Date: Tue, 25 Oct 2022 09:39:53 +0200 Subject: [PATCH 6/9] Add additional digits to expected output --- tests/Unit/LocalLanguageRecognizerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/LocalLanguageRecognizerTest.php b/tests/Unit/LocalLanguageRecognizerTest.php index 38eace7..0487246 100644 --- a/tests/Unit/LocalLanguageRecognizerTest.php +++ b/tests/Unit/LocalLanguageRecognizerTest.php @@ -49,7 +49,7 @@ public function it_can_recognize_a_string() $this->assertEquals([ "sco" => 1.0, - "eng" => 0.98693181818182, + "eng" => 0.9869318181818282, ], $languages); } From 4b74c2255aa6f09f101a06d2dbc704cbd9d895b8 Mon Sep 17 00:00:00 2001 From: Alessio Vertemati Date: Tue, 25 Oct 2022 09:47:30 +0200 Subject: [PATCH 7/9] Bump phpunit minum to 9.5.10 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2e8462d..03bcfac 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "brianium/paratest": "^6.2", "nunomaduro/collision": "^5.3|^6.1", "orchestra/testbench": "^6.6|^7.0", - "phpunit/phpunit": "^9.3", + "phpunit/phpunit": "^9.5.10", "vimeo/psalm": "^4.8", "guzzlehttp/guzzle": "^7.0.1" }, From 6a5cbb586506e65043aa2d0a414c22450e3fa509 Mon Sep 17 00:00:00 2001 From: Alessio Vertemati Date: Tue, 25 Oct 2022 09:51:33 +0200 Subject: [PATCH 8/9] Drop Laravel 8 --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f2bfcd5..bb90ec5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [ubuntu-latest] php: [8.0, 8.1] - laravel: ['^8.37', '^9.0'] + laravel: ['^9.0'] stability: [prefer-lowest, prefer-stable] name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 8fbbc336d794acb0ff47d0ad60d251cf8630cba3 Mon Sep 17 00:00:00 2001 From: Alessio Vertemati Date: Tue, 25 Oct 2022 09:54:58 +0200 Subject: [PATCH 9/9] Fix digit in test --- tests/Unit/LocalLanguageRecognizerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/LocalLanguageRecognizerTest.php b/tests/Unit/LocalLanguageRecognizerTest.php index 0487246..704d64b 100644 --- a/tests/Unit/LocalLanguageRecognizerTest.php +++ b/tests/Unit/LocalLanguageRecognizerTest.php @@ -49,7 +49,7 @@ public function it_can_recognize_a_string() $this->assertEquals([ "sco" => 1.0, - "eng" => 0.9869318181818282, + "eng" => 0.9869318181818182, ], $languages); }