Merge pull request #4 from spiral-modules/request.meta

Update MetaRequest.php
spiral-modules · Jul 18, 2017 · 0eb7370 · 0eb7370
2 parents 6b0a9ee + 285e1b1
commit 0eb7370
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/source/Pages/Pages.php b/source/Pages/Pages.php
@@ -29,6 +29,7 @@ public function __construct(PageSource $source)
     /**
      * @param string $uri
      * @param bool   $activeOnly
+     *
      * @return null|Page
      */
     public function find(string $uri, bool $activeOnly = true)
@@ -39,6 +40,7 @@ public function find(string $uri, bool $activeOnly = true)
     /**
      * @param Page  $page
      * @param array $defaults
+     *
      * @return array
      */
     public function getMeta(Page $page, array $defaults): array
@@ -47,14 +49,15 @@ public function getMeta(Page $page, array $defaults): array
             'title'       => $page->title,
             'keywords'    => $page->keywords ?: $this->defaults($defaults, 'keywords'),
             'description' => $page->description ?: $this->defaults($defaults, 'description'),
-            'metaTags'    => $page->metaTags ?: $this->defaults($defaults, 'metaTags')
+            'html'        => $page->metaTags ?: $this->defaults($defaults, 'html')
         ];
     }
 
     /**
      * @param array  $defaults
      * @param string $field
      * @param string $default
+     *
      * @return string
      */
     protected function defaults(array $defaults, string $field, string $default = ''): string

diff --git a/source/Pages/Requests/Api/MetaRequest.php b/source/Pages/Requests/Api/MetaRequest.php
@@ -24,7 +24,7 @@ class MetaRequest extends RequestFilter implements PageRequestInterface
         'title'       => 'data:title',
         'description' => 'data:description',
         'keywords'    => 'data:keywords',
-        'metaTags'    => 'data:metaTags',
+        'metaTags'    => 'data:html',
     ];
 
     /**
@@ -50,4 +50,4 @@ class MetaRequest extends RequestFilter implements PageRequestInterface
         'description' => 'trim',
         'metaTags'    => 'trim',
     ];
-}
+}
diff --git a/source/views/cms/meta.dark.php b/source/views/cms/meta.dark.php
@@ -19,11 +19,11 @@
 $meta = $pages->getMeta($page, [
     'description' => $page_metadata_description,
     'keywords'    => $page_metadata_keywords,
-    'metaTags'    => $page_metadata_metaTags
+    'html'        => $page_metadata_metaTags
 ]);
 
-if (!empty($meta['metaTags'])) {
-    echo $meta['metaTags'];
+if (!empty($meta['html'])) {
+    echo $meta['html'];
 } ?>
 
     <title><?= e($meta['title']) ?></title>
@@ -34,4 +34,4 @@
     <script>
         window.metadata = <?= json_encode($meta) ?>;
     </script>
-<?php } #compile ?>
+<?php } #compile ?>
diff --git a/tests/Pages/PagesTest.php b/tests/Pages/PagesTest.php
@@ -65,12 +65,12 @@ public function testGetMeta()
         $meta = $pages->getMeta($page, [
             'keywords'    => 'some keywords',
             'description' => 'some description',
-            'metaTags'    => 'some metaTags',
+            'html'        => 'some metaTags',
         ]);
         $this->assertEmpty($meta['title']);
         $this->assertSame($meta['keywords'], 'some keywords');
         $this->assertSame($meta['description'], 'some description');
-        $this->assertSame($meta['metaTags'], 'some metaTags');
+        $this->assertSame($meta['html'], 'some metaTags');
 
         $page->title = 'title';
         $page->keywords = 'keywords';
@@ -83,11 +83,11 @@ public function testGetMeta()
         $meta = $pages->getMeta($page, [
             'keywords'    => 'some keywords',
             'description' => 'some description',
-            'metaTags'    => 'some metaTags',
+            'html'        => 'some metaTags',
         ]);
         $this->assertSame($meta['title'], 'title');
         $this->assertSame($meta['keywords'], 'keywords');
         $this->assertSame($meta['description'], 'description');
-        $this->assertSame($meta['metaTags'], 'metaTags');
+        $this->assertSame($meta['html'], 'metaTags');
     }
 }