TASK: Add and enforce strict_type declarations
#5240
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds a ``` declare(strict_types=1); ``` declaration to all PHP files of the core that were missing one and implements & defines a new PHPStan rule to enforce them from now on Related: #5239
bwaidelich
commented
Sep 6, 2024
| @@ -246,7 +249,7 @@ public function postProcess(array $evaluateContext, $fusionObject, $output) | |||
| } | |||
| $cacheTags = $this->buildCacheTags($evaluateContext['configuration'], $evaluateContext['fusionPath'], $fusionObject); | |||
| $cacheMetadata = array_pop($this->cacheMetadata); | |||
| $output = $this->contentCache->createDynamicCachedSegment($output, $evaluateContext['fusionPath'], $this->serializeContext($contextVariables), $evaluateContext['cacheIdentifierValues'], $cacheTags, $cacheMetadata['lifetime'], $evaluateContext['cacheDiscriminator']); | |||
| $output = $this->contentCache->createDynamicCachedSegment($output, $evaluateContext['fusionPath'], $this->serializeContext($contextVariables), $evaluateContext['cacheIdentifierValues'], $cacheTags, $cacheMetadata['lifetime'], (string)$evaluateContext['cacheDiscriminator']); | |||
There was a problem hiding this comment.
This one might be interesting.. Without this change, the functional tests fail because$evaluateContext['cacheDiscriminator'] is false at some point.
There was a problem hiding this comment.
indeed:
1) Neos\Fusion\Tests\Functional\FusionObjects\ContentCacheTest::dynamicSegmentCacheBehavesLikeUncachedIfDiscriminatorIsDisabled
TypeError: md5(): Argument #1 ($string) must be of type string, false given
/Cache/Code/Flow_Object_Classes/Neos_Fusion_Core_Cache_ContentCache.php:161
and without this cast we wouldnt support this usecase you wrote a test for ^^
@cache.entryDiscriminator = ${false}
bwaidelich
commented
Sep 6, 2024
| @@ -215,7 +217,7 @@ public function deleteElectronicAddressAction(User $user, ElectronicAddress $ele | |||
| $this->userService->updateUser($user); | |||
|
|
|||
| $this->addFlashMessage( | |||
| $this->translator->translateById('userSettings.electronicAddressRemoved.body', [htmlspecialchars($electronicAddress->getIdentifier()), htmlspecialchars($electronicAddress->getType()), htmlspecialchars($user->getName())], null, null, 'Modules', 'Neos.Neos'), | |||
| $this->translator->translateById('userSettings.electronicAddressRemoved.body', [htmlspecialchars($electronicAddress->getIdentifier()), htmlspecialchars($electronicAddress->getType()), htmlspecialchars((string)$user->getName())], null, null, 'Modules', 'Neos.Neos'), | |||
There was a problem hiding this comment.
This was one of the few cases where we relied on implicit casting. With the strict_types declaration in place this line led to an error
bwaidelich
commented
Sep 6, 2024
| @@ -92,7 +94,7 @@ class XliffService | |||
| */ | |||
| public function getCachedJson(Locale $locale): string | |||
| { | |||
| $cacheIdentifier = md5($locale); | |||
| $cacheIdentifier = md5((string)$locale); | |||
kitsunet
approved these changes
Sep 6, 2024
|
It's green, and super straight forward, merging so we get rid of it |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Adds a
declaration to all PHP files of the core that were missing one and implements & defines a new PHPStan rule to enforce them from now on
Related: #5239