Merge branch 'main' of https://github.com/vormkracht10/laravel-html-m…

…inify-middleware
vormkracht10 · May 10, 2024 · 22022e5 · 22022e5
2 parents cad4c50 + b2bc468
commit 22022e5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/Middleware/MinifyHtml.php b/src/Middleware/MinifyHtml.php
@@ -8,13 +8,13 @@ class MinifyHtml
 {
     public function handle($request, $next)
     {
-        if(! $this->shouldMinifyHtml($request)) {
+        if (! $this->shouldMinifyHtml($request)) {
             return $next($request);
         }
 
         $response = $next($request);
 
-        foreach(config('minify-html.transformers') as $x => $transformer) {
+        foreach (config('minify-html.transformers') as $x => $transformer) {
             $response = (new $transformer)->transform($response);
         }
 
@@ -23,23 +23,23 @@ public function handle($request, $next)
 
     public function shouldMinifyHtml(Request $request)
     {
-        if(! config('minify-html.enabled')) {
+        if (! config('minify-html.enabled')) {
             return false;
         }
 
-        if(! in_array($request->method(), ['GET', 'HEAD'])) {
+        if (! in_array($request->method(), ['GET', 'HEAD'])) {
             return false;
         }
 
-        if($request->isJson() || $request->isXml()) {
+        if ($request->isJson() || $request->isXml()) {
             return false;
         }
 
-        if(! str_contains($request->header('Accept'), 'html')) {
+        if (! str_contains($request->header('Accept'), 'html')) {
             return false;
         }
 
-        if($request->ajax()) {
+        if ($request->ajax()) {
             return false;
         }
 

diff --git a/src/MinifyHtmlServiceProvider.php b/src/MinifyHtmlServiceProvider.php
@@ -4,7 +4,6 @@
 
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
-use Vormkracht10\MinifyHtml\Commands\MinifyHtmlCommand;
 
 class MinifyHtmlServiceProvider extends PackageServiceProvider
 {

diff --git a/src/Transformers/RemoveWhitespace.php b/src/Transformers/RemoveWhitespace.php
@@ -13,10 +13,10 @@ class RemoveWhitespace
     public function hideElements(string $html): string
     {
         foreach ($this->ignoreElements as $element) {
-            $pattern = '~<' . $element . '[^>]*>(.*)</' . $element . '>~Uuis';
+            $pattern = '~<'.$element.'[^>]*>(.*)</'.$element.'>~Uuis';
             if (preg_match_all($pattern, $html, $matches, PREG_SET_ORDER)) {
                 foreach ($matches as $match) {
-                    $this->hiddenElements['#' . md5($match[1]) . '#'] = $match[1];
+                    $this->hiddenElements['#'.md5($match[1]).'#'] = $match[1];
                 }
             }
         }