From 47c731ce89391d2af467f181808cb5340efc8b23 Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 24 Jan 2023 21:44:11 +0000 Subject: [PATCH 1/7] Bump dependencies for Laravel 10 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 3bac900..4ff045f 100644 --- a/composer.json +++ b/composer.json @@ -17,13 +17,13 @@ ], "require": { "php": "^7.2|^8.0", - "laravel/framework": "~5.8|^6.0|^7.0|^8.0|^9.0", - "mustache/mustache": "^2.14.1" + "laravel/framework": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0", + "mustache/mustache": "^2.14.1|^2.14" }, "require-dev": { "ext-pdo_sqlite": "*", "mockery/mockery": "^1.0|^1.3.1", - "orchestra/testbench": "~3.8|^4.0|^5.0|^6.0|^7.0", + "orchestra/testbench": "~3.8|^4.0|^5.0|^6.0|^7.0|^8.0", "phpunit/phpunit": "^7.5|^8.0|^9.3" }, "autoload": { From 2949e49e25a533d9b772dec367c9cfe5839b948b Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 24 Jan 2023 21:44:11 +0000 Subject: [PATCH 2/7] Update GitHub Actions for Laravel 10 --- .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 d1bd50d..5e1d9a8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,10 +9,12 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - php: [8.2, 8.0, 7.4, 7.3, 7.2] - laravel: [8.*, 5.8, 6.*, 7.*, 8.*, 9.*] + php: [8.2, 8.0, 7.4, 7.3, 7.2, 8.1] + laravel: [8.*, 5.8, 6.*, 7.*, 8.*, 9.*, 10.*] dependency-version: [prefer-lowest, prefer-stable] include: + - laravel: 10.* + testbench: 8.* - laravel: 9.* testbench: 7.* - laravel: 8.* From b0e73d0e22b24e5b1f5f546e0545625dd21a4f9d Mon Sep 17 00:00:00 2001 From: laravel-shift Date: Tue, 24 Jan 2023 21:47:52 +0000 Subject: [PATCH 3/7] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 4c90419..c312881 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.12","version":"3.13.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":{"elements":["method","property"]},"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"ordered_imports":{"sort_algorithm":"alpha"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"single_trait_insert_per_statement":true},"hashes":{"src\/Exceptions\/CannotRenderTemplateMailable.php":"eb7655921d96d6f214c378c156f8f82a","src\/Exceptions\/MissingMailTemplate.php":"4f27bdaf5578f1c49e47ecda64ae598c","src\/Interfaces\/MailTemplateInterface.php":"0464eba1478bf93771af45c1c692e3d5","src\/MailTemplatesServiceProvider.php":"6299fc9b66e1fc89ce693da634ef3cc0","src\/TemplateMailableRenderer.php":"66b692e33b4e16c4548edc284e443435","src\/Models\/MailTemplate.php":"14264d26adf35b27748b7f78ded608cd","src\/TemplateMailable.php":"21ad95d4910d6794a92609f97dc55b4e","tests\/CustomMailTemplateTest.php":"b4ccad5f1306b28cbd3d328e89745407","tests\/stubs\/Mails\/LayoutMail.php":"52f4049e46db4e1b7103b24a7d30b66d","tests\/stubs\/Mails\/BadLayoutMail.php":"1f8b60df779164992e526c7f664e6aed","tests\/stubs\/Mails\/BasicMail.php":"40326d47d594a648280b504ee2a11b6a","tests\/stubs\/Mails\/CustomTemplateModelMail.php":"970174e4d825aeca75c25b4b61e285d6","tests\/stubs\/Models\/LayoutMailTemplate.php":"96581b0dbe44523a61e4ef3c25963cb8","tests\/stubs\/Models\/CustomMailTemplate.php":"d093379f9df235eb8f62ecf528ae872f","tests\/TemplateMailableTest.php":"056299e6a6c6fdfd1e6eda460b4d10ce","tests\/MailTemplateModelTest.php":"47fd136a71eb4f3b7cdf7c04850b2349","tests\/TestCase.php":"8e0f089954a47b21367902fb5cb9caa7"}} \ No newline at end of file +{"php":"8.1.14","version":"3.13.2","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":{"elements":["method","property"]},"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"ordered_imports":{"sort_algorithm":"alpha"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"single_trait_insert_per_statement":true},"hashes":{"src\/Interfaces\/MailTemplateInterface.php":"0464eba1478bf93771af45c1c692e3d5","src\/MailTemplatesServiceProvider.php":"6299fc9b66e1fc89ce693da634ef3cc0","src\/TemplateMailable.php":"21ad95d4910d6794a92609f97dc55b4e","src\/Models\/MailTemplate.php":"14264d26adf35b27748b7f78ded608cd","src\/TemplateMailableRenderer.php":"66b692e33b4e16c4548edc284e443435","src\/Exceptions\/MissingMailTemplate.php":"4f27bdaf5578f1c49e47ecda64ae598c","src\/Exceptions\/CannotRenderTemplateMailable.php":"eb7655921d96d6f214c378c156f8f82a","tests\/TestCase.php":"8e0f089954a47b21367902fb5cb9caa7","tests\/MailTemplateModelTest.php":"47fd136a71eb4f3b7cdf7c04850b2349","tests\/stubs\/Models\/CustomMailTemplate.php":"d093379f9df235eb8f62ecf528ae872f","tests\/stubs\/Models\/LayoutMailTemplate.php":"96581b0dbe44523a61e4ef3c25963cb8","tests\/stubs\/Mails\/BadLayoutMail.php":"1f8b60df779164992e526c7f664e6aed","tests\/stubs\/Mails\/BasicMail.php":"40326d47d594a648280b504ee2a11b6a","tests\/stubs\/Mails\/CustomTemplateModelMail.php":"970174e4d825aeca75c25b4b61e285d6","tests\/stubs\/Mails\/LayoutMail.php":"52f4049e46db4e1b7103b24a7d30b66d","tests\/TemplateMailableTest.php":"056299e6a6c6fdfd1e6eda460b4d10ce","tests\/CustomMailTemplateTest.php":"b4ccad5f1306b28cbd3d328e89745407"}} \ No newline at end of file From 490c13b30509f46a8b7b9048bdade529da8ec3f0 Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Wed, 25 Jan 2023 00:03:12 +0000 Subject: [PATCH 4/7] wip --- .github/workflows/run-tests.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5e1d9a8..761760c 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,7 +9,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - php: [8.2, 8.0, 7.4, 7.3, 7.2, 8.1] + php: [8.2, 8.1, 8.0, 7.4, 7.3, 7.2] laravel: [8.*, 5.8, 6.*, 7.*, 8.*, 9.*, 10.*] dependency-version: [prefer-lowest, prefer-stable] include: @@ -73,6 +73,14 @@ jobs: php: 7.3 - laravel: 9.* php: 7.4 + - laravel: 10.* + php: 7.2 + - laravel: 10.* + php: 7.3 + - laravel: 10.* + php: 7.4 + - laravel: 10.* + php: 8.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} From 13ac6890415628b320e4e1ed37454ef7510d7ac7 Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Wed, 25 Jan 2023 00:09:58 +0000 Subject: [PATCH 5/7] wip --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4ff045f..e0ea2ac 100644 --- a/composer.json +++ b/composer.json @@ -49,5 +49,7 @@ "Spatie\\MailTemplates\\MailTemplatesServiceProvider" ] } - } + }, + "minimum-stability": "dev", + "prefer-stable": true } From 3162bf8f2e392aa1c94e61ff9308fa031a0531a9 Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Wed, 25 Jan 2023 00:13:40 +0000 Subject: [PATCH 6/7] wip --- .github/workflows/run-tests.yml | 55 ++------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 761760c..3deb2a5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,8 +9,8 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - php: [8.2, 8.1, 8.0, 7.4, 7.3, 7.2] - laravel: [8.*, 5.8, 6.*, 7.*, 8.*, 9.*, 10.*] + php: [8.2, 8.1, 8.0] + laravel: [8.*, 9.*, 10.*] dependency-version: [prefer-lowest, prefer-stable] include: - laravel: 10.* @@ -19,44 +19,7 @@ jobs: testbench: 7.* - laravel: 8.* testbench: 6.* - - laravel: 7.* - testbench: 5.* - - laravel: 6.* - testbench: 4.* - - laravel: 5.8 - testbench: 3.8 exclude: - # excludes prefer-lowest 5.8 test on php 7.4 - - laravel: 5.8 - php: 7.4 - dependency-version: prefer-lowest - - laravel: 5.8 - php: 8.0 - dependency-version: prefer-stable - - laravel: 5.8 - php: 8.0 - dependency-version: prefer-lowest - - laravel: 5.8 - php: 8.2 - dependency-version: prefer-lowest - - laravel: 5.8 - php: 8.2 - dependency-version: prefer-stable - - laravel: 5.8 - php: 8.2 - dependency-version: prefer-lowest - - laravel: 6.* - php: 8.0 - dependency-version: prefer-lowest - - laravel: 7.* - php: 8.0 - dependency-version: prefer-lowest - - laravel: 7.* - php: 8.2 - dependency-version: prefer-lowest - - laravel: 7.* - php: 8.2 - dependency-version: prefer-stable - laravel: 8.* php: 8.0 dependency-version: prefer-lowest @@ -65,20 +28,6 @@ jobs: dependency-version: prefer-lowest - laravel: 6.* php: 8.2 - - laravel: 8.* - php: 7.2 - - laravel: 9.* - php: 7.2 - - laravel: 9.* - php: 7.3 - - laravel: 9.* - php: 7.4 - - laravel: 10.* - php: 7.2 - - laravel: 10.* - php: 7.3 - - laravel: 10.* - php: 7.4 - laravel: 10.* php: 8.0 From 97fa9a5a03df365c0127d75f7b2f841a6842ae27 Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Wed, 25 Jan 2023 00:15:06 +0000 Subject: [PATCH 7/7] Update run-tests.yml --- .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 3deb2a5..911a011 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -11,7 +11,7 @@ jobs: os: [ubuntu-latest] php: [8.2, 8.1, 8.0] laravel: [8.*, 9.*, 10.*] - dependency-version: [prefer-lowest, prefer-stable] + dependency-version: [prefer-stable] include: - laravel: 10.* testbench: 8.*