Merge pull request #50 from laravel-shift/l10-compatibility

Laravel 10.x Compatibility
spatie · Jan 25, 2023 · ebba166 · ebba166
2 parents 27732d0 + 97fa9a5
commit ebba166
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 53 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,52 +9,17 @@ 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.*]
-                dependency-version: [prefer-lowest, prefer-stable]
+                php: [8.2, 8.1, 8.0]
+                laravel: [8.*, 9.*, 10.*]
+                dependency-version: [prefer-stable]
                 include:
+                    -   laravel: 10.*
+                        testbench: 8.*
                     -   laravel: 9.*
                         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
@@ -63,14 +28,8 @@ 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: 8.0
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 

diff --git 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"}}
+{"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"}}
diff --git 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": {
@@ -49,5 +49,7 @@
                 "Spatie\\MailTemplates\\MailTemplatesServiceProvider"
             ]
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }