fix: inconsistency with escaping (#75)

* WIP

* Style

* Add tests

* Fix

resources/views/tags/tag.blade.php

@@ -1 +1 @@
-<{{ $tag }}<?php foreach($attributes as $name => $value) : ?> {{ $name }}="{{ $value }}"<?php endforeach ?>><?php if ($inner) : ?>{!! $inner !!}</{{ $tag }}><?php endif ?>
+<{{ $tag }}<?php foreach($attributes as $name => $value) : ?> {{ $name }}="{{ $value }}"<?php endforeach ?>><?php if ($inner) : ?>{{ $inner }}</{{ $tag }}><?php endif ?>

src/Schema/ArticleSchema.php

@@ -4,6 +4,7 @@
 
 use Carbon\CarbonInterface;
 use Illuminate\Support\Collection;
+use Illuminate\Support\HtmlString;
 use RalphJSmit\Laravel\SEO\Support\SEOData;
 
 class ArticleSchema extends Schema
@@ -75,9 +76,9 @@ public function initializeMarkup(SEOData $SEOData, array $markupBuilders): void
         }
     }
 
-    public function generateInner(): string
+    public function generateInner(): HtmlString
     {
-        return collect([
+        $inner = collect([
             '@context' => 'https://schema.org',
             '@type' => $this->type,
             'mainEntityOfPage' => [
@@ -94,5 +95,7 @@ public function generateInner(): string
             ->when($this->articleBody, fn (Collection $collection): Collection => $collection->put('articleBody', $this->articleBody))
             ->pipeThrough($this->markupTransformers)
             ->toJson();
+
+        return new HtmlString($inner);
     }
 }

src/Schema/BreadcrumbListSchema.php

@@ -3,6 +3,7 @@
 namespace RalphJSmit\Laravel\SEO\Schema;
 
 use Illuminate\Support\Collection;
+use Illuminate\Support\HtmlString;
 use RalphJSmit\Laravel\SEO\Support\SEOData;
 
 class BreadcrumbListSchema extends Schema
@@ -27,9 +28,9 @@ public function initializeMarkup(SEOData $SEOData, array $markupBuilders): void
         ]);
     }
 
-    public function generateInner(): string
+    public function generateInner(): HtmlString
     {
-        return collect([
+        $inner = collect([
             '@context' => 'https://schema.org',
             '@type' => $this->type,
             'itemListElement' => $this->breadcrumbs
@@ -44,6 +45,8 @@ public function generateInner(): string
         ])
             ->pipeThrough($this->markupTransformers)
             ->toJson();
+
+        return new HtmlString($inner);
     }
 
     public function prependBreadcrumbs(array $breadcrumbs): static

src/Schema/Schema.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Support\Collection;
+use Illuminate\Support\HtmlString;
 use RalphJSmit\Helpers\Laravel\Pipe\Pipeable;
 use RalphJSmit\Laravel\SEO\Support\SEOData;
 use RalphJSmit\Laravel\SEO\Support\Tag;
@@ -24,6 +25,8 @@ abstract class Schema extends Tag
 
     public string $tag = 'script';
 
+    public HtmlString $inner;
+
     public function __construct(SEOData $SEOData, array $markupBuilders = [])
     {
         $this->initializeMarkup($SEOData, $markupBuilders);
@@ -33,7 +36,7 @@ public function __construct(SEOData $SEOData, array $markupBuilders = [])
         $this->inner = $this->generateInner();
     }
 
-    abstract public function generateInner(): string;
+    abstract public function generateInner(): HtmlString;
 
     abstract public function initializeMarkup(SEOData $SEOData, array $markupBuilders): void;
 

tests/Feature/Tags/OpenGraphTagsTest.php

@@ -139,3 +139,17 @@
     get(route('seo.test-page', ['page' => $page]))
         ->assertSee('<meta property="og:title" content="My OG title | Laravel SEO">', false);
 });
+
+it('will escape the title', function () {
+    config()->set('seo.title.suffix', ' - A & B');
+
+    $page = Page::create();
+    $page->seo->update([
+        'title' => 'My page title',
+    ]);
+
+    $page->refresh();
+
+    get(route('seo.test-page', ['page' => $page]))
+        ->assertSee('<meta property="og:title" content="My page title - A &amp; B">', false);
+});

tests/Feature/Tags/TitleTagTest.php

@@ -45,3 +45,11 @@
     get(route('seo.test-page', ['page' => $page]))
         ->assertSee('<title>1 | Laravel SEO</title>', false);
 });
+
+it('will escape the title', function () {
+    config()->set('seo.title.infer_title_from_url', true);
+    config()->set('seo.title.suffix', ' - A & B');
+
+    get(route('seo.test-plain'))
+        ->assertSee('<title>Test Plain - A &amp; B</title>', false);
+});

tests/Feature/Tags/TwitterCardSummaryTagsTest.php

@@ -109,3 +109,17 @@
     get(route('seo.test-page', ['page' => $page]))
         ->assertSee('<meta name="twitter:title" content="My OG title | Laravel SEO">', false);
 });
+
+it('will escape the title', function () {
+    config()->set('seo.title.suffix', ' - A & B');
+
+    $page = Page::create();
+    $page->seo->update([
+        'title' => 'My page title',
+    ]);
+
+    $page->refresh();
+
+    get(route('seo.test-page', ['page' => $page]))
+        ->assertSee('<meta name="twitter:title" content="My page title - A &amp; B">', false);
+});