Merge pull request #223 from patrickomeara/main

Unescape slashes in output
spatie · Jan 20, 2025 · b653349 · b653349
2 parents 355d1ec + 6ee9caf
commit b653349
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 37 deletions.
diff --git a/src/BaseType.php b/src/BaseType.php
@@ -160,7 +160,7 @@ public function nonceAttr(): string
 
     public function toScript(): string
     {
-        return '<script type="application/ld+json"'.$this->nonceAttr().'>'.json_encode($this->toArray(), JSON_UNESCAPED_UNICODE).'</script>';
+        return '<script type="application/ld+json"'.$this->nonceAttr().'>'.json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES).'</script>';
     }
 
     public function jsonSerialize(): mixed

diff --git a/src/Graph.php b/src/Graph.php
@@ -1191,7 +1191,7 @@ public function nonceAttr(): string
 
     public function toScript(): string
     {
-        return '<script type="application/ld+json"'.$this->nonceAttr().'>'.json_encode($this, JSON_UNESCAPED_UNICODE).'</script>';
+        return '<script type="application/ld+json"'.$this->nonceAttr().'>'.json_encode($this, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES).'</script>';
     }
 
     public function jsonSerialize(): mixed

diff --git a/src/MultiTypedEntity.php b/src/MultiTypedEntity.php
@@ -1078,7 +1078,7 @@ public function nonceAttr(): string
 
     public function toScript(): string
     {
-        return '<script type="application/ld+json"'.$this->nonceAttr().'>'.json_encode($this, JSON_UNESCAPED_UNICODE).'</script>';
+        return '<script type="application/ld+json"'.$this->nonceAttr().'>'.json_encode($this, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES).'</script>';
     }
 
     public function jsonSerialize(): mixed

diff --git a/tests/BaseTypeTest.php b/tests/BaseTypeTest.php
@@ -156,7 +156,7 @@
     $type->setProperty('foo', 'bar');
 
     $expected = '<script type="application/ld+json">'.
-        '{"@context":"https:\/\/schema.org","@type":"DummyType","foo":"bar"}'.
+        '{"@context":"https://schema.org","@type":"DummyType","foo":"bar"}'.
         '</script>';
 
     expect($type->toScript())->toBe($expected);
@@ -170,7 +170,7 @@
     $type->setNonce('baz');
 
     $expected = '<script type="application/ld+json" nonce="baz">'.
-        '{"@context":"https:\/\/schema.org","@type":"DummyType","foo":"bar"}'.
+        '{"@context":"https://schema.org","@type":"DummyType","foo":"bar"}'.
         '</script>';
 
     expect($type->toScript())->toBe($expected);
@@ -273,7 +273,7 @@ public function __toString()
     $type->setProperty('foo', 'bar');
 
     $expected = '<script type="application/ld+json">'.
-        '{"@context":"https:\/\/schema.org","@type":"DummyType","foo":"bar"}'.
+        '{"@context":"https://schema.org","@type":"DummyType","foo":"bar"}'.
         '</script>';
 
     expect((string) $type)->toBe($expected);

diff --git a/tests/GeneratedTypeSmokeTest.php b/tests/GeneratedTypeSmokeTest.php
@@ -20,7 +20,7 @@
         ->email('[email protected]');
 
     $expected = '<script type="application/ld+json">'.
-        '{"@context":"https:\/\/schema.org","@type":"LocalBusiness","name":"Spatie","email":"[email protected]"}'.
+        '{"@context":"https://schema.org","@type":"LocalBusiness","name":"Spatie","email":"[email protected]"}'.
         '</script>';
 
     expect($localBusiness->toScript())->toBe($expected);
@@ -32,7 +32,7 @@
         ->contactPoint(Schema::contactPoint()->areaServed('Worldwide'));
 
     $expected = '<script type="application/ld+json">'.
-        '{"@context":"https:\/\/schema.org","@type":"LocalBusiness","name":"Spatie",'.
+        '{"@context":"https://schema.org","@type":"LocalBusiness","name":"Spatie",'.
         '"contactPoint":{"@type":"ContactPoint","areaServed":"Worldwide"}}'.
         '</script>';
 

diff --git a/tests/GraphIdentifierTest.php b/tests/GraphIdentifierTest.php
@@ -13,7 +13,7 @@
     $graph->get(Organization::class, Graph::IDENTIFIER_DEFAULT)->email('[email protected]');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"}]}</script>'
     );
 });
 
@@ -23,7 +23,7 @@
     $graph->getOrCreate(Organization::class, Graph::IDENTIFIER_DEFAULT)->email('[email protected]');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"}]}</script>'
     );
 });
 
@@ -33,7 +33,7 @@
     $graph->getOrCreate(Organization::class, Graph::IDENTIFIER_DEFAULT)->name('My Company')->email('[email protected]');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"},{"@type":"Product","brand":{"@type":"Organization","name":"My Company","email":"[email protected]"}}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"},{"@type":"Product","brand":{"@type":"Organization","name":"My Company","email":"[email protected]"}}]}</script>'
     );
 });
 
@@ -44,7 +44,7 @@
     $graph->hide(Organization::class, 'astrotomic');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"spatie"}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"spatie"}]}</script>'
     );
 });
 
@@ -56,7 +56,7 @@
     $graph->product()->brand($graph->organization('spatie'));
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
     );
 });
 
@@ -69,7 +69,7 @@
     $graph->show(Organization::class, null);
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"spatie"},{"@type":"Organization","name":"astrotomic"},{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"spatie"},{"@type":"Organization","name":"astrotomic"},{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
     );
 });
 
@@ -82,7 +82,7 @@
     $graph->show(Organization::class, 'spatie');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"spatie"},{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"spatie"},{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
     );
 });
 
@@ -95,7 +95,7 @@
     $graph->hide(Organization::class, 'astrotomic');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"spatie"},{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"spatie"},{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
     );
 });
 
@@ -107,7 +107,7 @@
     $graph->show(Organization::class, 'spatie');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"spatie"},{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"spatie"},{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
     );
 });
 
@@ -118,7 +118,7 @@
     $graph->product()->brand($graph->organization('spatie'));
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"spatie"},{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"spatie"},{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
     );
 });
 
@@ -130,7 +130,7 @@
     $graph->product()->brand($graph->organization('spatie'));
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"spatie"},{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"spatie"},{"@type":"Product","brand":{"@type":"Organization","name":"spatie"}}]}</script>'
     );
 });
 

diff --git a/tests/GraphTest.php b/tests/GraphTest.php
@@ -14,15 +14,15 @@
 it('can render empty', function () {
     $graph = new Graph();
 
-    expect((string) $graph)->toBe('<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[]}</script>');
+    expect((string) $graph)->toBe('<script type="application/ld+json">{"@context":"https://schema.org","@graph":[]}</script>');
 });
 
 it('can render single item', function () {
     $graph = new Graph();
     $graph->add(Schema::organization()->name('My Company'));
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"My Company"}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"My Company"}]}</script>'
     );
 });
 
@@ -32,7 +32,7 @@
     $graph->add(Schema::product()->name('My Product'));
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"My Company"},{"@type":"Product","name":"My Product"}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"My Company"},{"@type":"Product","name":"My Product"}]}</script>'
     );
 });
 
@@ -42,7 +42,7 @@
     $graph->get(Organization::class)->email('[email protected]');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"}]}</script>'
     );
 });
 
@@ -52,7 +52,7 @@
     $graph->getOrCreate(Organization::class)->email('[email protected]');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"}]}</script>'
     );
 });
 
@@ -62,7 +62,7 @@
     $graph->getOrCreate(Organization::class)->name('My Company')->email('[email protected]');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"},{"@type":"Product","brand":{"@type":"Organization","name":"My Company","email":"[email protected]"}}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"},{"@type":"Product","brand":{"@type":"Organization","name":"My Company","email":"[email protected]"}}]}</script>'
     );
 });
 
@@ -73,7 +73,7 @@
     $graph->getOrCreate(Organization::class)->name('My Company')->email('[email protected]');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Product","brand":{"@type":"Organization","name":"My Company","email":"[email protected]"}}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Product","brand":{"@type":"Organization","name":"My Company","email":"[email protected]"}}]}</script>'
     );
 });
 
@@ -86,7 +86,7 @@
     $graph->show(Organization::class);
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"},{"@type":"Product","brand":{"@type":"Organization","name":"My Company","email":"[email protected]"}}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"My Company","email":"[email protected]"},{"@type":"Product","brand":{"@type":"Organization","name":"My Company","email":"[email protected]"}}]}</script>'
     );
 });
 
@@ -130,7 +130,7 @@
 
     expect($organization)->toBeInstanceOf(Organization::class);
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"My Company"}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"My Company"}]}</script>'
     );
 });
 
@@ -143,7 +143,7 @@
     expect($graph)->toBeInstanceOf(Graph::class);
     expect($graph->organization())->toBeInstanceOf(Organization::class);
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"My Company"}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"My Company"}]}</script>'
     );
 });
 
@@ -159,7 +159,7 @@
     expect($graph)->toBeInstanceOf(Graph::class);
     expect($graph->organization())->toBeInstanceOf(Organization::class);
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Organization","name":"My Company","description":"This is my awesome Company."}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Organization","name":"My Company","description":"This is my awesome Company."}]}</script>'
     );
 });
 
@@ -179,7 +179,7 @@
     expect($graph->organization())->toBeInstanceOf(Organization::class);
     expect($graph->product())->toBeInstanceOf(Product::class);
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"Product","name":"My Product","brand":{"@type":"Organization","name":"My Company"}}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"Product","name":"My Product","brand":{"@type":"Organization","name":"My Company"}}]}</script>'
     );
 });
 
@@ -217,7 +217,7 @@
         ->email('[email protected]');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@graph":[{"@type":"BlogPosting","author":{"@id":"https:\/\/example.com\/#organization"},"publisher":{"@id":"https:\/\/example.com\/#organization"},"@id":"https:\/\/example.com\/blog\/my-post\/#blogPosting"},{"@type":"Organization","name":"organization","url":"https:\/\/example.com","email":"[email protected]","@id":"https:\/\/example.com\/#organization"}]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@graph":[{"@type":"BlogPosting","author":{"@id":"https://example.com/#organization"},"publisher":{"@id":"https://example.com/#organization"},"@id":"https://example.com/blog/my-post/#blogPosting"},{"@type":"Organization","name":"organization","url":"https://example.com","email":"[email protected]","@id":"https://example.com/#organization"}]}</script>'
     );
 });
 
@@ -227,7 +227,7 @@
     expect($graph->getContext())->toBe('https://foobar.com');
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/foobar.com","@graph":[]}</script>'
+        '<script type="application/ld+json">{"@context":"https://foobar.com","@graph":[]}</script>'
     );
 });
 
@@ -243,6 +243,6 @@
     ]);
 
     expect($graph->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":{"@vocab":"https:\/\/schema.org\/","@base":"https:\/\/domain.com\/"},"@graph":[]}</script>'
+        '<script type="application/ld+json">{"@context":{"@vocab":"https://schema.org/","@base":"https://domain.com/"},"@graph":[]}</script>'
     );
 });
diff --git a/tests/MultiTypedEntityTest.php b/tests/MultiTypedEntityTest.php
@@ -10,7 +10,7 @@
     $mte = new MultiTypedEntity();
 
     expect((string) $mte)->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@type":[]}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@type":[]}</script>'
     );
 });
 
@@ -19,7 +19,7 @@
     $mte->hotelRoom()->name('The Presidential Suite');
 
     expect($mte->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@type":["HotelRoom"],"name":"The Presidential Suite"}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@type":["HotelRoom"],"name":"The Presidential Suite"}</script>'
     );
 });
 
@@ -41,6 +41,6 @@
     });
 
     expect($mte->toScript())->toBe(
-        '<script type="application/ld+json">{"@context":"https:\/\/schema.org","@type":["HotelRoom","Product"],"name":"The Presidential Suite","offers":{"@type":"Offer","name":"One Night","price":100000,"priceCurrency":"USD"},"aggregateRating":{"@type":"AggregateRating","bestRating":5,"worstRating":4}}</script>'
+        '<script type="application/ld+json">{"@context":"https://schema.org","@type":["HotelRoom","Product"],"name":"The Presidential Suite","offers":{"@type":"Offer","name":"One Night","price":100000,"priceCurrency":"USD"},"aggregateRating":{"@type":"AggregateRating","bestRating":5,"worstRating":4}}</script>'
     );
 });