[6.x] Fix TypeError with CarbonImmutable in Timezone Support #13760
+4
−4
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The improved timezone handling introduced in PR #11409 causes a
TypeErrorwhenCarbonImmutableinstances are used:The callback in the
Localizemiddleware type-hints the parameter asCarbon\Carbon, but Laravel'sDatefacade can return bothCarbonandCarbonImmutableinstances depending on the application configuration. This also affects applications using custom DTOs that utilizeCarbonInterface.This PR replaces the Carbon\Carbon type hint with Carbon\CarbonInterface in both affected middleware classes. Since both Carbon and CarbonImmutable implement CarbonInterface.
Example
In our application, we have a custom
EventDataDTO that usesCarbonImmutablefor all date properties:We combine these external event DTOs with Statamic entries in our Events component, merging them into a unified collection.