WIP

.github/workflows/run-stub-tests.yml

@@ -10,8 +10,10 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-22.04, windows-latest]
-        php: [8.2, 8.1]
-        laravel: [10.2]
+        php: [8.3, 8.2]
+        laravel: [11.0, 10.2]
+        exclude:
+          - laravel: 11.0
 
     name: Test Stubs ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }}
 

.github/workflows/run-table-tests.yml

@@ -8,25 +8,21 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.1, 8.0]
-        laravel: [10.0, 9.0]
+        php: [8.3, 8.2]
+        laravel: [11.0, 10.0]
         db: [mysql, postgres, sqlite]
         ssr: [true, false]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 9.0
-            testbench: 7.*
+          - laravel: 11.0
+            testbench: 9.*
           - laravel: 10.0
             testbench: 8.*
         exclude:
-          - ssr: true
-            dependency-version: prefer-lowest
-          - ssr: true
-            php: 8.1
-          - ssr: true
-            php: 8.0
-          - laravel: 10.0
-            php: 8.0
+          - dependency-version: prefer-lowest
+            ssr: true
+          - php: 8.2
+            ssr: true
           - db: mysql
             ssr: true
           - db: postgres

.github/workflows/run-tests.yml

@@ -8,24 +8,20 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.1, 8.0]
-        laravel: [10.0, 9.0]
+        php: [8.3, 8.2]
+        laravel: [11.0, 10.0]
         ssr: [true, false]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 9.0
-            testbench: 7.*
+          - laravel: 11.0
+            testbench: 9.*
           - laravel: 10.0
             testbench: 8.*
         exclude:
           - ssr: true
             dependency-version: prefer-lowest
           - ssr: true
-            php: 8.1
-          - ssr: true
-            php: 8.0
-          - laravel: 10.0
-            php: 8.0
+            php: 8.2
 
     name: Test P${{ matrix.php }} - L${{ matrix.laravel }} - SSR ${{ matrix.ssr }} - ${{ matrix.dependency-version }}
 

app/.phpunit.cache/test-results

@@ -0,0 +1 @@
+{"version":1,"defects":{"Tests\\Unit\\ExistingFileTest::it_can_load_a_file_from_a_public_disk":8,"Tests\\Unit\\ExistingFileTest::it_can_load_a_file_from_a_disk_without_a_preview":8,"Tests\\Unit\\ExistingFileTest::it_can_load_multiple_files_at_once":8,"Tests\\Unit\\ExistingFileTest::it_can_serialize_the_instance_and_make_an_instance_out_of_it":8},"times":{"Tests\\Unit\\BladeDirectivesTest::it_parses_the_expression_into_a_name_and_function":0.007,"Tests\\Unit\\BladeDirectivesTest::it_parses_the_expression_without_a_second_argument":0,"Tests\\Unit\\BladeDirectivesTest::it_parses_the_expression_into_a_name_and_function_and_you_can_use_the_key":0,"Tests\\Unit\\BladeDirectivesTest::it_parses_the_expression_into_a_name_and_function_and_use_a_variable_from_outside_the_scope":0,"Tests\\Unit\\Bridge\\ComponentControllerTest::it_aborts_when_the_request_is_incomplete":0.024,"Tests\\Unit\\Bridge\\ComponentControllerTest::it_aborts_when_the_request_has_no_valid_signature":0.002,"Tests\\Unit\\Bridge\\ComponentControllerTest::it_aborts_when_it_cant_resolve_the_instance":0.126,"Tests\\Unit\\Bridge\\ComponentControllerTest::it_applies_the_original_middleware":0.004,"Tests\\Unit\\Bridge\\ComponentControllerTest::it_makes_sure_the_component_method_exists":0.02,"Tests\\Unit\\Bridge\\ComponentControllerTest::it_calls_the_method_without_parameters":0.004,"Tests\\Unit\\Bridge\\ComponentControllerTest::it_calls_the_method_with_a_parameter":0.002,"Tests\\Unit\\Bridge\\ComponentMiddlewareTest::it_resolves_the_route_middleware":0.001,"Tests\\Unit\\Bridge\\ComponentMiddlewareTest::it_substitutes_the_original_bindings":0.001,"Tests\\Unit\\Bridge\\ComponentStateTest::it_can_generate_and_validate_signatures":0.001,"Tests\\Unit\\Bridge\\ComponentStateTest::it_throws_an_exception_when_the_component_can_not_be_resolved":0.048,"Tests\\Unit\\Bridge\\ComponentStateTest::it_can_resolve_an_encrypted_component_from_the_request":0,"Tests\\Unit\\Bridge\\ComponentStateTest::it_can_resolve_an_encrypted_component_from_the_request_and_merge_the_given_props":0.002,"Tests\\Unit\\CleanupTemporaryFileUploadsTest::it_will_clean_files_older_than_one_hour":0.011,"Tests\\Unit\\ExistingFileTest::it_can_load_a_file_from_a_public_disk":0.005,"Tests\\Unit\\ExistingFileTest::it_can_load_a_file_from_a_public_disk_and_generate_a_temporary_url_for_the_preview":0.001,"Tests\\Unit\\ExistingFileTest::it_can_load_a_file_from_a_disk_without_a_preview":0,"Tests\\Unit\\ExistingFileTest::it_throws_an_exception_if_the_file_does_not_exist":0,"Tests\\Unit\\ExistingFileTest::it_can_load_multiple_files_at_once":0,"Tests\\Unit\\ExistingFileTest::it_can_serialize_the_instance_and_make_an_instance_out_of_it":0,"Tests\\Unit\\ExistingFileTest::it_can_load_a_file_from_the_spatie_media_library":0.003,"Tests\\Unit\\ExistingFileTest::it_can_load_a_file_from_the_spatie_media_library_with_a_different_preview_conversion":0.002,"Tests\\Unit\\ExistingFileTest::it_can_load_multiple_files_from_the_spatie_media_library":0.001,"Tests\\Unit\\HeadTest::it_trims_the_title":0,"Tests\\Unit\\HeadTest::it_prepends_the_prefix":0,"Tests\\Unit\\HeadTest::it_doesnt_prepend_the_prefix_if_its_the_same_as_the_title":0,"Tests\\Unit\\HeadTest::it_appends_the_prefix":0,"Tests\\Unit\\HeadTest::it_doesnt_append_the_suffix_if_its_the_same_as_the_title":0,"Tests\\Unit\\HeadTest::it_can_fill_the_twitter_defaults":0,"Tests\\Unit\\HeadTest::it_can_fill_the_open_graph_defaults":0,"Tests\\Unit\\HeadTest::it_can_fill_the_twitter_defaults_and_then_auto_fills":0,"Tests\\Unit\\HeadTest::it_can_fill_the_open_graph_defaults_and_then_auto_fills":0,"Tests\\Unit\\HeadTest::it_can_render_the_canonical_link":0.001,"Tests\\Unit\\HeadTest::it_is_macroable":0,"Tests\\Unit\\SerializesNewModelsTest::it_serializes_and_restores_existing_models":0.001,"Tests\\Unit\\SerializesNewModelsTest::it_serializes_and_restores_new_models":0,"Tests\\Unit\\SerializesNewModelsTest::it_serializes_and_restores_a_collection_of_existing_models":0.001,"Tests\\Unit\\SerializesNewModelsTest::it_serializes_and_restores_a_collection_of_new_models":0,"Tests\\Unit\\SerializesNewModelsTest::it_serializes_and_restores_a_collection_of_mixed_models":0.001,"Tests\\Unit\\SpladeCoreTest::it_generates_a_regular_redirect_on_non_splade_requests":0,"Tests\\Unit\\SpladeCoreTest::it_can_generate_a_409_response_with_a_target_url":0,"Tests\\Unit\\SpladeCoreTest::it_can_use_a_custom_exception_hanlder":0.004,"Tests\\Unit\\SpladeMiddlewareTest::it_can_format_a_url_into_a_host_and_port_with_defaults":0,"Tests\\Unit\\SpladeQueryBuilderTest::it_can_parse_terms":0.004,"Tests\\Unit\\SpladeQueryBuilderTest::it_can_apply_sorting_with_a_closure":0.001,"Tests\\Unit\\SpladeTableTest::it_can_use_a_default_sort_key":0,"Tests\\Unit\\SpladeTableTest::it_prevents_double_pagination":0.001,"Tests\\Unit\\TableExporterTest::it_can_generate_an_array_with_the_headings":0.002,"Tests\\Unit\\TableExporterTest::it_can_generate_an_array_with_the_column_formatting":0.001,"Tests\\Unit\\TableExporterTest::it_can_generate_an_array_with_the_column_styling_or_use_a_callback":0.007,"Tests\\Unit\\TableExporterTest::it_can_map_an_item":0.001,"Tests\\Unit\\TableExporterTest::it_can_return_the_event_callbacks":0,"Tests\\Unit\\ToastTest::it_can_set_a_default_toast":0,"Tests\\Unit\\TransformerTest::it_returns_the_instance_when_no_transformer_has_been_found":0.001,"Tests\\Unit\\TransformerTest::it_throws_an_exception_when_the_transformer_is_invalid":0.001,"Tests\\Unit\\TransformerTest::it_throws_an_exception_when_a_transformer_is_missing":0.001,"Tests\\Unit\\TransformerTest::it_doesnt_throw_an_exception_when_the_transformer_is_missing_when_the_instance_cant_be_transformed":0.001,"Tests\\Unit\\TransformerTest::it_can_transform_using_a_closure":0.001,"Tests\\Unit\\TransformerTest::it_can_transform_a_collection_using_a_closure":0.001,"Tests\\Unit\\TransformerTest::it_can_transform_using_an_api_resource":0.002,"Tests\\Unit\\TransformerTest::it_can_transform_a_collection_using_an_api_resource":0.001,"Tests\\Unit\\TransformerTest::it_can_transform_an_array_using_an_api_resource":0.001,"Tests\\Unit\\TransformerTest::it_can_transform_using_a_fractal_transformer":0.003,"Tests\\Unit\\TransformerTest::it_can_transform_a_collection_using_a_fractal_transformer":0.001,"Tests\\Unit\\TransformerTest::it_can_transform_using_an_instance_that_has_a_transform_method":0.001,"Tests\\Unit\\WithVueTest::it_can_apply_middleware":0.001,"Tests\\Unit\\WithVueTest::it_return_public_available_methods":0,"Tests\\Unit\\WithVueTest::it_can_restore_data_properties_from_an_array":0,"Tests\\Unit\\WithVueTest::it_can_serialize_data_properties":0}}

app/composer.json

@@ -8,15 +8,14 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.3",
         "beyondcode/laravel-websockets": "^1.13",
         "guzzlehttp/guzzle": "^7.2",
-        "kirschbaum-development/eloquent-power-joins": "^2.6",
-        "laravel/framework": "^9.19",
+        "kirschbaum-development/eloquent-power-joins": "^3.0",
         "laravel/sanctum": "^3.2",
         "laravel/tinker": "^2.7",
         "maatwebsite/excel": "^3.1",
-        "monolog/monolog": "^2.0|^3.0",
+        "monolog/monolog": "^3.0",
         "nesbot/carbon": "^2.63",
         "psr/simple-cache": "^2.0",
         "pusher/pusher-php-server": "^7.0,<7.2.0",
@@ -31,15 +30,15 @@
         "laravel/sail": "^1.0.1",
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^6.1",
-        "phpunit/phpunit": "^9.5.10",
+        "phpunit/phpunit": "^10.4",
         "protonemedia/laravel-splade": "*",
         "spatie/ignition": "^1.4.1",
         "spatie/invade": "^1.1",
         "spatie/fractalistic": "^2.9",
         "spatie/laravel-ignition": "^1.0|^2.0",
         "spatie/laravel-ray": "^1.31",
-        "spatie/phpunit-snapshot-assertions": "^4.2|^5.0",
-        "thiagocordeiro/laravel-translator": "^1.2"
+        "spatie/phpunit-snapshot-assertions": "^5.0",
+        "thiagocordeiro/laravel-translator": "^1.2|^2.0"
     },
     "autoload": {
         "psr-4": {

composer.json

@@ -16,15 +16,15 @@
         }
     ],
     "require": {
-        "php": "^8.0 || ^8.1 || ^8.2",
-        "illuminate/contracts": "^9.41|^10.0"
+        "php": "^8.2 || ^8.3",
+        "illuminate/contracts": "^10.0|^11.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^6.0",
+        "nunomaduro/collision": "^7.0|^8.0",
         "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^7.7|^8.0",
-        "phpunit/phpunit": "^9.5"
+        "orchestra/testbench": "^8.0|^9.0",
+        "phpunit/phpunit": "^10.4"
     },
     "suggest": {
         "kirschbaum-development/eloquent-power-joins": "Required to enable support sorting by (nested) relationships in Splade Tables (^2.6)",

src/Commands/SpladeInstallCommand.php

@@ -24,8 +24,8 @@ class SpladeInstallCommand extends Command
     public function handle(): int
     {
         // Check Laravel version...
-        if (version_compare(app()->version(), '10.0', '<')) {
-            $this->error('While you can still use Splade with Laravel 9, new projects should use Laravel 10.');
+        if (version_compare(app()->version(), '11.0', '>=')) {
+            $this->error('Installing Splade is only supported on Laravel 10.x. Support for Laravel 11.x will be added in a future release.');
 
             return self::FAILURE;
         }

src/SpladeQueryBuilder.php

@@ -209,7 +209,7 @@ private function applySorting(Column $column)
             );
         }
 
-        if (!method_exists($this->builder->getModel(), 'scopeOrderByLeftPowerJoins')) {
+        if (!method_exists($this->builder, 'orderByLeftPowerJoins')) {
             throw new PowerJoinsException(
                 "To order the query using a column from a relationship, make sure the Model uses the 'PowerJoins' trait."
             );