Fix generate html facade (#55)

* Fix escaped quote when render html * Update test
Elhebert · Jun 3, 2020 · 6df0ce2 · 6df0ce2
1 parent 6aa763a
commit 6df0ce2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/Sri.php b/src/Sri.php
@@ -3,6 +3,7 @@
 namespace Elhebert\SubresourceIntegrity;
 
 use Exception;
+use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
 
 class Sri
@@ -17,21 +18,21 @@ public function __construct(string $algorithm)
             : 'sha256';
     }
 
-    public function html(string $path, bool $useCredentials = false): string
+    public function html(string $path, bool $useCredentials = false): HtmlString
     {
         if (! config('subresource-integrity.enabled')) {
-            return '';
+            return new HtmlString('');
         }
 
         try {
             $integrity = $this->hash($path);
         } catch (\Exception $e) {
-            return '';
+            return new HtmlString('');
         }
 
         $crossOrigin = $useCredentials ? 'use-credentials' : 'anonymous';
 
-        return "integrity='{$integrity}' crossorigin='{$crossOrigin}'";
+        return new HtmlString('integrity="'.$integrity.'" crossorigin="'.$crossOrigin.'"');
     }
 
     public function hash(string $path): string

diff --git a/tests/GenerateSriHtmlTest.php b/tests/GenerateSriHtmlTest.php
@@ -18,7 +18,7 @@ public function it_generates_html_code_with_integrity()
         $hash = hash('sha256', file_get_contents('./tests/files/app.css'), true);
         $base64Hash = base64_encode($hash);
 
-        $this->assertStringContainsString("integrity='sha256-{$base64Hash}'", Sri::html('files/app.css'));
+        $this->assertStringContainsString('integrity="sha256-'.$base64Hash.'"', Sri::html('files/app.css'));
     }
 
     /** @test */
@@ -27,8 +27,8 @@ public function it_generate_html_code_with_credentials_and_integrity()
         $hash = hash('sha256', file_get_contents('./tests/files/app.css'), true);
         $base64Hash = base64_encode($hash);
 
-        $this->assertStringContainsString("integrity='sha256-{$base64Hash}'", Sri::html('files/app.css', true));
-        $this->assertStringContainsString("crossorigin='use-credentials'", Sri::html('files/app.css', true));
+        $this->assertStringContainsString('integrity="sha256-'.$base64Hash.'"', Sri::html('files/app.css', true));
+        $this->assertStringContainsString('crossorigin="use-credentials"', Sri::html('files/app.css', true));
     }
 
     /** @test */