Adding tags to pages.

thecodingmachine · Nov 24, 2017 · 063b5a5 · 063b5a5
1 parent 4b23ab7
commit 063b5a5
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 4 deletions.
diff --git a/src/Loaders/Page.php b/src/Loaders/Page.php
@@ -62,12 +62,17 @@ class Page
      * @var array
      */
     private $context;
+    /**
+     * @var string[]
+     */
+    private $tags;
 
     /**
      * @param string[]|null $menu
      * @param mixed[] $context
+     * @param string[] $tags
      */
-    public function __construct(?string $id, string $title, string $content, string $url, string $lang, ?string $website, ?array $menu, ?int $menuOrder, ?string $menuCssClass, ?string $metaTitle, ?string $metaDescription, ?string $theme, ?string $template, array $context = [])
+    public function __construct(?string $id, string $title, string $content, string $url, string $lang, ?string $website, ?array $menu, ?int $menuOrder, ?string $menuCssClass, ?string $metaTitle, ?string $metaDescription, ?string $theme, ?string $template, array $context = [], array $tags = [])
     {
         $this->id = $id;
         $this->title = $title;
@@ -83,6 +88,7 @@ public function __construct(?string $id, string $title, string $content, string
         $this->theme = $theme;
         $this->template = $template;
         $this->context = $context;
+        $this->tags = $tags;
     }
 
     public static function fromFile(string $file): self
@@ -137,7 +143,8 @@ public static function fromFile(string $file): self
             $yaml['meta_description'] ?? null,
             $yaml['theme'] ?? null,
             $yaml['template'] ?? null,
-            $yaml['context'] ?? []
+            $yaml['context'] ?? [],
+            $yaml['tags'] ?? []
         );
     }
 
@@ -178,6 +185,7 @@ private static function mergeYaml(array $baseYaml, array $yaml, string $file): a
             'theme' => YamlUtils::OVERRIDE,
             'template' => YamlUtils::OVERRIDE,
             'context' => YamlUtils::MERGE_ARRAY,
+            'tags' => YamlUtils::MERGE_ARRAY,
         ]);
     }
 
@@ -292,4 +300,12 @@ public function getContext(): array
     {
         return $this->context;
     }
+
+    /**
+     * @return string[]
+     */
+    public function getTags(): array
+    {
+        return $this->tags;
+    }
 }
diff --git a/src/Loaders/YamlUtils.php b/src/Loaders/YamlUtils.php
@@ -26,7 +26,11 @@ public function mergeArrays(array $baseYaml, array $yaml, array $instructions):
                     break;
                 case self::MERGE_ARRAY:
                     if (isset($baseYaml[$key])) {
-                        $yaml[$key] = $this->recursiveMerge($baseYaml[$key], $yaml[$key]);
+                        if (isset($yaml[$key])) {
+                            $yaml[$key] = $this->recursiveMerge($baseYaml[$key], $yaml[$key]);
+                        } else {
+                            $yaml[$key] = $baseYaml[$key];
+                        }
                     }
                     break;
                 default:

diff --git a/tests/Loaders/PageTest.php b/tests/Loaders/PageTest.php
@@ -60,6 +60,7 @@ public function testInherits()
         $this->assertSame('fr', $page->getLang());
         $this->assertSame('foo_theme', $page->getTheme());
         $this->assertSame('/foo/bar/baz', $page->getUrl());
+        $this->assertSame(['blog'], $page->getTags());
     }
 
     public function testInvalidInheritance()

diff --git a/tests/Loaders/YamlUtilsTest.php b/tests/Loaders/YamlUtilsTest.php
@@ -18,7 +18,8 @@ public function testMergeArrays()
                 'foobar' => [
                     'one' => 'two'
                 ]
-            ]
+            ],
+            'tags' => ['blog']
         ], [
             'title' => 'bar',
             'lang' => 'fr',
@@ -39,6 +40,7 @@ public function testMergeArrays()
             'theme' => YamlUtils::OVERRIDE,
             'template' => YamlUtils::OVERRIDE,
             'context' => YamlUtils::MERGE_ARRAY,
+            'tags' => YamlUtils::MERGE_ARRAY,
         ]);
 
         $this->assertSame([
@@ -53,6 +55,7 @@ public function testMergeArrays()
                 ]
             ],
             'website' => 'example.com',
+            'tags' => ['blog']
         ], $result);
     }
 }
diff --git a/tests/fixtures/Loaders/inherited_pages/parent.yml b/tests/fixtures/Loaders/inherited_pages/parent.yml
@@ -1 +1,3 @@
 theme : foo_theme
+tags:
+ - blog