Merge pull request #11 from ExoUNX/dev

Fix config loading issue
gaigelama · Sep 8, 2019 · 76939a1 · 76939a1
2 parents 272364d + abcb0ce
commit 76939a1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ php artisan vendor:publish --provider="ExoUNX\Vasri\Providers\VasriServiceProvid
 
 Note: If you use a CDN like Cloudflare that processes your assets at their edge servers, I recommend you disable it and process your scripts beforehand otherwise resources may not load
 
-You'll need to generate the manifest first by running the following command
+You'll need to generate the manifest first and every time the assets change
 
 ```
 php artisan vasri:build

diff --git a/src/Builder.php b/src/Builder.php
@@ -45,9 +45,9 @@ public function sri(string $file): string
     {
         $algorithm = self::selectAlgorithm();
 
-        return $algorithm.'-'.base64_encode(
-                hash_file($algorithm, public_path($file), true)
-            );
+        return sprintf('%s-%s', $algorithm, base64_encode(
+            hash_file($algorithm, public_path($file), true)
+        ));
     }
 
     /**
@@ -59,7 +59,7 @@ public function sri(string $file): string
      */
     public function versioning(string $file): string
     {
-        return '?id='.hash_file('md5', public_path($file));
+        return sprintf('?id=%s', hash_file('md5', public_path($file)));
     }
 
     /**
@@ -100,7 +100,7 @@ public function attribute(string $file): string
      */
     public function crossOrigin(string $keyword): string
     {
-        return 'crossorigin="'.$keyword.'"';
+        return sprintf('crossorigin="%s"', $keyword);
     }
 
     /**

diff --git a/src/ManifestReader.php b/src/ManifestReader.php
@@ -32,7 +32,7 @@ public function getManifest(string $file): array
 
         } else {
 
-            throw new Exception('Incorrect file path or file does not exist for '.$file);
+            throw new Exception("Incorrect file path or file does not exist for $file");
 
         }
     }

diff --git a/src/Providers/VasriServiceProvider.php b/src/Providers/VasriServiceProvider.php
@@ -38,12 +38,11 @@ public function boot(): void
      */
     public function register()
     {
-        $this->mergeConfigFrom(
-            base_path('/config/vasri.php'), 'vasri'
-        );
         $this->commands([
             \ExoUNX\Vasri\Commands\VasriCommand::class,
         ]);
+
+        $this->mergeConfigFrom(__DIR__.'/../config/vasri.php', 'vasri');
     }
 
 }
diff --git a/src/Vasri.php b/src/Vasri.php
@@ -86,7 +86,8 @@ public function vasri(
      */
     private function getSRI(string $file, string $keyword): string
     {
-        return ' integrity="'.$this->vasriManifest[$file]['sri'].'" '.$this->builder->crossOrigin($keyword);
+
+        return sprintf('integrity="%s" %s', $this->vasriManifest[$file]['sri'], $this->builder->crossOrigin($keyword));
     }
 
     /**
@@ -110,7 +111,7 @@ private function addAttributes(string $file, bool $enableVersioning, bool $enabl
         }
         if ($enableSRI) {
 
-            $output .= $this->getSRI($file, $keyword);
+            $output = sprintf('%s %s', $output, $this->getSRI($file, $keyword));
 
         }
 
@@ -136,7 +137,7 @@ private function getVersioning(string $file): string
      */
     private function getSourceAttribute(string $file, string $version = ''): string
     {
-        return $this->builder->attribute($file).'="'.$file.$version.'"';
+        return sprintf('%s="%s%s"', $this->builder->attribute($file), $file, $version);
     }
 
     /**