Skip to content

Commit

Permalink
Merge pull request #61 from laravel-shift/l11-compatibility
Browse files Browse the repository at this point in the history
Laravel 11.x Compatibility
  • Loading branch information
freekmurze authored Apr 2, 2024
2 parents a831de9 + 0e953a8 commit 6d6dfd3
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 58 deletions.
118 changes: 64 additions & 54 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,68 @@
name: run-tests

on: [push, pull_request]
on:
- push
- pull_request

jobs:
test:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
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.*
exclude:
- laravel: 8.*
php: 8.0
dependency-version: prefer-lowest
- laravel: 8.*
php: 8.2
dependency-version: prefer-lowest
- laravel: 6.*
php: 8.2
- laravel: 10.*
php: 8.0

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}

steps:
- name: Checkout code
uses: actions/checkout@v1

- name: Cache dependencies
uses: actions/cache@v1
with:
path: ~/.composer/cache/files
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
coverage: none

- name: Install dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
- name: Execute tests
run: vendor/bin/phpunit
test:
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
php: [8.2, 8.1, 8.0]
laravel: ['8.*', '9.*', '10.*', '11.*']
dependency-version: [prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 9.*
testbench: 7.*
- laravel: 8.*
testbench: 6.*
- laravel: 11.*
testbench: 9.*
exclude:
- laravel: 8.*
php: 8.0
dependency-version: prefer-lowest
- laravel: 8.*
php: 8.2
dependency-version: prefer-lowest
- laravel: 6.*
php: 8.2
- laravel: 10.*
php: 8.0
- laravel: 11.*
php: 8.1
- laravel: 11.*
php: 8.0

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}

steps:
- name: Checkout code
uses: actions/checkout@v1

- name: Cache dependencies
uses: actions/cache@v1
with:
path: ~/.composer/cache/files
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
coverage: none

- name: Install dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
- name: Execute tests
run: vendor/bin/phpunit
2 changes: 1 addition & 1 deletion .php-cs-fixer.cache
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"php":"8.2.9","version":"3.24.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"class_definition":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"curly_braces_position":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_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":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,"spaces_inside_parentheses":true,"statement_indentation":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\/TemplateMailableRenderer.php":"66b692e33b4e16c4548edc284e443435","src\/MailTemplatesServiceProvider.php":"6299fc9b66e1fc89ce693da634ef3cc0","src\/TemplateMailable.php":"21ad95d4910d6794a92609f97dc55b4e","src\/Interfaces\/MailTemplateInterface.php":"0464eba1478bf93771af45c1c692e3d5","src\/Models\/MailTemplate.php":"14264d26adf35b27748b7f78ded608cd","src\/Exceptions\/MissingMailTemplate.php":"4f27bdaf5578f1c49e47ecda64ae598c","src\/Exceptions\/CannotRenderTemplateMailable.php":"eb7655921d96d6f214c378c156f8f82a","tests\/TemplateMailableTest.php":"056299e6a6c6fdfd1e6eda460b4d10ce","tests\/CustomMailTemplateTest.php":"b4ccad5f1306b28cbd3d328e89745407","tests\/MailTemplateModelTest.php":"47fd136a71eb4f3b7cdf7c04850b2349","tests\/TestCase.php":"8e0f089954a47b21367902fb5cb9caa7","tests\/stubs\/Mails\/BasicMail.php":"40326d47d594a648280b504ee2a11b6a","tests\/stubs\/Mails\/BadLayoutMail.php":"1f8b60df779164992e526c7f664e6aed","tests\/stubs\/Mails\/CustomTemplateModelMail.php":"970174e4d825aeca75c25b4b61e285d6","tests\/stubs\/Mails\/LayoutMail.php":"52f4049e46db4e1b7103b24a7d30b66d","tests\/stubs\/Models\/CustomMailTemplate.php":"d093379f9df235eb8f62ecf528ae872f","tests\/stubs\/Models\/LayoutMailTemplate.php":"96581b0dbe44523a61e4ef3c25963cb8"}}
{"php":"8.3.3","version":"3.51.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces_position":true,"class_definition":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":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_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":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,"spaces_inside_parentheses":true,"statement_indentation":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\/MailTemplatesServiceProvider.php":"6299fc9b66e1fc89ce693da634ef3cc0","src\/Interfaces\/MailTemplateInterface.php":"0464eba1478bf93771af45c1c692e3d5","src\/Exceptions\/MissingMailTemplate.php":"4f27bdaf5578f1c49e47ecda64ae598c","src\/Exceptions\/CannotRenderTemplateMailable.php":"eb7655921d96d6f214c378c156f8f82a","src\/TemplateMailable.php":"21ad95d4910d6794a92609f97dc55b4e","src\/Models\/MailTemplate.php":"14264d26adf35b27748b7f78ded608cd","src\/TemplateMailableRenderer.php":"66b692e33b4e16c4548edc284e443435","tests\/TemplateMailableTest.php":"056299e6a6c6fdfd1e6eda460b4d10ce","tests\/stubs\/Mails\/BasicMail.php":"40326d47d594a648280b504ee2a11b6a","tests\/stubs\/Mails\/LayoutMail.php":"52f4049e46db4e1b7103b24a7d30b66d","tests\/stubs\/Mails\/BadLayoutMail.php":"1f8b60df779164992e526c7f664e6aed","tests\/stubs\/Mails\/CustomTemplateModelMail.php":"970174e4d825aeca75c25b4b61e285d6","tests\/stubs\/Models\/CustomMailTemplate.php":"d093379f9df235eb8f62ecf528ae872f","tests\/stubs\/Models\/LayoutMailTemplate.php":"96581b0dbe44523a61e4ef3c25963cb8","tests\/MailTemplateModelTest.php":"47fd136a71eb4f3b7cdf7c04850b2349","tests\/TestCase.php":"8e0f089954a47b21367902fb5cb9caa7","tests\/CustomMailTemplateTest.php":"b4ccad5f1306b28cbd3d328e89745407"}}
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
],
"require": {
"php": "^7.2|^8.0",
"laravel/framework": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0",
"laravel/framework": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.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|^8.0",
"phpunit/phpunit": "^7.5|^8.0|^9.3"
"orchestra/testbench": "~3.8|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0",
"phpunit/phpunit": "^7.5|^8.0|^9.3|^10.5"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 6d6dfd3

Please sign in to comment.