Fix singular/plural variable collision in baked templates#1075
Merged
dereuromark merged 3 commits into3.xfrom Mar 21, 2026
Merged
Fix singular/plural variable collision in baked templates#1075dereuromark merged 3 commits into3.xfrom
dereuromark merged 3 commits into3.xfrom
Conversation
When baking templates for models where the singular and plural forms are
identical (e.g., "news", "sheep", "fish"), the generated foreach loops
would incorrectly use the same variable for both the collection and the
iteration variable, producing invalid code like:
foreach ($news as $news):
This fix appends "Item" to the singular variable name when a collision
is detected, producing valid code:
foreach ($news as $newsItem):
Refs https://discourse.cakephp.org/t/paginator-error/12806/4
- Change suffix from 'Item' to 'Entity' (less likely to collide with model names like 'NewsItem') - Add same fix to ControllerCommand for controller action generation - Add collision detection in view.twig for related entity loops (appends 'Related' suffix when otherSingularVar matches singularVar) - Add collision detection in Controller/add.twig and edit.twig for association list variables (appends 'List' suffix when otherPlural matches singularName) - Add test for ControllerCommand singular/plural collision handling
Ensures the NewsController.php is deleted if it exists from a previous test run to avoid the "Do you want to overwrite?" prompt.
LordSimal
approved these changes
Mar 19, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
foreach ($news as $news):which overwrites the collection variableforeach ($news as $newsEntity):Additional collision fixes
$newsEntity)Refs https://discourse.cakephp.org/t/paginator-error/12806/4