WIP

Cecilapp · Dec 4, 2023 · acd9673 · acd9673
1 parent 0e2dc22
commit acd9673
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/resources/layouts/partials/jsonld.js.twig b/resources/layouts/partials/jsonld.js.twig
@@ -1,4 +1,4 @@
-{%- if page.metatags.jsonld|default(site.metatags.jsonld|default(false)) ~%}
+{%- if page.metatags.jsonld|default(config.metatags.jsonld|default(false)) ~%}
     <script type="application/ld+json">{%- apply minify_js ~%}
       [
         {#- WebSite ~#}
@@ -57,7 +57,7 @@
           }]
         }
           {#- NewsArticle ~#}
-          {%- if page.section == site.metatags.articles|default('blog') and page.type != 'section' -%}
+          {%- if page.section == config.metatags.articles|default('blog') and page.type != 'section' -%}
         ,{
           "@context": "https://schema.org",
           "@type": "NewsArticle",

diff --git a/src/Renderer/Extension/Core.php b/src/Renderer/Extension/Core.php
@@ -199,8 +199,10 @@ public function sortByTitle(\Traversable $collection): array
 
     /**
      * Sorts a collection by weight.
+     *
+     * @param \Traversable|array $collection
      */
-    public function sortByWeight(\Traversable $collection): array
+    public function sortByWeight($collection): array
     {
         $callback = function ($a, $b) {
             if (!isset($a['weight'])) {
@@ -216,7 +218,9 @@ public function sortByWeight(\Traversable $collection): array
             return $a['weight'] < $b['weight'] ? -1 : 1;
         };
 
-        $collection = iterator_to_array($collection);
+        if (!is_array($collection)) {
+            $collection = iterator_to_array($collection);
+        }
         usort(/** @scrutinizer ignore-type */ $collection, $callback);
 
         return $collection;

diff --git a/src/Renderer/Site.php b/src/Renderer/Site.php
@@ -49,7 +49,8 @@ public function offsetExists($offset): bool
     {
         // special cases
         switch ($offset) {
-            case 'config':
+            //case 'config':
+            case 'menus':
             case 'home':
             case 'debug':
                 return true;
@@ -70,10 +71,10 @@ public function offsetGet($offset)
     {
         // If it's a built-in variable: dot not fetchs data from config raw
         switch ($offset) {
-            case 'home':
-                return $this->language != $this->config->getLanguageDefault() ? sprintf('index.%s', $this->language) : 'index';
-            case 'language':
-                return new Language($this->config, $this->language);
+            case 'pages':
+                return $this->getPages();
+            case 'menus':
+                return $this->builder->getMenus($this->language);
             case 'taxonomies':
                 return $this->builder->getTaxonomies($this->language);
             case 'data':

diff --git a/tests/fixtures/website/config.yml b/tests/fixtures/website/config.yml
@@ -14,3 +14,7 @@ languages:
 generators:
   99: Cecil\Generator\Test
   100: Cecil\Generator\TitleReplace
+
+layouts:
+  extensions:
+    Test: 'Cecil\Renderer\Extension\Test'