From 615bb6060231ed8412139d5bd0a8347924af630a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dalibor=20Karlovi=C4=87?= <dalibor.karlovic@sigwin.hr>
Date: Mon, 18 Jul 2022 16:24:22 +0200
Subject: [PATCH] fix: Collection->column() (#140)

---
 src/Collection.php                            |  1 +
 src/Collection/ReadOnlyCollection.php         | 35 +++++++++----------
 .../site/config/packages/yassg_routes.yaml    |  8 ++---
 tests/functional/site/fixtures/de/index.html  |  8 ++---
 .../en/{a => article}/hello-world/index.html  |  0
 tests/functional/site/fixtures/en/index.html  |  8 ++---
 tests/functional/site/fixtures/hr/index.html  |  8 ++---
 tests/functional/site/fixtures/index.html     |  2 +-
 .../site/templates/pages/homepage.html.twig   | 10 +++---
 9 files changed, 36 insertions(+), 44 deletions(-)
 rename tests/functional/site/fixtures/en/{a => article}/hello-world/index.html (100%)

diff --git a/src/Collection.php b/src/Collection.php
index 820a81f..37d21dc 100644
--- a/src/Collection.php
+++ b/src/Collection.php
@@ -22,4 +22,5 @@
  */
 interface Collection extends \ArrayAccess, \Countable, \IteratorAggregate
 {
+    public function column(string $name): array;
 }
diff --git a/src/Collection/ReadOnlyCollection.php b/src/Collection/ReadOnlyCollection.php
index e2ade1f..4331955 100644
--- a/src/Collection/ReadOnlyCollection.php
+++ b/src/Collection/ReadOnlyCollection.php
@@ -33,20 +33,31 @@ public function __construct(ExpressionLanguage $expressionLanguage, array $names
         $this->data = $data;
     }
 
-    public function __get(string $name): array
+    public function __get(string $name): object
     {
-        return $this->map($name);
+        return $this->data[$name];
+    }
+
+    public function column(string $name): array
+    {
+        $expression = $this->expressionLanguage->parse($name, $this->names);
+
+        $values = [];
+        foreach ($this->data as $id => $item) {
+            $values[$id] = $this->expressionLanguage->evaluate($expression, (array) $item);
+        }
+
+        return $values;
     }
 
     public function offsetExists(mixed $offset): bool
     {
-        return isset($this->names[$offset]);
+        return isset($this->data[$offset]);
     }
 
-    /** @phpstan-ignore-next-line */
-    public function offsetGet(mixed $offset): array
+    public function offsetGet(mixed $offset): object
     {
-        return $this->map($offset);
+        return $this->data[$offset];
     }
 
     public function offsetSet(mixed $offset, mixed $value): void
@@ -68,16 +79,4 @@ public function getIterator(): Traversable
     {
         return new \ArrayIterator($this->data);
     }
-
-    private function map(string $name): array
-    {
-        $expression = $this->expressionLanguage->parse($name, $this->names);
-
-        $values = [];
-        foreach ($this->data as $id => $item) {
-            $values[$id] = $this->expressionLanguage->evaluate($expression, (array) $item);
-        }
-
-        return $values;
-    }
 }
diff --git a/tests/functional/site/config/packages/yassg_routes.yaml b/tests/functional/site/config/packages/yassg_routes.yaml
index 69d7af3..7a77da8 100644
--- a/tests/functional/site/config/packages/yassg_routes.yaml
+++ b/tests/functional/site/config/packages/yassg_routes.yaml
@@ -12,16 +12,16 @@ sigwin_yassg:
             path: /{_locale}
             catalog:
                 # map results as an array
-                _locale: "yassg_find_all('locale')['isoCode']"
+                _locale: "yassg_find_all('locale').column('isoCode')"
         article:
-            path: /{_locale}/a/{slug}
+            path: /{_locale}/article/{slug}
             catalog:
-                slug: "yassg_find_all('articles').slug"
+                slug: "yassg_find_all('articles').column('slug')"
         product:
             path: /{_locale}/{slug}
             catalog:
                 # map results as a property
-                slug: "yassg_find_all('products').slug"
+                slug: "yassg_find_all('products').column('slug')"
         product_with_route_default:
             path: /{_locale}/product_with_alias/{slug}
             defaults:
diff --git a/tests/functional/site/fixtures/de/index.html b/tests/functional/site/fixtures/de/index.html
index 2a71b09..d567018 100644
--- a/tests/functional/site/fixtures/de/index.html
+++ b/tests/functional/site/fixtures/de/index.html
@@ -15,7 +15,7 @@
         <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-xl">
             <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10 prose">
                 <h1>Homepage</h1>
-                
+
                 <h2>Locales</h2>
                 <ul>
                                             <li>
@@ -28,7 +28,7 @@ <h2>Locales</h2>
                                                         <a href="/sub/dir/another/hr/">Hrvatski</a>
                         </li>
                                     </ul>
-                
+
                 <h2>Products linked to categories <code>slug: category1</code></h2>
                 <ul>
                                             <li>
@@ -38,15 +38,13 @@ <h2>Products linked to categories <code>slug: category1</code></h2>
                             <a href="https://example.com/sub/dir/another/de/beischpiel1/">Beischpiel 1</a>
                         </li>
                                     </ul>
-                
+
                 <h2>Category via ID</h2>
                 <h3>Kategorie 1</h3>
-                <p></p>
                 <p>Bezeichnung 1</p>
 
                 <h2>Category via slug</h2>
                 <h3>Kategorie 1</h3>
-                <p></p>
                 <p>Bezeichnung 1</p>
             </div>
         </div>
diff --git a/tests/functional/site/fixtures/en/a/hello-world/index.html b/tests/functional/site/fixtures/en/article/hello-world/index.html
similarity index 100%
rename from tests/functional/site/fixtures/en/a/hello-world/index.html
rename to tests/functional/site/fixtures/en/article/hello-world/index.html
diff --git a/tests/functional/site/fixtures/en/index.html b/tests/functional/site/fixtures/en/index.html
index 0d8f3bc..518ac0c 100644
--- a/tests/functional/site/fixtures/en/index.html
+++ b/tests/functional/site/fixtures/en/index.html
@@ -15,7 +15,7 @@
         <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-xl">
             <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10 prose">
                 <h1>Homepage</h1>
-                
+
                 <h2>Locales</h2>
                 <ul>
                                             <li>
@@ -28,7 +28,7 @@ <h2>Locales</h2>
                                                         <a href="/sub/dir/another/hr/">Hrvatski</a>
                         </li>
                                     </ul>
-                
+
                 <h2>Products linked to categories <code>slug: category1</code></h2>
                 <ul>
                                             <li>
@@ -38,15 +38,13 @@ <h2>Products linked to categories <code>slug: category1</code></h2>
                             <a href="https://example.com/sub/dir/another/en/example1/">Example 1</a>
                         </li>
                                     </ul>
-                
+
                 <h2>Category via ID</h2>
                 <h3>Category 1</h3>
-                <p></p>
                 <p>Description 1</p>
 
                 <h2>Category via slug</h2>
                 <h3>Category 1</h3>
-                <p></p>
                 <p>Description 1</p>
             </div>
         </div>
diff --git a/tests/functional/site/fixtures/hr/index.html b/tests/functional/site/fixtures/hr/index.html
index 46203b6..fda2803 100644
--- a/tests/functional/site/fixtures/hr/index.html
+++ b/tests/functional/site/fixtures/hr/index.html
@@ -15,7 +15,7 @@
         <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-xl">
             <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10 prose">
                 <h1>Homepage</h1>
-                
+
                 <h2>Locales</h2>
                 <ul>
                                             <li>
@@ -28,7 +28,7 @@ <h2>Locales</h2>
                                                         <a href="/sub/dir/another/hr/">Hrvatski</a>
                         </li>
                                     </ul>
-                
+
                 <h2>Products linked to categories <code>slug: category1</code></h2>
                 <ul>
                                             <li>
@@ -38,15 +38,13 @@ <h2>Products linked to categories <code>slug: category1</code></h2>
                             <a href="https://example.com/sub/dir/another/hr/primjer1/">Primjer 1</a>
                         </li>
                                     </ul>
-                
+
                 <h2>Category via ID</h2>
                 <h3>Kategorija 1</h3>
-                <p></p>
                 <p>Opis 1</p>
 
                 <h2>Category via slug</h2>
                 <h3>Kategorija 1</h3>
-                <p></p>
                 <p>Opis 1</p>
             </div>
         </div>
diff --git a/tests/functional/site/fixtures/index.html b/tests/functional/site/fixtures/index.html
index 42dc523..7f55625 100644
--- a/tests/functional/site/fixtures/index.html
+++ b/tests/functional/site/fixtures/index.html
@@ -34,7 +34,7 @@ <h1>Index</h1>
                                         <dd><a href="/sub/dir/another/en/">/sub/dir/another/en/</a></dd>
                                                             <dt>article</dt>
                                                             
-                                        <dd><a href="/sub/dir/another/en/a/hello-world/">/sub/dir/another/en/a/hello-world/</a></dd>
+                                        <dd><a href="/sub/dir/another/en/article/hello-world/">/sub/dir/another/en/article/hello-world/</a></dd>
                                                             <dt>product</dt>
                                                             
                                         <dd><a href="/sub/dir/another/en/nested-example/">/sub/dir/another/en/nested-example/</a></dd>
diff --git a/tests/functional/site/templates/pages/homepage.html.twig b/tests/functional/site/templates/pages/homepage.html.twig
index faecc4a..06fd9d7 100644
--- a/tests/functional/site/templates/pages/homepage.html.twig
+++ b/tests/functional/site/templates/pages/homepage.html.twig
@@ -3,7 +3,7 @@
 {# query the database #}
 {% set locales = yassg_find_all('locale', {sort: {'item.name': 'asc'}}) %}
 
-{% set products = yassg_find_all('products', {condition: '"category1" in item.categories.slug', sort: {'item.name': 'desc'}}) %}
+{% set products = yassg_find_all('products', {condition: '"category1" in item.categories.column("slug")', sort: {'item.name': 'desc'}}) %}
 
 {% set category1 = yassg_get('categories', '/category1.yaml') %}
 
@@ -16,7 +16,7 @@
         <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-xl">
             <div class="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10 prose">
                 <h1>Homepage</h1>
-                
+
                 <h2>Locales</h2>
                 <ul>
                     {% for locale in locales %}
@@ -26,7 +26,7 @@
                         </li>
                     {% endfor %}
                 </ul>
-                
+
                 <h2>Products linked to categories <code>slug: category1</code></h2>
                 <ul>
                     {% for product in products %}
@@ -35,15 +35,13 @@
                         </li>
                     {% endfor %}
                 </ul>
-                
+
                 <h2>Category via ID</h2>
                 <h3>{{ category1.name }}</h3>
-                <p>{{ category1.random() }}</p>
                 <p>{{ category1.getDescription() }}</p>
 
                 <h2>Category via slug</h2>
                 <h3>{{ category1_via_slug.name }}</h3>
-                <p>{{ category1_via_slug.random() }}</p>
                 <p>{{ category1_via_slug.getDescription() }}</p>
             </div>
         </div>