From de626475f9fd91c986f1903b902957f213f31e20 Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@trivago.com>
Date: Thu, 10 Sep 2020 14:08:59 +0200
Subject: [PATCH 01/13] (feat): first draft of blade component

---
 composer.lock                |  2 +-
 src/Components/Link.php      | 24 ++++++++++++++++++++++++
 src/Components/LinkMix.php   | 24 ++++++++++++++++++++++++
 src/Components/Script.php    | 24 ++++++++++++++++++++++++
 src/Components/ScriptMix.php | 24 ++++++++++++++++++++++++
 src/SriServiceProvider.php   | 17 ++++++++---------
 6 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 src/Components/Link.php
 create mode 100644 src/Components/LinkMix.php
 create mode 100644 src/Components/Script.php
 create mode 100644 src/Components/ScriptMix.php

diff --git a/composer.lock b/composer.lock
index 679d7d5..ee74a85 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "37d4646aed52bb0cf8a3ad17b3a76c38",
+    "content-hash": "0f468ffe892d763f45901486ff6fa6f1",
     "packages": [
         {
             "name": "brick/math",
diff --git a/src/Components/Link.php b/src/Components/Link.php
new file mode 100644
index 0000000..b42f5d0
--- /dev/null
+++ b/src/Components/Link.php
@@ -0,0 +1,24 @@
+
+<?php
+
+namespace Elhebert\SubresourceIntegrity\Components;
+
+use Illuminate\View\Component;
+use Elhebert\SubresourceIntegrity\Sri;
+
+class Link extends Component
+{
+    private string $href;
+
+    public function __construct(string $href)
+    {
+        $this->href = $href;
+    }
+
+    public function render(): string
+    {
+        return <<<'blade'
+            <link href="{{ asset($this->href) }} integrity="{{ Sri::hash($this->href) }}" {{ $this->attributes }} />
+        blade;
+    }
+}
diff --git a/src/Components/LinkMix.php b/src/Components/LinkMix.php
new file mode 100644
index 0000000..e55e3ae
--- /dev/null
+++ b/src/Components/LinkMix.php
@@ -0,0 +1,24 @@
+
+<?php
+
+namespace Elhebert\SubresourceIntegrity\Components;
+
+use Illuminate\View\Component;
+use Elhebert\SubresourceIntegrity\SriFacade as Sri;
+
+class LinkMix extends Component
+{
+    private string $href;
+
+    public function __construct(string $href)
+    {
+        $this->href = $href;
+    }
+
+    public function render(): string
+    {
+        return <<<'blade'
+            <link href="{{ mix($href) }}  integrity="{{ Sri::hash($this->href) }}" {{ $this->attributes }} />
+        blade;
+    }
+}
diff --git a/src/Components/Script.php b/src/Components/Script.php
new file mode 100644
index 0000000..3567659
--- /dev/null
+++ b/src/Components/Script.php
@@ -0,0 +1,24 @@
+
+<?php
+
+namespace Elhebert\SubresourceIntegrity\Components;
+
+use Illuminate\View\Component;
+use Elhebert\SubresourceIntegrity\SriFacade as Sri;
+
+class Script extends Component
+{
+    private string $src;
+
+    public function __construct(string $src)
+    {
+        $this->src = $src;
+    }
+
+    public function render(): string
+    {
+        return <<<'blade'
+            <script src="{{ asset($this->src) }} integrity="{{ Sri::hash($this->src) }}" {{ $this->attributes }} />
+        blade;
+    }
+}
diff --git a/src/Components/ScriptMix.php b/src/Components/ScriptMix.php
new file mode 100644
index 0000000..7cda957
--- /dev/null
+++ b/src/Components/ScriptMix.php
@@ -0,0 +1,24 @@
+
+<?php
+
+namespace Elhebert\SubresourceIntegrity\Components;
+
+use Illuminate\View\Component;
+use Elhebert\SubresourceIntegrity\SriFacade as Sri;
+
+class ScriptMix extends Component
+{
+    private string $src;
+
+    public function __construct(string $src)
+    {
+        $this->src = $src;
+    }
+
+    public function render(): string
+    {
+        return <<<'blade'
+            <script src="{{ mix($this->src) }} integrity="{{ Sri::hash($this->src }}" {{ $this->attributes }} />
+        blade;
+    }
+}
diff --git a/src/SriServiceProvider.php b/src/SriServiceProvider.php
index 593f9ab..078b364 100644
--- a/src/SriServiceProvider.php
+++ b/src/SriServiceProvider.php
@@ -4,6 +4,10 @@
 
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
+use Elhebert\SubresourceIntegrity\Components\Link;
+use Elhebert\SubresourceIntegrity\Components\Script;
+use Elhebert\SubresourceIntegrity\Components\LinkMix;
+use Elhebert\SubresourceIntegrity\Components\ScriptMix;
 
 class SriServiceProvider extends ServiceProvider
 {
@@ -13,8 +17,6 @@ public function register()
             return new Sri(config('subresource-integrity.algorithm'));
         });
 
-        $this->app->alias(Sri::class, 'sri');
-
         $this->mergeConfigFrom(
             __DIR__.'/../config/subresource-integrity.php',
             'subresource-integrity'
@@ -27,12 +29,9 @@ public function boot()
             __DIR__.'/../config/subresource-integrity.php' => config_path('subresource-integrity.php'),
         ]);
 
-        Blade::directive('mixSri', function ($arguments) {
-            return "<?php echo app('".Sri::class."')->mix({$arguments}) ?>";
-        });
-
-        Blade::directive('assetSri', function ($arguments) {
-            return "<?php echo app('".Sri::class."')->asset({$arguments}) ?>";
-        });
+        Blade::component('sri.script', Script::class);
+        Blade::component('sri.script.mix', ScriptMix::class);
+        Blade::component('sri.link', Link::class);
+        Blade::component('sri.link.mix', LinkMix::class);
     }
 }

From 6e395e5edb77c985b44d63598ba07d630a46e2c3 Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@trivago.com>
Date: Thu, 10 Sep 2020 14:16:22 +0200
Subject: [PATCH 02/13] (fix): alias facade

---
 src/Components/Link.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Link.php b/src/Components/Link.php
index b42f5d0..62342bc 100644
--- a/src/Components/Link.php
+++ b/src/Components/Link.php
@@ -4,7 +4,7 @@
 namespace Elhebert\SubresourceIntegrity\Components;
 
 use Illuminate\View\Component;
-use Elhebert\SubresourceIntegrity\Sri;
+use Elhebert\SubresourceIntegrity\SriFacade as Sri;
 
 class Link extends Component
 {

From 6f83467a4caf4926f4c59553b90fade64f054976 Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@trivago.com>
Date: Fri, 11 Sep 2020 08:44:40 +0200
Subject: [PATCH 03/13] cleanup blade directives and add tests

---
 phpunit.xml.dist                    |  58 +++++++------
 src/Components/Link.php             |  19 +++-
 src/Components/LinkMix.php          |  24 ------
 src/Components/Script.php           |  19 +++-
 src/Components/ScriptMix.php        |  24 ------
 src/Sri.php                         |  49 ++---------
 src/SriServiceProvider.php          |   6 +-
 tests/BladeDirectiveTest.php        |  53 ------------
 tests/GenerateSriAssetTest.php      | 129 ----------------------------
 tests/GenerateSriMixTest.php        | 108 -----------------------
 tests/LinkComponentTest.php         |  49 +++++++++++
 tests/ScriptComponentTest.php       |  49 +++++++++++
 tests/files/assetSri-view.blade.php |   1 -
 tests/files/link.blade.php          |   1 +
 tests/files/mixSri-view.blade.php   |   1 -
 tests/files/script.blade.php        |   1 +
 16 files changed, 168 insertions(+), 423 deletions(-)
 delete mode 100644 src/Components/LinkMix.php
 delete mode 100644 src/Components/ScriptMix.php
 delete mode 100644 tests/BladeDirectiveTest.php
 delete mode 100644 tests/GenerateSriAssetTest.php
 delete mode 100644 tests/GenerateSriMixTest.php
 create mode 100644 tests/LinkComponentTest.php
 create mode 100644 tests/ScriptComponentTest.php
 delete mode 100644 tests/files/assetSri-view.blade.php
 create mode 100644 tests/files/link.blade.php
 delete mode 100644 tests/files/mixSri-view.blade.php
 create mode 100644 tests/files/script.blade.php

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2f754ac..4f93b8c 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Sri test suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    bootstrap="vendor/autoload.php"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    colors="true"
+    verbose="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="false"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Sri test suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
 </phpunit>
diff --git a/src/Components/Link.php b/src/Components/Link.php
index 62342bc..bd933e7 100644
--- a/src/Components/Link.php
+++ b/src/Components/Link.php
@@ -1,4 +1,3 @@
-
 <?php
 
 namespace Elhebert\SubresourceIntegrity\Components;
@@ -8,17 +7,29 @@
 
 class Link extends Component
 {
-    private string $href;
+    public string $href;
+    public bool $mix = false;
 
-    public function __construct(string $href)
+    public function __construct(string $href, bool $mix = false)
     {
         $this->href = $href;
+        $this->mix = $mix;
+    }
+
+    public function integrity(): string
+    {
+        return Sri::hash($this->href);
+    }
+
+    public function path(): string
+    {
+        return $this->mix ? mix($this->href) : asset($this->href);
     }
 
     public function render(): string
     {
         return <<<'blade'
-            <link href="{{ asset($this->href) }} integrity="{{ Sri::hash($this->href) }}" {{ $this->attributes }} />
+            <link href="{{ $path() }}" integrity="{{ $integrity() }}" {{ $attributes }} />
         blade;
     }
 }
diff --git a/src/Components/LinkMix.php b/src/Components/LinkMix.php
deleted file mode 100644
index e55e3ae..0000000
--- a/src/Components/LinkMix.php
+++ /dev/null
@@ -1,24 +0,0 @@
-
-<?php
-
-namespace Elhebert\SubresourceIntegrity\Components;
-
-use Illuminate\View\Component;
-use Elhebert\SubresourceIntegrity\SriFacade as Sri;
-
-class LinkMix extends Component
-{
-    private string $href;
-
-    public function __construct(string $href)
-    {
-        $this->href = $href;
-    }
-
-    public function render(): string
-    {
-        return <<<'blade'
-            <link href="{{ mix($href) }}  integrity="{{ Sri::hash($this->href) }}" {{ $this->attributes }} />
-        blade;
-    }
-}
diff --git a/src/Components/Script.php b/src/Components/Script.php
index 3567659..18418a2 100644
--- a/src/Components/Script.php
+++ b/src/Components/Script.php
@@ -1,4 +1,3 @@
-
 <?php
 
 namespace Elhebert\SubresourceIntegrity\Components;
@@ -8,17 +7,29 @@
 
 class Script extends Component
 {
-    private string $src;
+    public string $src;
+    public bool $mix;
 
-    public function __construct(string $src)
+    public function __construct(string $src, bool $mix = false)
     {
         $this->src = $src;
+        $this->mix = $mix;
+    }
+
+    public function integrity(): string
+    {
+        return Sri::hash($this->src);
+    }
+
+    public function path(): string
+    {
+        return $this->mix ? mix($this->src) : asset($this->src);
     }
 
     public function render(): string
     {
         return <<<'blade'
-            <script src="{{ asset($this->src) }} integrity="{{ Sri::hash($this->src) }}" {{ $this->attributes }} />
+            <script src="{{ $path() }}" integrity="{{ $integrity() }}" {{ $attributes }} />
         blade;
     }
 }
diff --git a/src/Components/ScriptMix.php b/src/Components/ScriptMix.php
deleted file mode 100644
index 7cda957..0000000
--- a/src/Components/ScriptMix.php
+++ /dev/null
@@ -1,24 +0,0 @@
-
-<?php
-
-namespace Elhebert\SubresourceIntegrity\Components;
-
-use Illuminate\View\Component;
-use Elhebert\SubresourceIntegrity\SriFacade as Sri;
-
-class ScriptMix extends Component
-{
-    private string $src;
-
-    public function __construct(string $src)
-    {
-        $this->src = $src;
-    }
-
-    public function render(): string
-    {
-        return <<<'blade'
-            <script src="{{ mix($this->src) }} integrity="{{ Sri::hash($this->src }}" {{ $this->attributes }} />
-        blade;
-    }
-}
diff --git a/src/Sri.php b/src/Sri.php
index ec71826..7b1da6c 100644
--- a/src/Sri.php
+++ b/src/Sri.php
@@ -8,14 +8,15 @@
 
 class Sri
 {
-    /** @var string */
-    private $algorithm;
+    private string $algorithm;
+    private string $jsonFilePath;
 
     public function __construct(string $algorithm)
     {
         $this->algorithm = in_array($algorithm, ['sha256', 'sha384', 'sha512'])
             ? $algorithm
             : 'sha256';
+        $this->jsonFilePath = config('subresource-integrity.mix_sri_path');
     }
 
     public function html(string $path, bool $useCredentials = false): HtmlString
@@ -50,7 +51,7 @@ public function hash(string $path): string
         }
 
         if ($this->mixFileExists()) {
-            $json = json_decode(file_get_contents($this->jsonFilePath()));
+            $json = json_decode(file_get_contents($this->jsonFilePath));
             $prefixedPath = Str::startsWith($path, '/') ? $path : "/{$path}";
 
             if (property_exists($json, $prefixedPath)) {
@@ -64,41 +65,6 @@ public function hash(string $path): string
         return "{$this->algorithm}-{$base64Hash}";
     }
 
-    public function mix(string $path, bool $useCredentials = false, string $attributes = ''): string
-    {
-        if (Str::startsWith($path, ['http', 'https', '//'])) {
-            $href = $path;
-        } else {
-            $href = mix($path);
-        }
-
-        return $this->generateHtmlTag($href, $path, $useCredentials, $attributes);
-    }
-
-    public function asset(string $path, bool $useCredentials = false, string $attributes = ''): string
-    {
-        if (Str::startsWith($path, ['http', 'https', '//'])) {
-            $href = $path;
-        } else {
-            $href = asset($path);
-        }
-
-        return $this->generateHtmlTag($href, $path, $useCredentials, $attributes);
-    }
-
-    private function generateHtmlTag(string $href, string $path, bool $useCredentials, string $attributes): string
-    {
-        $integrity = $this->html($path, $useCredentials);
-
-        if (Str::endsWith($path, 'css')) {
-            return "<link href='{$href}' rel='stylesheet' {$integrity} {$attributes}>";
-        } elseif (Str::endsWith($path, 'js')) {
-            return "<script src='{$href}' {$integrity} {$attributes}></script>";
-        } else {
-            throw new \Exception('Invalid file');
-        }
-    }
-
     private function existsInConfigFile(string $path): bool
     {
         return array_key_exists($path, config('subresource-integrity.hashes'));
@@ -106,7 +72,7 @@ private function existsInConfigFile(string $path): bool
 
     private function mixFileExists(): bool
     {
-        return file_exists($this->jsonFilePath());
+        return file_exists($this->jsonFilePath);
     }
 
     private function getFileContent(string $path): string
@@ -130,9 +96,4 @@ private function getFileContent(string $path): string
 
         return $fileContent;
     }
-
-    private function jsonFilePath(): string
-    {
-        return config('subresource-integrity.mix_sri_path');
-    }
 }
diff --git a/src/SriServiceProvider.php b/src/SriServiceProvider.php
index 078b364..d1119fc 100644
--- a/src/SriServiceProvider.php
+++ b/src/SriServiceProvider.php
@@ -6,8 +6,6 @@
 use Illuminate\Support\ServiceProvider;
 use Elhebert\SubresourceIntegrity\Components\Link;
 use Elhebert\SubresourceIntegrity\Components\Script;
-use Elhebert\SubresourceIntegrity\Components\LinkMix;
-use Elhebert\SubresourceIntegrity\Components\ScriptMix;
 
 class SriServiceProvider extends ServiceProvider
 {
@@ -17,6 +15,8 @@ public function register()
             return new Sri(config('subresource-integrity.algorithm'));
         });
 
+        $this->app->alias(Sri::class, 'sri');
+
         $this->mergeConfigFrom(
             __DIR__.'/../config/subresource-integrity.php',
             'subresource-integrity'
@@ -30,8 +30,6 @@ public function boot()
         ]);
 
         Blade::component('sri.script', Script::class);
-        Blade::component('sri.script.mix', ScriptMix::class);
         Blade::component('sri.link', Link::class);
-        Blade::component('sri.link.mix', LinkMix::class);
     }
 }
diff --git a/tests/BladeDirectiveTest.php b/tests/BladeDirectiveTest.php
deleted file mode 100644
index 97c065b..0000000
--- a/tests/BladeDirectiveTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Elhebert\SubresourceIntegrity\Tests;
-
-use Illuminate\Support\Facades\View;
-
-class BladeDirectiveTest extends TestCase
-{
-    protected function tearDown(): void
-    {
-        $this->artisan('view:clear');
-
-        parent::tearDown();
-    }
-
-    /** @test */
-    public function it_renders_mixSri_directive()
-    {
-        config([
-            'subresource-integrity.mix_sri_path' => './tests/files/mix-sri.json',
-        ]);
-
-        $this->app->instance('path.public', __DIR__.'/files');
-
-        $view = View::file(__DIR__.'/files/mixSri-view.blade.php', [
-            'asset' => 'css/app.css',
-            'useCredentials' => false,
-            'attributes' => '',
-        ])->render();
-
-        $this->assertStringContainsString('this-hash-is-valid', $view);
-    }
-
-    /** @test */
-    public function it_renders_assetSri_directive()
-    {
-        config([
-            'subresource-integrity.base_path' => './tests/files',
-            'app.asset_url' => 'tests/files',
-        ]);
-
-        $hash = hash('sha256', file_get_contents('./tests/files/app.js'), true);
-        $base64Hash = base64_encode($hash);
-
-        $view = View::file(__DIR__.'/files/assetSri-view.blade.php', [
-            'asset' => 'app.js',
-            'useCredentials' => false,
-            'attributes' => '',
-        ])->render();
-
-        $this->assertStringContainsString('integrity="sha256-'.$base64Hash.'"', $view);
-    }
-}
diff --git a/tests/GenerateSriAssetTest.php b/tests/GenerateSriAssetTest.php
deleted file mode 100644
index 9106bcc..0000000
--- a/tests/GenerateSriAssetTest.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-namespace Elhebert\SubresourceIntegrity\Tests;
-
-use Elhebert\SubresourceIntegrity\SriFacade as Sri;
-
-class GenerateSriAssetTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        config([
-            'subresource-integrity.base_path' => './tests/files',
-            'app.asset_url' => 'tests/files',
-        ]);
-    }
-
-    /** @test */
-    public function it_generates_css_with_integrity()
-    {
-        $hash = hash('sha256', file_get_contents('./tests/files/app.css'), true);
-        $base64Hash = base64_encode($hash);
-
-        $asset_string = Sri::asset('app.css');
-
-        $this->assertStringContainsString('link', $asset_string);
-        $this->assertStringContainsString('integrity="sha256-'.$base64Hash.'"', $asset_string);
-    }
-
-    /** @test */
-    public function it_generates_css_with_integrity_and_credentials()
-    {
-        $hash = hash('sha256', file_get_contents('./tests/files/app.css'), true);
-        $base64Hash = base64_encode($hash);
-
-        $asset_string = Sri::asset('app.css', true);
-
-        $this->assertStringContainsString('integrity="sha256-'.$base64Hash.'"', $asset_string);
-        $this->assertStringContainsString('crossorigin="use-credentials"', $asset_string);
-        $this->assertStringContainsString('link', $asset_string);
-    }
-
-    /** @test */
-    public function it_generates_css_with_integrity_and_attributes()
-    {
-        $hash = hash('sha256', file_get_contents('./tests/files/app.css'), true);
-        $base64Hash = base64_encode($hash);
-
-        $asset_string = Sri::asset('app.css', false, 'rel="stylesheet"');
-
-        $this->assertStringContainsString('link', $asset_string);
-        $this->assertStringContainsString('integrity="sha256-'.$base64Hash.'"', $asset_string);
-        $this->assertStringContainsString('rel="stylesheet"', $asset_string);
-    }
-
-    /** @test */
-    public function it_generates_css_with_integrity_credentials_and_attributes()
-    {
-        $hash = hash('sha256', file_get_contents('./tests/files/app.css'), true);
-        $base64Hash = base64_encode($hash);
-
-        $asset_string = Sri::asset('app.css', true, 'rel="stylesheet"');
-
-        $this->assertStringContainsString('link', $asset_string);
-        $this->assertStringContainsString('integrity="sha256-'.$base64Hash.'"', $asset_string);
-        $this->assertStringContainsString('crossorigin="use-credentials"', $asset_string);
-        $this->assertStringContainsString('rel="stylesheet"', $asset_string);
-    }
-
-    /** @test */
-    public function it_generates_js_with_integrity()
-    {
-        $hash = hash('sha256', file_get_contents('./tests/files/app.js'), true);
-        $base64Hash = base64_encode($hash);
-
-        $asset_string = Sri::asset('app.js');
-
-        $this->assertStringContainsString('script', $asset_string);
-        $this->assertStringContainsString('integrity="sha256-'.$base64Hash.'"', $asset_string);
-    }
-
-    /** @test */
-    public function it_generates_js_with_integrity_and_credentials()
-    {
-        $hash = hash('sha256', file_get_contents('./tests/files/app.js'), true);
-        $base64Hash = base64_encode($hash);
-
-        $asset_string = Sri::asset('app.js', true);
-
-        $this->assertStringContainsString('script', $asset_string);
-        $this->assertStringContainsString('integrity="sha256-'.$base64Hash.'"', $asset_string);
-        $this->assertStringContainsString('crossorigin="use-credentials"', $asset_string);
-    }
-
-    /** @test */
-    public function it_generates_js_with_integrity_and_attributes()
-    {
-        $hash = hash('sha256', file_get_contents('./tests/files/app.js'), true);
-        $base64Hash = base64_encode($hash);
-
-        $asset_string = Sri::asset('app.js', false, 'type="application/javascript" async');
-
-        $this->assertStringContainsString('script', $asset_string);
-        $this->assertStringContainsString('integrity="sha256-'.$base64Hash.'"', $asset_string);
-        $this->assertStringContainsString('type="application/javascript" async', $asset_string);
-    }
-
-    /** @test */
-    public function it_generates_js_with_integrity_credentials_and_attributes()
-    {
-        $hash = hash('sha256', file_get_contents('./tests/files/app.js'), true);
-        $base64Hash = base64_encode($hash);
-
-        $asset_string = Sri::asset('app.js', true, 'type="application/javascript" async');
-
-        $this->assertStringContainsString('script', $asset_string);
-        $this->assertStringContainsString('integrity="sha256-'.$base64Hash.'"', $asset_string);
-        $this->assertStringContainsString('crossorigin="use-credentials"', $asset_string);
-        $this->assertStringContainsString('type="application/javascript" async', $asset_string);
-    }
-
-    /** @test */
-    public function it_throws_an_exception_if_file_extension_invalid()
-    {
-        $this->expectExceptionMessage('Invalid file');
-        Sri::asset('app.jpeg');
-    }
-}
diff --git a/tests/GenerateSriMixTest.php b/tests/GenerateSriMixTest.php
deleted file mode 100644
index 8d75c2d..0000000
--- a/tests/GenerateSriMixTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Elhebert\SubresourceIntegrity\Tests;
-
-use Elhebert\SubresourceIntegrity\SriFacade as Sri;
-
-class GenerateSriMixTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        config([
-            'subresource-integrity.mix_sri_path' => './tests/files/mix-sri.json',
-            'view.paths' => ['./tests/files'],
-        ]);
-
-        $this->app->instance('path.public', __DIR__.'/files');
-    }
-
-    /** @test */
-    public function it_generates_css_with_integrity()
-    {
-        $mix_string = Sri::mix('css/app.css');
-
-        $this->assertStringContainsString('link', $mix_string);
-        $this->assertStringContainsString('this-hash-is-valid', $mix_string);
-    }
-
-    /** @test */
-    public function it_generates_css_with_integrity_and_credentials()
-    {
-        $mix_string = Sri::mix('css/app.css', true);
-
-        $this->assertStringContainsString('link', $mix_string);
-        $this->assertStringContainsString('this-hash-is-valid', $mix_string);
-        $this->assertStringContainsString('crossorigin="use-credentials"', $mix_string);
-    }
-
-    /** @test */
-    public function it_generates_css_with_integrity_and_attributes()
-    {
-        $mix_string = Sri::mix('css/app.css', false, 'rel="stylesheet"');
-
-        $this->assertStringContainsString('link', $mix_string);
-        $this->assertStringContainsString('this-hash-is-valid', $mix_string);
-        $this->assertStringContainsString('rel="stylesheet"', $mix_string);
-    }
-
-    /** @test */
-    public function it_generates_css_with_integrity_credentials_and_attributes()
-    {
-        $mix_string = Sri::mix('css/app.css', true, 'rel="stylesheet"');
-
-        $this->assertStringContainsString('link', $mix_string);
-        $this->assertStringContainsString('this-hash-is-valid', $mix_string);
-        $this->assertStringContainsString('crossorigin="use-credentials"', $mix_string);
-        $this->assertStringContainsString('rel="stylesheet"', $mix_string);
-    }
-
-    /** @test */
-    public function it_generates_js_with_integrity()
-    {
-        $mix_string = Sri::mix('js/app.js');
-
-        $this->assertStringContainsString('script', $mix_string);
-        $this->assertStringContainsString('this-hash-is-valid', $mix_string);
-    }
-
-    /** @test */
-    public function it_generates_js_with_integrity_and_credentials()
-    {
-        $mix_string = Sri::mix('js/app.js', true);
-
-        $this->assertStringContainsString('script', $mix_string);
-        $this->assertStringContainsString('this-hash-is-valid', $mix_string);
-        $this->assertStringContainsString('crossorigin="use-credentials"', $mix_string);
-    }
-
-    /** @test */
-    public function it_generates_js_with_integrity_and_attributes()
-    {
-        $mix_string = Sri::mix('js/app.js', false, 'type="application/javascript" async');
-
-        $this->assertStringContainsString('script', $mix_string);
-        $this->assertStringContainsString('this-hash-is-valid', $mix_string);
-        $this->assertStringContainsString('type="application/javascript" async', $mix_string);
-    }
-
-    /** @test */
-    public function it_generates_js_with_integrity_credentials_and_attributes()
-    {
-        $mix_string = Sri::mix('js/app.js', true, 'type="application/javascript" async');
-
-        $this->assertStringContainsString('script', $mix_string);
-        $this->assertStringContainsString('this-hash-is-valid', $mix_string);
-        $this->assertStringContainsString('crossorigin="use-credentials"', $mix_string);
-        $this->assertStringContainsString('type="application/javascript" async', $mix_string);
-    }
-
-    /** @test */
-    public function it_throws_an_exception_if_file_extension_invalid()
-    {
-        $this->expectExceptionMessage('Invalid file');
-
-        Sri::mix('app.jpeg');
-    }
-}
diff --git a/tests/LinkComponentTest.php b/tests/LinkComponentTest.php
new file mode 100644
index 0000000..068359f
--- /dev/null
+++ b/tests/LinkComponentTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Elhebert\SubresourceIntegrity\Tests;
+
+use Illuminate\Support\Facades\View;
+
+class LinkComponentTest extends TestCase
+{
+    protected function tearDown(): void
+    {
+        $this->artisan('view:clear');
+
+        parent::tearDown();
+    }
+
+    /** @test */
+    public function it_renders_the_component()
+    {
+        config([
+            'subresource-integrity.mix_sri_path' => './tests/files/mix-sri.json',
+        ]);
+
+        $this->app->instance('path.public', __DIR__.'/files');
+
+        $view = View::file(__DIR__.'/files/link.blade.php', ['mix' => false])->render();
+
+        $this->assertStringContainsString(
+            '<link href="http://localhost/css/app.css" integrity="this-hash-is-valid" rel="stylesheet" />',
+            $view
+        );
+    }
+
+    /** @test */
+    public function it_uses_mix_when_the_mix_attribute_is_passed()
+    {
+        config([
+            'subresource-integrity.mix_sri_path' => './tests/files/mix-sri.json',
+        ]);
+
+        $this->app->instance('path.public', __DIR__.'/files');
+
+        $view = View::file(__DIR__.'/files/link.blade.php', ['mix' => true])->render();
+
+        $this->assertStringContainsString(
+            '<link href="/css/app.css?id=some-random-string" integrity="this-hash-is-valid" rel="stylesheet" />',
+            $view
+        );
+    }
+}
diff --git a/tests/ScriptComponentTest.php b/tests/ScriptComponentTest.php
new file mode 100644
index 0000000..7417b9a
--- /dev/null
+++ b/tests/ScriptComponentTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Elhebert\SubresourceIntegrity\Tests;
+
+use Illuminate\Support\Facades\View;
+
+class ScriptComponentTest extends TestCase
+{
+    protected function tearDown(): void
+    {
+        $this->artisan('view:clear');
+
+        parent::tearDown();
+    }
+
+    /** @test */
+    public function it_renders_the_component()
+    {
+        config([
+            'subresource-integrity.mix_sri_path' => './tests/files/mix-sri.json',
+        ]);
+
+        $this->app->instance('path.public', __DIR__.'/files');
+
+        $view = View::file(__DIR__.'/files/script.blade.php', ['mix' => false])->render();
+
+        $this->assertStringContainsString(
+            '<script src="http://localhost/js/app.js" integrity="this-hash-is-valid"  />',
+            $view
+        );
+    }
+
+    /** @test */
+    public function it_uses_mix_when_the_mix_attribute_is_passed()
+    {
+        config([
+            'subresource-integrity.mix_sri_path' => './tests/files/mix-sri.json',
+        ]);
+
+        $this->app->instance('path.public', __DIR__.'/files');
+
+        $view = View::file(__DIR__.'/files/script.blade.php', ['mix' => true])->render();
+
+        $this->assertStringContainsString(
+            '<script src="/js/app.js?id=some-random-string" integrity="this-hash-is-valid"  />',
+            $view
+        );
+    }
+}
diff --git a/tests/files/assetSri-view.blade.php b/tests/files/assetSri-view.blade.php
deleted file mode 100644
index 8b87ec1..0000000
--- a/tests/files/assetSri-view.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-@assetSri($asset, $useCredentials, $attributes)
\ No newline at end of file
diff --git a/tests/files/link.blade.php b/tests/files/link.blade.php
new file mode 100644
index 0000000..fd39b95
--- /dev/null
+++ b/tests/files/link.blade.php
@@ -0,0 +1 @@
+<x-sri.link href="css/app.css" rel="stylesheet" mix="{{ $mix }}" />
diff --git a/tests/files/mixSri-view.blade.php b/tests/files/mixSri-view.blade.php
deleted file mode 100644
index 985b128..0000000
--- a/tests/files/mixSri-view.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-@mixSri($asset, $useCredentials, $attributes)
\ No newline at end of file
diff --git a/tests/files/script.blade.php b/tests/files/script.blade.php
new file mode 100644
index 0000000..1d138a6
--- /dev/null
+++ b/tests/files/script.blade.php
@@ -0,0 +1 @@
+<x-sri.script src="/js/app.js" mix="{{ $mix }}" />

From cad4449462b9c4dcf48e8f492b72735ea3e80683 Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@trivago.com>
Date: Fri, 11 Sep 2020 08:46:27 +0200
Subject: [PATCH 04/13] linting

---
 src/Components/Link.php    | 2 +-
 src/Components/Script.php  | 2 +-
 src/SriServiceProvider.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Components/Link.php b/src/Components/Link.php
index bd933e7..67d052e 100644
--- a/src/Components/Link.php
+++ b/src/Components/Link.php
@@ -2,8 +2,8 @@
 
 namespace Elhebert\SubresourceIntegrity\Components;
 
-use Illuminate\View\Component;
 use Elhebert\SubresourceIntegrity\SriFacade as Sri;
+use Illuminate\View\Component;
 
 class Link extends Component
 {
diff --git a/src/Components/Script.php b/src/Components/Script.php
index 18418a2..bc051b6 100644
--- a/src/Components/Script.php
+++ b/src/Components/Script.php
@@ -2,8 +2,8 @@
 
 namespace Elhebert\SubresourceIntegrity\Components;
 
-use Illuminate\View\Component;
 use Elhebert\SubresourceIntegrity\SriFacade as Sri;
+use Illuminate\View\Component;
 
 class Script extends Component
 {
diff --git a/src/SriServiceProvider.php b/src/SriServiceProvider.php
index d1119fc..0b111d8 100644
--- a/src/SriServiceProvider.php
+++ b/src/SriServiceProvider.php
@@ -2,10 +2,10 @@
 
 namespace Elhebert\SubresourceIntegrity;
 
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\ServiceProvider;
 use Elhebert\SubresourceIntegrity\Components\Link;
 use Elhebert\SubresourceIntegrity\Components\Script;
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\ServiceProvider;
 
 class SriServiceProvider extends ServiceProvider
 {

From ac5ad672e17da85acab04651bfd37383eefba13c Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@trivago.com>
Date: Fri, 11 Sep 2020 08:55:12 +0200
Subject: [PATCH 05/13] add php 7.2 and 7.3 compatibility back

---
 .github/workflows/phpunit-l7.yml | 4 +---
 composer.json                    | 9 ++++-----
 src/Components/Link.php          | 7 +++++--
 src/Components/Script.php        | 7 +++++--
 src/Sri.php                      | 7 +++++--
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/phpunit-l7.yml b/.github/workflows/phpunit-l7.yml
index 9e62682..c981e81 100644
--- a/.github/workflows/phpunit-l7.yml
+++ b/.github/workflows/phpunit-l7.yml
@@ -16,13 +16,11 @@ jobs:
             fail-fast: false
             matrix:
                 php: [7.4, 7.3, 7.2.5]
-                laravel: [7.*, 6.*]
+                laravel: [7.*]
                 dependency: [prefer-lowest, prefer-stable]
                 include:
                     - laravel: 7.*
                       testbench: 5.*
-                    - laravel: 6.*
-                      testbench: 4.*
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency }}
 
diff --git a/composer.json b/composer.json
index f4fbbd7..1c64f5e 100644
--- a/composer.json
+++ b/composer.json
@@ -9,17 +9,16 @@
     "license": "MIT",
     "authors": [
         {
-            "name": "Dieter Stinglhamber",
-            "email": "elhebert@hotmail.be"
+            "name": "Dieter Stinglhamber"
         }
     ],
     "require": {
         "php": "^7.2.5",
-        "illuminate/support": "^6.0 | ^7.0 | ^8.0"
+        "illuminate/support": "^7.0 | ^8.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^4.0 | ^5.0 | ^6.0",
-        "phpunit/phpunit": "^8.0 | ^9.0 | ^9.3"
+        "orchestra/testbench": "^5.0 | ^6.0",
+        "phpunit/phpunit": "^9.0 | ^9.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Components/Link.php b/src/Components/Link.php
index 67d052e..e056e0c 100644
--- a/src/Components/Link.php
+++ b/src/Components/Link.php
@@ -7,8 +7,11 @@
 
 class Link extends Component
 {
-    public string $href;
-    public bool $mix = false;
+    /** @var string */
+    public $href;
+
+    /** @var bool */
+    public $mix = false;
 
     public function __construct(string $href, bool $mix = false)
     {
diff --git a/src/Components/Script.php b/src/Components/Script.php
index bc051b6..c1e7462 100644
--- a/src/Components/Script.php
+++ b/src/Components/Script.php
@@ -7,8 +7,11 @@
 
 class Script extends Component
 {
-    public string $src;
-    public bool $mix;
+    /** @var string */
+    public $src;
+
+    /** @var bool */
+    public $mix;
 
     public function __construct(string $src, bool $mix = false)
     {
diff --git a/src/Sri.php b/src/Sri.php
index 7b1da6c..76f649b 100644
--- a/src/Sri.php
+++ b/src/Sri.php
@@ -8,8 +8,11 @@
 
 class Sri
 {
-    private string $algorithm;
-    private string $jsonFilePath;
+    /** @var string */
+    private $algorithm;
+
+    /** @var string */
+    private $jsonFilePath;
 
     public function __construct(string $algorithm)
     {

From 6816bd70d470bc26e3beee2143e24b9309dcb259 Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@trivago.com>
Date: Fri, 11 Sep 2020 08:57:15 +0200
Subject: [PATCH 06/13] fix phpunit version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1c64f5e..9d05131 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
     },
     "require-dev": {
         "orchestra/testbench": "^5.0 | ^6.0",
-        "phpunit/phpunit": "^9.0 | ^9.3"
+        "phpunit/phpunit": "^8.0 | ^9.0 | ^9.3"
     },
     "autoload": {
         "psr-4": {

From 0679f60319d85107cf08f53c4bf27c16ba47c39b Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@trivago.com>
Date: Sat, 24 Oct 2020 10:34:15 +0200
Subject: [PATCH 07/13] update test suite

---
 .../LinkTest.php}                             | 20 +++++++++++-------
 .../ScriptTest.php}                           | 21 ++++++++++++-------
 2 files changed, 26 insertions(+), 15 deletions(-)
 rename tests/{ScriptComponentTest.php => Components/LinkTest.php} (51%)
 rename tests/{LinkComponentTest.php => Components/ScriptTest.php} (53%)

diff --git a/tests/ScriptComponentTest.php b/tests/Components/LinkTest.php
similarity index 51%
rename from tests/ScriptComponentTest.php
rename to tests/Components/LinkTest.php
index 7417b9a..cbb9274 100644
--- a/tests/ScriptComponentTest.php
+++ b/tests/Components/LinkTest.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Facades\View;
 
-class ScriptComponentTest extends TestCase
+class LinkTest extends TestCase
 {
     protected function tearDown(): void
     {
@@ -20,12 +20,15 @@ public function it_renders_the_component()
             'subresource-integrity.mix_sri_path' => './tests/files/mix-sri.json',
         ]);
 
-        $this->app->instance('path.public', __DIR__.'/files');
+        $this->app->instance('path.public', dirname(__DIR__).'/files');
 
-        $view = View::file(__DIR__.'/files/script.blade.php', ['mix' => false])->render();
+        $view = View::file(dirname(__DIR__).'/files/link.blade.php', ['mix' => false])->render();
+        $expected = <<<HTML
+        <link href="http://localhost/css/app.css" integrity="this-hash-is-valid" rel="stylesheet" />
+        HTML;
 
         $this->assertStringContainsString(
-            '<script src="http://localhost/js/app.js" integrity="this-hash-is-valid"  />',
+            $expected,
             $view
         );
     }
@@ -37,12 +40,15 @@ public function it_uses_mix_when_the_mix_attribute_is_passed()
             'subresource-integrity.mix_sri_path' => './tests/files/mix-sri.json',
         ]);
 
-        $this->app->instance('path.public', __DIR__.'/files');
+        $this->app->instance('path.public', dirname(__DIR__).'/files');
 
-        $view = View::file(__DIR__.'/files/script.blade.php', ['mix' => true])->render();
+        $view = View::file(dirname(__DIR__).'/files/link.blade.php', ['mix' => true])->render();
+        $expected = <<<HTML
+        <link href="/css/app.css?id=some-random-string" integrity="this-hash-is-valid" rel="stylesheet" />
+        HTML;
 
         $this->assertStringContainsString(
-            '<script src="/js/app.js?id=some-random-string" integrity="this-hash-is-valid"  />',
+            $expected,
             $view
         );
     }
diff --git a/tests/LinkComponentTest.php b/tests/Components/ScriptTest.php
similarity index 53%
rename from tests/LinkComponentTest.php
rename to tests/Components/ScriptTest.php
index 068359f..691c0a1 100644
--- a/tests/LinkComponentTest.php
+++ b/tests/Components/ScriptTest.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Facades\View;
 
-class LinkComponentTest extends TestCase
+class ScriptTest extends TestCase
 {
     protected function tearDown(): void
     {
@@ -20,12 +20,15 @@ public function it_renders_the_component()
             'subresource-integrity.mix_sri_path' => './tests/files/mix-sri.json',
         ]);
 
-        $this->app->instance('path.public', __DIR__.'/files');
+        $this->app->instance('path.public', dirname(__DIR__).'/files');
 
-        $view = View::file(__DIR__.'/files/link.blade.php', ['mix' => false])->render();
+        $view = View::file(dirname(__DIR__).'/files/script.blade.php', ['mix' => false])->render();
+        $expected = <<<HTML
+<script src="http://localhost/js/app.js" integrity="this-hash-is-valid"  />
+HTML;
 
         $this->assertStringContainsString(
-            '<link href="http://localhost/css/app.css" integrity="this-hash-is-valid" rel="stylesheet" />',
+            $expected,
             $view
         );
     }
@@ -37,12 +40,14 @@ public function it_uses_mix_when_the_mix_attribute_is_passed()
             'subresource-integrity.mix_sri_path' => './tests/files/mix-sri.json',
         ]);
 
-        $this->app->instance('path.public', __DIR__.'/files');
-
-        $view = View::file(__DIR__.'/files/link.blade.php', ['mix' => true])->render();
+        $this->app->instance('path.public', dirname(__DIR__).'/files');
 
+        $view = View::file(dirname(__DIR__).'/files/script.blade.php', ['mix' => true])->render();
+        $expected = <<<HTML
+<script src="/js/app.js?id=some-random-string" integrity="this-hash-is-valid"  />
+HTML;
         $this->assertStringContainsString(
-            '<link href="/css/app.css?id=some-random-string" integrity="this-hash-is-valid" rel="stylesheet" />',
+            $expected,
             $view
         );
     }

From ff078aef260e77fbd2f61b523318a56a9f626e97 Mon Sep 17 00:00:00 2001
From: Dieter Sting <3165079+Elhebert@users.noreply.github.com>
Date: Sat, 24 Oct 2020 10:35:09 +0200
Subject: [PATCH 08/13] Apply fixes from StyleCI (#66)

Co-authored-by: Dieter Sting <Elhebert@users.noreply.github.com>
---
 tests/Components/LinkTest.php   | 4 ++--
 tests/Components/ScriptTest.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Components/LinkTest.php b/tests/Components/LinkTest.php
index cbb9274..b00ea3f 100644
--- a/tests/Components/LinkTest.php
+++ b/tests/Components/LinkTest.php
@@ -23,7 +23,7 @@ public function it_renders_the_component()
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
         $view = View::file(dirname(__DIR__).'/files/link.blade.php', ['mix' => false])->render();
-        $expected = <<<HTML
+        $expected = <<<'HTML'
         <link href="http://localhost/css/app.css" integrity="this-hash-is-valid" rel="stylesheet" />
         HTML;
 
@@ -43,7 +43,7 @@ public function it_uses_mix_when_the_mix_attribute_is_passed()
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
         $view = View::file(dirname(__DIR__).'/files/link.blade.php', ['mix' => true])->render();
-        $expected = <<<HTML
+        $expected = <<<'HTML'
         <link href="/css/app.css?id=some-random-string" integrity="this-hash-is-valid" rel="stylesheet" />
         HTML;
 
diff --git a/tests/Components/ScriptTest.php b/tests/Components/ScriptTest.php
index 691c0a1..122ba18 100644
--- a/tests/Components/ScriptTest.php
+++ b/tests/Components/ScriptTest.php
@@ -23,7 +23,7 @@ public function it_renders_the_component()
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
         $view = View::file(dirname(__DIR__).'/files/script.blade.php', ['mix' => false])->render();
-        $expected = <<<HTML
+        $expected = <<<'HTML'
 <script src="http://localhost/js/app.js" integrity="this-hash-is-valid"  />
 HTML;
 
@@ -43,7 +43,7 @@ public function it_uses_mix_when_the_mix_attribute_is_passed()
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
         $view = View::file(dirname(__DIR__).'/files/script.blade.php', ['mix' => true])->render();
-        $expected = <<<HTML
+        $expected = <<<'HTML'
 <script src="/js/app.js?id=some-random-string" integrity="this-hash-is-valid"  />
 HTML;
         $this->assertStringContainsString(

From 8ff1171c92c80d5de6dc4f48b4f3f4e801796b2e Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@trivago.com>
Date: Sat, 24 Oct 2020 11:31:52 +0200
Subject: [PATCH 09/13] drop Laravel 7 support

---
 .github/workflows/phpunit-l7.yml | 50 --------------------------------
 composer.json                    |  8 ++---
 2 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 .github/workflows/phpunit-l7.yml

diff --git a/.github/workflows/phpunit-l7.yml b/.github/workflows/phpunit-l7.yml
deleted file mode 100644
index c981e81..0000000
--- a/.github/workflows/phpunit-l7.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Run PHPUnit tests
-
-on:
-    push:
-        branches:
-            - master
-    pull_request:
-        branches:
-            - master
-
-jobs:
-    tests:
-        runs-on: ubuntu-latest
-
-        strategy:
-            fail-fast: false
-            matrix:
-                php: [7.4, 7.3, 7.2.5]
-                laravel: [7.*]
-                dependency: [prefer-lowest, prefer-stable]
-                include:
-                    - laravel: 7.*
-                      testbench: 5.*
-
-        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency }}
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v1
-
-            - name: Cache dependencies
-              uses: actions/cache@v1
-              with:
-                  path: ~/.composer/cache/files
-                  key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v1
-              with:
-                  php-version: ${{ matrix.php }}
-                  extension: dom, curl, libxml, mbstring, pcntl, bcmath, intl, gd, exif, iconv
-                  coverage: none
-
-            - name: Install dependencies
-              run: |
-                  composer require "illuminate/support:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-                  composer update --${{ matrix.dependency }} --prefer-dist --no-interaction --no-suggest
-
-            - name: Execute tests
-              run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 9d05131..2e12eb4 100644
--- a/composer.json
+++ b/composer.json
@@ -13,12 +13,12 @@
         }
     ],
     "require": {
-        "php": "^7.2.5",
-        "illuminate/support": "^7.0 | ^8.0"
+        "php": "^7.3",
+        "illuminate/support": "^8.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^5.0 | ^6.0",
-        "phpunit/phpunit": "^8.0 | ^9.0 | ^9.3"
+        "orchestra/testbench": "^6.0",
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "psr-4": {

From 14e78b58c2fd72135733d9d7c13eb28ca76eda1c Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@trivago.com>
Date: Sat, 24 Oct 2020 12:07:25 +0200
Subject: [PATCH 10/13] add crossorigin support

---
 README.md                       | 38 ++++++++++++++++++++++++---------
 src/Components/Link.php         | 10 +++++++--
 src/Components/Script.php       | 10 +++++++--
 tests/Components/LinkTest.php   | 32 +++++++++++++++++++++------
 tests/Components/ScriptTest.php | 37 +++++++++++++++++++++++++-------
 tests/files/link.blade.php      |  4 ++++
 tests/files/script.blade.php    |  4 ++++
 7 files changed, 107 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index d3009e3..03e7307 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,10 @@
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/elhebert/laravel-sri.svg?style=flat-square)](https://packagist.org/packages/elhebert/laravel-sri)
 [![Total Downloads](https://img.shields.io/packagist/dt/elhebert/laravel-sri.svg?style=flat-square)](https://packagist.org/packages/elhebert/laravel-sri)
 
-Small Laravel 6+ package that'll generate the integrity hashes for your style and script files.
+Small Laravel 8+ package that'll generate the integrity hashes for your style and script files.
 
 For Laravel 5.5+ support, use the [v1 branch](https://github.com/Elhebert/laravel-sri/tree/v1).
+For Laravel 6+ support, use the [v2 branch](https://github.com/Elhebert/laravel-sri/tree/v2).
 
 ## About Subresources Integrity
 
@@ -71,22 +72,36 @@ To generate the HTML for the `integrity` and the `crossorigin` attributes, use `
 />
 ```
 
-### Blade directive
+### Blade Component
 
-Two blade directive are available to make your views cleaner:
+Alternatively you can use blade components:
 
-Use `@mixSri` to generate the `<link>` or `<script>` tag with the proper attributes and using the `mix()` helper to generate the asset path:
-
-```php
-@mixSri(string $path, bool $useCredentials = 'false', string $attributes = '')
+```html
+<x:sri-link href="css/app.css" rel="stylesheet" />
+<!-- is the equivalent of doing -->
+<link
+    href="{{ asset('css/app.css') }}"
+    rel="stylesheet"
+    integrity="{{ Sri::hash('css/app.css') }}"
+    crossorigin="anonymous"
+/>
 ```
 
-Use `@assetSri` to generate the `<link>` or `<script>` tag with the proper attributes and using the `asset()` helper to generate the asset path:
+If you add a `mix` attributet to the component it'll use `mix()` instead of `asset()` to generate the link to the assets:
 
-```php
-@assetSri(string $path, bool $useCredentials = 'false', string $attributes = '')
+```html
+<x:sri-link mix href="css/app.css" rel="stylesheet" />
+<!-- is the equivalent of doing -->
+<link
+    href="{{ mix('css/app.css') }}"
+    rel="stylesheet"
+    integrity="{{ Sri::hash('css/app.css') }}"
+    crossorigin="anonymous"
+/>
 ```
 
+The Blade components include the `@once` directive to ensure that your tags are only rendered once. This will help with performances as it'll avoid a potential re-hashing of the files (in case you want to hash them on the fly).
+
 ## How to get a hash
 
 ### Store hashes in the configuration
@@ -137,6 +152,9 @@ This package also work for remote resources. Be careful that resources like Goog
     integrity="{{ Sri::hash('http://code.jquery.com/jquery-3.3.1.min.js') }}"
     crossorigin="anonymous"
 ></script>
+
+<!-- or with a blade component -->
+<x:sri-script src="http://code.jquery.com/jquery-3.3.1.min.js"></x:sri-script>
 ```
 
 ## Contributing
diff --git a/src/Components/Link.php b/src/Components/Link.php
index e056e0c..42f71f4 100644
--- a/src/Components/Link.php
+++ b/src/Components/Link.php
@@ -13,10 +13,14 @@ class Link extends Component
     /** @var bool */
     public $mix = false;
 
-    public function __construct(string $href, bool $mix = false)
+    /** @var string */
+    public $crossorigin = 'anonymous';
+
+    public function __construct(string $href, bool $mix = false, string $crossorigin = 'anonymous')
     {
         $this->href = $href;
         $this->mix = $mix;
+        $this->crossorigin = $crossorigin;
     }
 
     public function integrity(): string
@@ -32,7 +36,9 @@ public function path(): string
     public function render(): string
     {
         return <<<'blade'
-            <link href="{{ $path() }}" integrity="{{ $integrity() }}" {{ $attributes }} />
+        @once
+        <link href="{{ $path() }}" integrity="{{ $integrity() }}" crossorigin="{{ $crossorigin }}" {{ $attributes }} />
+        @endonce
         blade;
     }
 }
diff --git a/src/Components/Script.php b/src/Components/Script.php
index c1e7462..6cc93bb 100644
--- a/src/Components/Script.php
+++ b/src/Components/Script.php
@@ -13,10 +13,14 @@ class Script extends Component
     /** @var bool */
     public $mix;
 
-    public function __construct(string $src, bool $mix = false)
+    /** @var string */
+    public $crossorigin = 'anonymous';
+
+    public function __construct(string $src, bool $mix = false, string $crossorigin = 'anonymous')
     {
         $this->src = $src;
         $this->mix = $mix;
+        $this->crossorigin = $crossorigin;
     }
 
     public function integrity(): string
@@ -32,7 +36,9 @@ public function path(): string
     public function render(): string
     {
         return <<<'blade'
-            <script src="{{ $path() }}" integrity="{{ $integrity() }}" {{ $attributes }} />
+        @once
+        <script src="{{ $path() }}" integrity="{{ $integrity() }}" crossorigin="{{ $crossorigin }}" {{ $attributes }} />
+        @endonce
         blade;
     }
 }
diff --git a/tests/Components/LinkTest.php b/tests/Components/LinkTest.php
index b00ea3f..5a0eb9e 100644
--- a/tests/Components/LinkTest.php
+++ b/tests/Components/LinkTest.php
@@ -22,9 +22,9 @@ public function it_renders_the_component()
 
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
-        $view = View::file(dirname(__DIR__).'/files/link.blade.php', ['mix' => false])->render();
-        $expected = <<<'HTML'
-        <link href="http://localhost/css/app.css" integrity="this-hash-is-valid" rel="stylesheet" />
+        $view = View::file(dirname(__DIR__).'/files/link.blade.php', ['mix' => false, 'crossOrigin' => null])->render();
+        $expected = <<<HTML
+        <link href="http://localhost/css/app.css" integrity="this-hash-is-valid" crossorigin="anonymous" rel="stylesheet" />
         HTML;
 
         $this->assertStringContainsString(
@@ -42,9 +42,29 @@ public function it_uses_mix_when_the_mix_attribute_is_passed()
 
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
-        $view = View::file(dirname(__DIR__).'/files/link.blade.php', ['mix' => true])->render();
-        $expected = <<<'HTML'
-        <link href="/css/app.css?id=some-random-string" integrity="this-hash-is-valid" rel="stylesheet" />
+        $view = View::file(dirname(__DIR__).'/files/link.blade.php', ['mix' => true, 'crossOrigin' => null])->render();
+        $expected = <<<HTML
+        <link href="/css/app.css?id=some-random-string" integrity="this-hash-is-valid" crossorigin="anonymous" rel="stylesheet" />
+        HTML;
+
+        $this->assertStringContainsString(
+            $expected,
+            $view
+        );
+    }
+
+    /** @test */
+    public function it_uses_the_crossorigin_attribute_if_passed()
+    {
+        config([
+            'subresource-integrity.mix_sri_path' => './tests/files/mix-sri.json',
+        ]);
+
+        $this->app->instance('path.public', dirname(__DIR__).'/files');
+
+        $view = View::file(dirname(__DIR__).'/files/link.blade.php', ['mix' => false, 'crossOrigin' => 'test'])->render();
+        $expected = <<<HTML
+        <link href="http://localhost/css/app.css" integrity="this-hash-is-valid" crossorigin="test" rel="stylesheet" />
         HTML;
 
         $this->assertStringContainsString(
diff --git a/tests/Components/ScriptTest.php b/tests/Components/ScriptTest.php
index 122ba18..6aa3329 100644
--- a/tests/Components/ScriptTest.php
+++ b/tests/Components/ScriptTest.php
@@ -22,10 +22,10 @@ public function it_renders_the_component()
 
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
-        $view = View::file(dirname(__DIR__).'/files/script.blade.php', ['mix' => false])->render();
-        $expected = <<<'HTML'
-<script src="http://localhost/js/app.js" integrity="this-hash-is-valid"  />
-HTML;
+        $view = View::file(dirname(__DIR__).'/files/script.blade.php', ['mix' => false, 'crossOrigin' => 'anonymous'])->render();
+        $expected = <<<HTML
+        <script src="http://localhost/js/app.js" integrity="this-hash-is-valid" crossorigin="anonymous"  />
+        HTML;
 
         $this->assertStringContainsString(
             $expected,
@@ -42,10 +42,31 @@ public function it_uses_mix_when_the_mix_attribute_is_passed()
 
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
-        $view = View::file(dirname(__DIR__).'/files/script.blade.php', ['mix' => true])->render();
-        $expected = <<<'HTML'
-<script src="/js/app.js?id=some-random-string" integrity="this-hash-is-valid"  />
-HTML;
+        $view = View::file(dirname(__DIR__).'/files/script.blade.php', ['mix' => true, 'crossOrigin' => 'anonymous'])->render();
+        $expected = <<<HTML
+        <script src="/js/app.js?id=some-random-string" integrity="this-hash-is-valid" crossorigin="anonymous"  />
+        HTML;
+
+        $this->assertStringContainsString(
+            $expected,
+            $view
+        );
+    }
+
+    /** @test */
+    public function it_uses_the_crossorigin_attribute_if_passed()
+    {
+        config([
+            'subresource-integrity.mix_sri_path' => './tests/files/mix-sri.json',
+        ]);
+
+        $this->app->instance('path.public', dirname(__DIR__).'/files');
+
+        $view = View::file(dirname(__DIR__).'/files/script.blade.php', ['mix' => false, 'crossOrigin' => 'test'])->render();
+        $expected = <<<HTML
+        <script src="http://localhost/js/app.js" integrity="this-hash-is-valid" crossorigin="test"  />
+        HTML;
+
         $this->assertStringContainsString(
             $expected,
             $view
diff --git a/tests/files/link.blade.php b/tests/files/link.blade.php
index fd39b95..e2ccce1 100644
--- a/tests/files/link.blade.php
+++ b/tests/files/link.blade.php
@@ -1 +1,5 @@
+@if ($crossOrigin)
+<x-sri.link href="css/app.css" rel="stylesheet" mix="{{ $mix }}" crossorigin="{{ $crossOrigin }}" />
+@else
 <x-sri.link href="css/app.css" rel="stylesheet" mix="{{ $mix }}" />
+@endif
diff --git a/tests/files/script.blade.php b/tests/files/script.blade.php
index 1d138a6..e7ba418 100644
--- a/tests/files/script.blade.php
+++ b/tests/files/script.blade.php
@@ -1 +1,5 @@
+@if ($crossOrigin)
+<x-sri.script src="/js/app.js" mix="{{ $mix }}" crossorigin="{{ $crossOrigin }}" />
+@else
 <x-sri.script src="/js/app.js" mix="{{ $mix }}" />
+@endif

From 67a07512c18aa4cb99d70913a4ac0966cf291128 Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@trivago.com>
Date: Tue, 1 Dec 2020 08:35:24 +0100
Subject: [PATCH 11/13] (fix): remove once directive

---
 src/Components/Link.php   | 2 --
 src/Components/Script.php | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/Components/Link.php b/src/Components/Link.php
index 42f71f4..5ee682f 100644
--- a/src/Components/Link.php
+++ b/src/Components/Link.php
@@ -36,9 +36,7 @@ public function path(): string
     public function render(): string
     {
         return <<<'blade'
-        @once
         <link href="{{ $path() }}" integrity="{{ $integrity() }}" crossorigin="{{ $crossorigin }}" {{ $attributes }} />
-        @endonce
         blade;
     }
 }
diff --git a/src/Components/Script.php b/src/Components/Script.php
index 6cc93bb..6b7c1af 100644
--- a/src/Components/Script.php
+++ b/src/Components/Script.php
@@ -36,9 +36,7 @@ public function path(): string
     public function render(): string
     {
         return <<<'blade'
-        @once
         <script src="{{ $path() }}" integrity="{{ $integrity() }}" crossorigin="{{ $crossorigin }}" {{ $attributes }} />
-        @endonce
         blade;
     }
 }

From f6a81ced6a29045befc349a18472697854844946 Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@trivago.com>
Date: Tue, 1 Dec 2020 08:40:38 +0100
Subject: [PATCH 12/13] (docs): update README

---
 README.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 03e7307..12fdaa6 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,24 @@ If you add a `mix` attributet to the component it'll use `mix()` instead of `ass
 />
 ```
 
-The Blade components include the `@once` directive to ensure that your tags are only rendered once. This will help with performances as it'll avoid a potential re-hashing of the files (in case you want to hash them on the fly).
+### Improve performance
+
+You should wrap your `<link>` and `<script>` tags with the [`@once`](https://laravel.com/docs/master/blade#the-once-directive) directive to ensure that your tags are only rendered once. This will help with performances as it'll avoid a potential re-hashing of the files (in case you want to hash them on the fly).
+
+Be careful that this should only be use for production as it won't re-render the html tag. Thus preventing new cache busting id to be added to the path by `mix`.
+
+```html
+@once
+<link
+    href="{{ mix('css/app.css') }}"
+    rel="stylesheet"
+    integrity="{{ Sri::hash('css/app.css') }}"
+    crossorigin="anonymous"
+/>
+<!-- Or using the blade component -->
+<x:sri-link mix href="css/app.css" rel="stylesheet" />
+@endonce
+```
 
 ## How to get a hash
 

From f7cbc9a663fa6656c1764915ba110a7f7894c02a Mon Sep 17 00:00:00 2001
From: Dieter Sting <3165079+Elhebert@users.noreply.github.com>
Date: Sat, 24 Oct 2020 12:09:40 +0200
Subject: [PATCH 13/13] Apply fixes from StyleCI (#67)

Co-authored-by: Dieter Sting <Elhebert@users.noreply.github.com>
---
 tests/Components/LinkTest.php   | 6 +++---
 tests/Components/ScriptTest.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/Components/LinkTest.php b/tests/Components/LinkTest.php
index 5a0eb9e..d34fcdc 100644
--- a/tests/Components/LinkTest.php
+++ b/tests/Components/LinkTest.php
@@ -23,7 +23,7 @@ public function it_renders_the_component()
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
         $view = View::file(dirname(__DIR__).'/files/link.blade.php', ['mix' => false, 'crossOrigin' => null])->render();
-        $expected = <<<HTML
+        $expected = <<<'HTML'
         <link href="http://localhost/css/app.css" integrity="this-hash-is-valid" crossorigin="anonymous" rel="stylesheet" />
         HTML;
 
@@ -43,7 +43,7 @@ public function it_uses_mix_when_the_mix_attribute_is_passed()
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
         $view = View::file(dirname(__DIR__).'/files/link.blade.php', ['mix' => true, 'crossOrigin' => null])->render();
-        $expected = <<<HTML
+        $expected = <<<'HTML'
         <link href="/css/app.css?id=some-random-string" integrity="this-hash-is-valid" crossorigin="anonymous" rel="stylesheet" />
         HTML;
 
@@ -63,7 +63,7 @@ public function it_uses_the_crossorigin_attribute_if_passed()
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
         $view = View::file(dirname(__DIR__).'/files/link.blade.php', ['mix' => false, 'crossOrigin' => 'test'])->render();
-        $expected = <<<HTML
+        $expected = <<<'HTML'
         <link href="http://localhost/css/app.css" integrity="this-hash-is-valid" crossorigin="test" rel="stylesheet" />
         HTML;
 
diff --git a/tests/Components/ScriptTest.php b/tests/Components/ScriptTest.php
index 6aa3329..7a5fe9d 100644
--- a/tests/Components/ScriptTest.php
+++ b/tests/Components/ScriptTest.php
@@ -23,7 +23,7 @@ public function it_renders_the_component()
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
         $view = View::file(dirname(__DIR__).'/files/script.blade.php', ['mix' => false, 'crossOrigin' => 'anonymous'])->render();
-        $expected = <<<HTML
+        $expected = <<<'HTML'
         <script src="http://localhost/js/app.js" integrity="this-hash-is-valid" crossorigin="anonymous"  />
         HTML;
 
@@ -43,7 +43,7 @@ public function it_uses_mix_when_the_mix_attribute_is_passed()
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
         $view = View::file(dirname(__DIR__).'/files/script.blade.php', ['mix' => true, 'crossOrigin' => 'anonymous'])->render();
-        $expected = <<<HTML
+        $expected = <<<'HTML'
         <script src="/js/app.js?id=some-random-string" integrity="this-hash-is-valid" crossorigin="anonymous"  />
         HTML;
 
@@ -63,7 +63,7 @@ public function it_uses_the_crossorigin_attribute_if_passed()
         $this->app->instance('path.public', dirname(__DIR__).'/files');
 
         $view = View::file(dirname(__DIR__).'/files/script.blade.php', ['mix' => false, 'crossOrigin' => 'test'])->render();
-        $expected = <<<HTML
+        $expected = <<<'HTML'
         <script src="http://localhost/js/app.js" integrity="this-hash-is-valid" crossorigin="test"  />
         HTML;