From cb3ec4819704db9ee7236fbdf2d5b339c0ecdccb Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 2 Mar 2024 15:30:24 +0000 Subject: [PATCH 1/4] Bump dependencies for Laravel 11 --- composer.json | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index b7f25b1..6485199 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,15 @@ { "name": "cachethq/badger", "description": "A badge generator for Laravel.", - "keywords": ["badger", "badge", "shield", "svg", "Badger", "Cachet", "CachetHQ"], + "keywords": [ + "badger", + "badge", + "shield", + "svg", + "Badger", + "Cachet", + "CachetHQ" + ], "license": "MIT", "support": { "issues": "https://github.com/cachethq/badger/issues", @@ -15,11 +23,11 @@ ], "require": { "php": "^8.0", - "illuminate/contracts": "^8.0|^9.0|^10.0", - "illuminate/support": "^8.0|^9.0|^10.0" + "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0" }, "require-dev": { - "orchestra/testbench": "^8.8", + "orchestra/testbench": "^8.8|^9.0", "pestphp/pest": "^2.13", "pestphp/pest-plugin-laravel": "^2.2" }, From be2b3cb6fdc67c1819539ff96342cc1e01550738 Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 2 Mar 2024 15:30:25 +0000 Subject: [PATCH 2/4] Update GitHub Actions for Laravel 11 --- .github/workflows/run-tests.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8c108e6..696a88d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -1,22 +1,28 @@ name: run-tests -on: [push, pull_request] +on: + - push + - pull_request jobs: test: runs-on: ${{ matrix.os }} + strategy: fail-fast: true matrix: os: [ubuntu-latest] php: [8.2, 8.1] - laravel: [10.*] + laravel: ['10.*', '11.*'] stability: [prefer-lowest, prefer-stable] include: - laravel: 10.* testbench: 8.* pest: ^2.13 pest_laravel: ^2.0 + exclude: + - laravel: 11.* + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 785bf0ac100ecb8f5b207684a04a187e441fc058 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 13 Mar 2024 08:30:44 +0000 Subject: [PATCH 3/4] wip --- composer.json | 8 ++++---- .../it_can_generate_badges_from_a_string.snap | 18 ++++++++--------- ...n_generate_badges_with_a_custom_color.snap | 18 ++++++++--------- .../it_can_generate_plastic_badges.snap | 18 ++++++++--------- ...render_alt_three_awesome_bright_green.snap | 18 ++++++++--------- .../it_can_render_alt_three_dead_red.snap | 12 +++++------ ...render_alt_three_awesome_bright_green.snap | 18 ++++++++--------- .../it_can_render_alt_three_dead_red.snap | 12 +++++------ ...render_alt_three_awesome_bright_green.snap | 18 ++++++++--------- .../it_can_render_alt_three_dead_red.snap | 12 +++++------ ...render_alt_three_awesome_yellow_green.snap | 20 +++++++++---------- .../it_can_render_alt_three_dead_red.snap | 18 ++++++++--------- tests/Calculator/GDTextSizeCalculatorTest.php | 2 +- tests/TestCase.php | 2 +- 14 files changed, 97 insertions(+), 97 deletions(-) diff --git a/composer.json b/composer.json index f9f8610..11381ae 100644 --- a/composer.json +++ b/composer.json @@ -22,12 +22,12 @@ } ], "require": { - "php": "^8.0", - "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0", - "illuminate/support": "^8.0|^9.0|^10.0|^11.0" + "php": "^8.2", + "illuminate/contracts": "^11.0", + "illuminate/support": "^11.0" }, "require-dev": { - "orchestra/testbench": "^8.8|^9.0", + "orchestra/testbench": "^9.0", "pestphp/pest": "^2.13", "pestphp/pest-plugin-laravel": "^2.2" }, diff --git a/tests/.pest/snapshots/BadgerTest/it_can_generate_badges_from_a_string.snap b/tests/.pest/snapshots/BadgerTest/it_can_generate_badges_from_a_string.snap index 59d4f36..79b0bac 100644 --- a/tests/.pest/snapshots/BadgerTest/it_can_generate_badges_from_a_string.snap +++ b/tests/.pest/snapshots/BadgerTest/it_can_generate_badges_from_a_string.snap @@ -1,18 +1,18 @@ - + - - - - + + + + - license - license - MIT - MIT + license + license + MIT + MIT diff --git a/tests/.pest/snapshots/BadgerTest/it_can_generate_badges_with_a_custom_color.snap b/tests/.pest/snapshots/BadgerTest/it_can_generate_badges_with_a_custom_color.snap index c2c87f7..1711e91 100644 --- a/tests/.pest/snapshots/BadgerTest/it_can_generate_badges_with_a_custom_color.snap +++ b/tests/.pest/snapshots/BadgerTest/it_can_generate_badges_with_a_custom_color.snap @@ -1,18 +1,18 @@ - + - - - - + + + + - license - license - MIT - MIT + license + license + MIT + MIT diff --git a/tests/.pest/snapshots/BadgerTest/it_can_generate_plastic_badges.snap b/tests/.pest/snapshots/BadgerTest/it_can_generate_plastic_badges.snap index 96c8277..0887fa1 100644 --- a/tests/.pest/snapshots/BadgerTest/it_can_generate_plastic_badges.snap +++ b/tests/.pest/snapshots/BadgerTest/it_can_generate_plastic_badges.snap @@ -1,18 +1,18 @@ - + - - - - + + + + - license - license - MIT - MIT + license + license + MIT + MIT diff --git a/tests/.pest/snapshots/Render/FlatSquareRenderTest/it_can_render_alt_three_awesome_bright_green.snap b/tests/.pest/snapshots/Render/FlatSquareRenderTest/it_can_render_alt_three_awesome_bright_green.snap index 42cdd43..4aa6083 100644 --- a/tests/.pest/snapshots/Render/FlatSquareRenderTest/it_can_render_alt_three_awesome_bright_green.snap +++ b/tests/.pest/snapshots/Render/FlatSquareRenderTest/it_can_render_alt_three_awesome_bright_green.snap @@ -1,20 +1,20 @@ - + - + - - - + + + - Alt Three - Alt Three - Awesome - Awesome + Alt Three + Alt Three + Awesome + Awesome diff --git a/tests/.pest/snapshots/Render/FlatSquareRenderTest/it_can_render_alt_three_dead_red.snap b/tests/.pest/snapshots/Render/FlatSquareRenderTest/it_can_render_alt_three_dead_red.snap index 4ff21f2..9fdaaf1 100644 --- a/tests/.pest/snapshots/Render/FlatSquareRenderTest/it_can_render_alt_three_dead_red.snap +++ b/tests/.pest/snapshots/Render/FlatSquareRenderTest/it_can_render_alt_three_dead_red.snap @@ -7,14 +7,14 @@ - - + + - Alt Three - Alt Three - Dead - Dead + Alt Three + Alt Three + Dead + Dead diff --git a/tests/.pest/snapshots/Render/PlasticFlatRenderTest/it_can_render_alt_three_awesome_bright_green.snap b/tests/.pest/snapshots/Render/PlasticFlatRenderTest/it_can_render_alt_three_awesome_bright_green.snap index b1f5299..ffe8739 100644 --- a/tests/.pest/snapshots/Render/PlasticFlatRenderTest/it_can_render_alt_three_awesome_bright_green.snap +++ b/tests/.pest/snapshots/Render/PlasticFlatRenderTest/it_can_render_alt_three_awesome_bright_green.snap @@ -1,20 +1,20 @@ - + - + - - - + + + - Alt Three - Alt Three - Awesome - Awesome + Alt Three + Alt Three + Awesome + Awesome diff --git a/tests/.pest/snapshots/Render/PlasticFlatRenderTest/it_can_render_alt_three_dead_red.snap b/tests/.pest/snapshots/Render/PlasticFlatRenderTest/it_can_render_alt_three_dead_red.snap index 48e3392..c9ab65e 100644 --- a/tests/.pest/snapshots/Render/PlasticFlatRenderTest/it_can_render_alt_three_dead_red.snap +++ b/tests/.pest/snapshots/Render/PlasticFlatRenderTest/it_can_render_alt_three_dead_red.snap @@ -7,14 +7,14 @@ - - + + - Alt Three - Alt Three - Dead - Dead + Alt Three + Alt Three + Dead + Dead diff --git a/tests/.pest/snapshots/Render/PlasticRenderTest/it_can_render_alt_three_awesome_bright_green.snap b/tests/.pest/snapshots/Render/PlasticRenderTest/it_can_render_alt_three_awesome_bright_green.snap index d264f4c..e608eb3 100644 --- a/tests/.pest/snapshots/Render/PlasticRenderTest/it_can_render_alt_three_awesome_bright_green.snap +++ b/tests/.pest/snapshots/Render/PlasticRenderTest/it_can_render_alt_three_awesome_bright_green.snap @@ -1,18 +1,18 @@ - + - - - - + + + + - Alt Three - Alt Three - Awesome - Awesome + Alt Three + Alt Three + Awesome + Awesome diff --git a/tests/.pest/snapshots/Render/PlasticRenderTest/it_can_render_alt_three_dead_red.snap b/tests/.pest/snapshots/Render/PlasticRenderTest/it_can_render_alt_three_dead_red.snap index 6db2e02..9ea29ff 100644 --- a/tests/.pest/snapshots/Render/PlasticRenderTest/it_can_render_alt_three_dead_red.snap +++ b/tests/.pest/snapshots/Render/PlasticRenderTest/it_can_render_alt_three_dead_red.snap @@ -6,13 +6,13 @@ - - + + - Alt Three - Alt Three - Dead - Dead + Alt Three + Alt Three + Dead + Dead diff --git a/tests/.pest/snapshots/Render/SocialRenderTest/it_can_render_alt_three_awesome_yellow_green.snap b/tests/.pest/snapshots/Render/SocialRenderTest/it_can_render_alt_three_awesome_yellow_green.snap index e236a8a..45214a4 100644 --- a/tests/.pest/snapshots/Render/SocialRenderTest/it_can_render_alt_three_awesome_yellow_green.snap +++ b/tests/.pest/snapshots/Render/SocialRenderTest/it_can_render_alt_three_awesome_yellow_green.snap @@ -1,4 +1,4 @@ - +