From 63ae64191fbab7ce716257a25a3c15307e7be6c5 Mon Sep 17 00:00:00 2001
From: "Alberto G. Rodriguez" <arodu.dev@gmail.com>
Date: Mon, 11 Mar 2024 12:49:30 -0400
Subject: [PATCH] fix: add singularAlias param on associations hasMany (#980)

Fix singularized variable name in template
---
 templates/bake/Template/view.twig           |  2 +-
 tests/comparisons/Template/testBakeView.php | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/bake/Template/view.twig b/templates/bake/Template/view.twig
index ae63d0e2..76192e48 100644
--- a/templates/bake/Template/view.twig
+++ b/templates/bake/Template/view.twig
@@ -118,7 +118,7 @@
 {% endif %}
 {% set relations = associations.BelongsToMany|merge(associations.HasMany) %}
 {% for alias, details in relations %}
-{% set otherSingularVar = alias|variable %}
+{% set otherSingularVar = alias|singularize|variable %}
 {% set otherPluralHumanName = details.controller|underscore|humanize %}
             <div class="related">
                 <h4><?= __('Related {{ otherPluralHumanName }}') ?></h4>
diff --git a/tests/comparisons/Template/testBakeView.php b/tests/comparisons/Template/testBakeView.php
index c206f54a..7e37823b 100644
--- a/tests/comparisons/Template/testBakeView.php
+++ b/tests/comparisons/Template/testBakeView.php
@@ -74,17 +74,17 @@
                             <th><?= __('Published') ?></th>
                             <th class="actions"><?= __('Actions') ?></th>
                         </tr>
-                        <?php foreach ($author->articles as $articles) : ?>
+                        <?php foreach ($author->articles as $article) : ?>
                         <tr>
-                            <td><?= h($articles->id) ?></td>
-                            <td><?= h($articles->author_id) ?></td>
-                            <td><?= h($articles->title) ?></td>
-                            <td><?= h($articles->body) ?></td>
-                            <td><?= h($articles->published) ?></td>
+                            <td><?= h($article->id) ?></td>
+                            <td><?= h($article->author_id) ?></td>
+                            <td><?= h($article->title) ?></td>
+                            <td><?= h($article->body) ?></td>
+                            <td><?= h($article->published) ?></td>
                             <td class="actions">
-                                <?= $this->Html->link(__('View'), ['controller' => 'Articles', 'action' => 'view', $articles->id]) ?>
-                                <?= $this->Html->link(__('Edit'), ['controller' => 'Articles', 'action' => 'edit', $articles->id]) ?>
-                                <?= $this->Form->postLink(__('Delete'), ['controller' => 'Articles', 'action' => 'delete', $articles->id], ['confirm' => __('Are you sure you want to delete # {0}?', $articles->id)]) ?>
+                                <?= $this->Html->link(__('View'), ['controller' => 'Articles', 'action' => 'view', $article->id]) ?>
+                                <?= $this->Html->link(__('Edit'), ['controller' => 'Articles', 'action' => 'edit', $article->id]) ?>
+                                <?= $this->Form->postLink(__('Delete'), ['controller' => 'Articles', 'action' => 'delete', $article->id], ['confirm' => __('Are you sure you want to delete # {0}?', $article->id)]) ?>
                             </td>
                         </tr>
                         <?php endforeach; ?>