From 940da51c2ced19c6e9ba827fc02a399d18318589 Mon Sep 17 00:00:00 2001 From: Shift Date: Wed, 1 Feb 2023 17:23:26 +0000 Subject: [PATCH 1/5] Bump dependencies for Laravel 10 --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 9ea0304..f364bcc 100644 --- a/composer.json +++ b/composer.json @@ -29,17 +29,17 @@ } ], "require": { - "php": "^8.0 || ^8.1 || ^8.2", - "illuminate/support": "^9.0", + "php": "^8.1", + "illuminate/support": "^10.0", "symfony/http-foundation": "^6.0" }, "require-dev": { - "livewire/livewire": "^2.0", - "mockery/mockery": "^1.3.3", - "nesbot/carbon": "^2.63", - "orchestra/testbench-browser-kit": "^7.0", - "phpunit/phpunit": "^9.5", - "spatie/laravel-translatable": "^5.0", + "livewire/livewire": "^2.11", + "mockery/mockery": "^1.4.4", + "nesbot/carbon": "^2.66", + "orchestra/testbench-browser-kit": "^7.12", + "phpunit/phpunit": "^9.5.10", + "spatie/laravel-translatable": "^6.3", "symfony/dom-crawler": "^6.0" }, "autoload": { From 8405087cfbb41a1baa4b7bcfdfac36e2e7c189df Mon Sep 17 00:00:00 2001 From: Shift Date: Wed, 1 Feb 2023 17:23:26 +0000 Subject: [PATCH 2/5] Update GitHub Actions for Laravel 10 --- .github/workflows/run-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index dc0a6d3..70dbbd5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -8,13 +8,13 @@ jobs: strategy: fail-fast: true matrix: - php: [8.2, 8.1, 8.0] - laravel: [9.*] + php: [8.1] + laravel: [10.*] framework: [tailwind, tailwind-2, tailwind-forms-simple, bootstrap-4, bootstrap-5] dependency-version: [prefer-lowest, prefer-stable] include: - - laravel: 9.* - testbench: 7.* + - laravel: 10.* + testbench: 8.* name: P${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }} - Front-end Framework ${{ matrix.framework }} From 27617b04fa1de959f814260587ceb17d296be058 Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Tue, 21 Feb 2023 22:08:17 +0100 Subject: [PATCH 3/5] WIP --- .github/workflows/run-tests.yml | 6 ++++-- composer.json | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 70dbbd5..d0afd8c 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -8,13 +8,15 @@ jobs: strategy: fail-fast: true matrix: - php: [8.1] - laravel: [10.*] + php: [8.2, 8.1] + laravel: [10.*, 9.*] framework: [tailwind, tailwind-2, tailwind-forms-simple, bootstrap-4, bootstrap-5] dependency-version: [prefer-lowest, prefer-stable] include: - laravel: 10.* testbench: 8.* + - laravel: 9.* + testbench: 7.* name: P${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }} - Front-end Framework ${{ matrix.framework }} diff --git a/composer.json b/composer.json index f364bcc..8148821 100644 --- a/composer.json +++ b/composer.json @@ -29,17 +29,17 @@ } ], "require": { - "php": "^8.1", - "illuminate/support": "^10.0", + "php": "^8.1 || ^8.2", + "illuminate/support": "^9.0 || ^10.0", "symfony/http-foundation": "^6.0" }, "require-dev": { - "livewire/livewire": "^2.11", + "livewire/livewire": "^2.12", "mockery/mockery": "^1.4.4", "nesbot/carbon": "^2.66", - "orchestra/testbench-browser-kit": "^7.12", - "phpunit/phpunit": "^9.5.10", - "spatie/laravel-translatable": "^6.3", + "orchestra/testbench-browser-kit": "^7.0 || ^8.0", + "phpunit/phpunit": "^9.5", + "spatie/laravel-translatable": "^5.0", "symfony/dom-crawler": "^6.0" }, "autoload": { @@ -68,4 +68,4 @@ ] } } -} +} \ No newline at end of file From 44a68e5044382ca92ae832be9fca5dc9576a7693 Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Tue, 21 Feb 2023 22:10:01 +0100 Subject: [PATCH 4/5] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8148821..423bfc0 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "nesbot/carbon": "^2.66", "orchestra/testbench-browser-kit": "^7.0 || ^8.0", "phpunit/phpunit": "^9.5", - "spatie/laravel-translatable": "^5.0", + "spatie/laravel-translatable": "^6.0", "symfony/dom-crawler": "^6.0" }, "autoload": { From da4f67d5bc62b33f06b22242d965af883eb50681 Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Tue, 21 Feb 2023 22:23:16 +0100 Subject: [PATCH 5/5] L10 fixes --- tests/Feature/LivewireTest.php | 8 ++++---- tests/Feature/MultipleSelectTest.php | 2 +- tests/Feature/TranslationTest.php | 4 ++-- tests/TestCase.php | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/Feature/LivewireTest.php b/tests/Feature/LivewireTest.php index cadd659..a069dc4 100644 --- a/tests/Feature/LivewireTest.php +++ b/tests/Feature/LivewireTest.php @@ -98,8 +98,8 @@ public function it_can_validate_the_fields() ->assertSeeHtml('The textarea field is required') ->assertSeeHtml('The select field is required') ->assertSeeHtml('The multi select field is required') - ->assertSeeHtml('The checkbox must be accepted') - ->assertSeeHtml('The radio must be accepted'); + ->assertSeeHtml(TestCase::isLaravel10() ? 'The checkbox field must be accepted' : 'The checkbox must be accepted') + ->assertSeeHtml(TestCase::isLaravel10() ? 'The radio field must be accepted' : 'The radio must be accepted'); } /** @test */ @@ -125,8 +125,8 @@ public function it_can_add_a_modifier_to_the_wire_directive() ->assertSeeHtml('The textarea field is required') ->assertSeeHtml('The select field is required') ->assertSeeHtml('The multi select field is required') - ->assertSeeHtml('The checkbox must be accepted') - ->assertSeeHtml('The radio must be accepted'); + ->assertSeeHtml(TestCase::isLaravel10() ? 'The checkbox field must be accepted' : 'The checkbox must be accepted') + ->assertSeeHtml(TestCase::isLaravel10() ? 'The radio field must be accepted' : 'The radio must be accepted'); } /** @test */ diff --git a/tests/Feature/MultipleSelectTest.php b/tests/Feature/MultipleSelectTest.php index 5bebb27..fbc945d 100644 --- a/tests/Feature/MultipleSelectTest.php +++ b/tests/Feature/MultipleSelectTest.php @@ -22,6 +22,6 @@ public function it_posts_all_selected_options() ->press('Submit') ->seeElement('option[value="be"]:selected') ->seeElement('option[value="nl"]:selected') - ->seeText('The select must be a string.'); + ->seeText(static::isLaravel10() ? 'The select field must be a string.' : 'The select must be a string.'); } } diff --git a/tests/Feature/TranslationTest.php b/tests/Feature/TranslationTest.php index 1100044..a747905 100644 --- a/tests/Feature/TranslationTest.php +++ b/tests/Feature/TranslationTest.php @@ -52,7 +52,7 @@ public function it_shows_the_validation_errors_and_old_values_correctly() ->press('Submit') ->seeElement('input[name="input[nl]"][value="hoi"]') ->seeElement('input[name="input[en]"][value="hey"]') - ->seeText('The input.nl must be at least 5 characters') - ->seeText('The input.en must be at least 5 characters'); + ->seeText(static::isLaravel10() ? 'The input.nl field must be at least 5 characters' : 'The input.nl must be at least 5 characters') + ->seeText(static::isLaravel10() ? 'The input.en field must be at least 5 characters' : 'The input.en must be at least 5 characters'); } } diff --git a/tests/TestCase.php b/tests/TestCase.php index 1bb40cb..ea6b08c 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -12,6 +12,11 @@ abstract class TestCase extends BaseTestCase { protected $baseUrl = 'http://localhost'; + public static function isLaravel10(): bool + { + return version_compare(app()->version(), '10.0', '>='); + } + public function setUp(): void { parent::setUp();