fix

it-can · it-can · commit 7fb0c1fab483 · 2025-03-15T11:13:58.000+01:00
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "laravellux/html": "^7.1",
         "mockery/mockery": "^1.0",
         "nesbot/carbon": "^1.26.3 || ^2.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^11.5.3",
         "ramsey/uuid": "^3.9|^4.0"
     },
     "autoload": {
diff --git a/src/Artisan/Background.php b/src/Artisan/Background.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * https://github.com/dmitry-ivanov/laravel-helper-functions.
  */
diff --git a/src/Artisan/SessionGarbageCollector.php b/src/Artisan/SessionGarbageCollector.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright (c) $year.
  * @author IT Can (Michiel Vugteveen) <info@it-can.nl>
diff --git a/src/GlobalHelpersServiceProvider.php b/src/GlobalHelpersServiceProvider.php
@@ -94,7 +94,7 @@ static function ($sql, $binding) {
 
                         return preg_replace(
                             '/\?/',
-                            is_string($binding) ? "'" . $binding . "'" : $binding,
+                            is_string($binding) ? "'".$binding."'" : $binding,
                             $sql,
                             1
                         );
@@ -165,7 +165,7 @@ function () {
                 }
             }, 200, [
                 'Content-Type' => 'application/pdf',
-                'Content-Disposition' => 'inline; filename="' . $fileName ?? basename($filePath) . '"',
+                'Content-Disposition' => 'inline; filename="'.$fileName ?? basename($filePath).'"',
             ]);
         });
     }
diff --git a/src/Helpers/CryptHelper.php b/src/Helpers/CryptHelper.php
@@ -27,8 +27,6 @@ public static function encrypt($sourcePath, $destPath, $deleteSourceFile = false
     }
 
     /**
-     * @param  $sourcePath
-     * @param  $destPath
      * @return bool
      *
      * @throws \Exception
@@ -41,7 +39,6 @@ public static function decrypt($sourcePath, $destPath = null)
     }
 
     /**
-     * @param  $sourcePath
      * @return bool
      *
      * @throws \Exception
diff --git a/src/Helpers/FileEncrypter.php b/src/Helpers/FileEncrypter.php
@@ -119,6 +119,7 @@ public function encrypt($sourcePath, $destPath)
                 || ($i + 1 == $numberOfChunks && $fileSize !== strlen($plaintext) + $chunkSize * $i)
             ) {
                 fseek($fpIn, $chunkSize * $i);
+
                 continue;
             }
 
@@ -170,6 +171,7 @@ public function decrypt($sourcePath, $destPath)
                 || ($i + 1 == $numberOfChunks && $fileSize !== strlen($ciphertext) + $chunkSize * $i)
             ) {
                 fseek($fpIn, 16 + 16 * (self::FILE_ENCRYPTION_BLOCKS + 1) * $i);
+
                 continue;
             }
 
diff --git a/src/Helpers/Macros/Trim.php b/src/Helpers/Macros/Trim.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright (c) $year.
  * @author IT Can (Michiel Vugteveen) <info@it-can.nl>
diff --git a/src/Middleware/ValidateJson.php b/src/Middleware/ValidateJson.php
@@ -33,10 +33,10 @@ public function handle($request, Closure $next)
 
         json_decode($request->getContent());
 
-        if (JSON_ERROR_NONE !== json_last_error()) {
+        if (json_last_error() !== JSON_ERROR_NONE) {
             throw new RuntimeException(
                 'Unable to parse JSON data: '
-                . json_last_error_msg()
+                .json_last_error_msg()
             );
         }
 
diff --git a/src/Providers/CarbonServiceProvider.php b/src/Providers/CarbonServiceProvider.php
@@ -48,7 +48,7 @@ public function boot(): void
 
         // Loop through each method and define a macro
         foreach ($methods as $method) {
-            $macro = 'int' . ucfirst($method);
+            $macro = 'int'.ucfirst($method);
 
             Carbon::macro($macro, function (...$args) use ($method) {
                 return (int) abs(call_user_func_array([$this, $method], $args));
diff --git a/src/Response/PdfResponse.php b/src/Response/PdfResponse.php
@@ -10,7 +10,7 @@ public function __construct($content, $filename, $extraHeaders = [])
     {
         $headers = [
             'Content-Type' => 'application/pdf',
-            'Content-Disposition' => 'inline; filename="' . $filename . '"',
+            'Content-Disposition' => 'inline; filename="'.$filename.'"',
         ];
 
         if (is_array($extraHeaders)) {
diff --git a/src/helpers.php b/src/helpers.php
@@ -39,7 +39,7 @@ function cdnUrl($path = '')
     {
         $cdn = (config('settings.cdn')) ?: config('app.url', '/');
 
-        return rtrim($cdn, '/') . '/' . ltrim($path, '/');
+        return rtrim($cdn, '/').'/'.ltrim($path, '/');
     }
 }
 
@@ -78,7 +78,7 @@ function mixCDN($file)
      */
     function uploadUrl($url)
     {
-        return cdnUrl('uploads/' . ltrim($url, '/'));
+        return cdnUrl('uploads/'.ltrim($url, '/'));
     }
 }
 
@@ -91,7 +91,7 @@ function uploadUrl($url)
      */
     function imgUrl($url)
     {
-        return cdnUrl('img/' . ltrim($url, '/'));
+        return cdnUrl('img/'.ltrim($url, '/'));
     }
 }
 
@@ -286,7 +286,7 @@ function getHost($url, $subdomain = true)
         $url = trim($url);
 
         if (stripos($url, '://') === false && substr($url, 0, 1) != '/') {
-            $url = 'http://' . $url;
+            $url = 'http://'.$url;
         }
 
         $parsedUrl = parse_url($url);
@@ -295,20 +295,20 @@ function getHost($url, $subdomain = true)
         $host = array_pop($parts);
 
         if (strlen($tld) === 2 && strlen($host) <= 3) {
-            $tld = $host . '.' . $tld;
+            $tld = $host.'.'.$tld;
             $host = array_pop($parts);
         }
 
         $info = [
             'protocol' => $parsedUrl['scheme'],
             'subdomain' => implode('.', $parts),
-            'domain' => $host . '.' . $tld,
+            'domain' => $host.'.'.$tld,
             'host' => $host,
             'tld' => $tld,
         ];
 
         return ($subdomain && ! empty($info['subdomain']))
-            ? $info['subdomain'] . '.' . $info['domain']
+            ? $info['subdomain'].'.'.$info['domain']
             : $info['domain'];
     }
 }
@@ -342,11 +342,11 @@ function randomFilename($path, $ext, $name = null, $timestamp = true)
         $filename = Str::lower($filename);
 
         if ($timestamp) {
-            $filename .= '-' . time();
+            $filename .= '-'.time();
         }
 
         // Loop until file does not exists
-        while (file_exists($path . '/' . $filename . '.' . $ext)) {
+        while (file_exists($path.'/'.$filename.'.'.$ext)) {
             $filename .= rand(0, 99999);
         }
 
@@ -578,7 +578,7 @@ function callBackground($command, $before = null, $after = null)
      */
     function domainName($url, $withSubdomain = false)
     {
-        $url = 'http://' . str_replace(['http://', 'https://'], '', $url);
+        $url = 'http://'.str_replace(['http://', 'https://'], '', $url);
         $host = parse_url($url, PHP_URL_HOST);
 
         $domain = new Domain($host);
@@ -646,9 +646,9 @@ function formatLicensePlate($plate)
             '/^(\d{3})([A-Z]{2})(\d{1})$/',       // 14    999-XX-9    (since 2019)
 
             // likely upcoming plate patterns
-            //'^(\d{3})(\d{2})([A-Z]{1})$/',       //       999-99-X
-            //'^([A-Z]{3})(\d{2})(\d{1})$/',       //       XXX-99-9
-            //'^([A-Z]{3})([A-Z]{2})(\d{1})$/',    //       XXX-XX-9
+            // '^(\d{3})(\d{2})([A-Z]{1})$/',       //       999-99-X
+            // '^([A-Z]{3})(\d{2})(\d{1})$/',       //       XXX-99-9
+            // '^([A-Z]{3})([A-Z]{2})(\d{1})$/',    //       XXX-XX-9
         ];
 
         $diplomateLicencePlateRegex = '/^CD[ABFJNST]\d{1,3}$/';
@@ -716,10 +716,10 @@ function compressHtmlPDF($html)
 
         // remove ws around block/undisplayed elements
         $html = preg_replace('/\\s+(<\\/?(?:area|article|aside|base(?:font)?|blockquote|body'
-            . '|canvas|caption|center|col(?:group)?|dd|dir|div|dl|dt|fieldset|figcaption|figure|footer|form'
-            . '|frame(?:set)?|h[1-6]|head|header|hgroup|hr|html|legend|li|link|main|map|menu|meta|nav'
-            . '|ol|opt(?:group|ion)|output|p|param|section|t(?:able|body|head|d|h|r|foot|itle)'
-            . '|ul|video)\\b[^>]*>)/iu', '$1', $html);
+            .'|canvas|caption|center|col(?:group)?|dd|dir|div|dl|dt|fieldset|figcaption|figure|footer|form'
+            .'|frame(?:set)?|h[1-6]|head|header|hgroup|hr|html|legend|li|link|main|map|menu|meta|nav'
+            .'|ol|opt(?:group|ion)|output|p|param|section|t(?:able|body|head|d|h|r|foot|itle)'
+            .'|ul|video)\\b[^>]*>)/iu', '$1', $html);
 
         // remove ws outside of all elements
         $html = preg_replace(
diff --git a/tests/HelperTest.php b/tests/HelperTest.php
diff --git a/tests/TestCase.php b/tests/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+`
`2`	`3`	`/**`
`3`	`4`	`* https://github.com/dmitry-ivanov/laravel-helper-functions.`
`4`	`5`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+`
`2`	`3`	`/*`
`3`	`4`	`* Copyright (c) $year.`
`4`	`5`	`* @author IT Can (Michiel Vugteveen) <[email protected]>`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static function ($sql, $binding) {`
`94`	`94`
`95`	`95`	`return preg_replace(`
`96`	`96`	`'/\?/',`
`97`		`- is_string($binding) ? "'" . $binding . "'" : $binding,`
	`97`	`+ is_string($binding) ? "'".$binding."'" : $binding,`
`98`	`98`	`$sql,`
`99`	`99`	`1`
`100`	`100`	`);`
`@@ -165,7 +165,7 @@ function () {`
`165`	`165`	`}`
`166`	`166`	`}, 200, [`
`167`	`167`	`'Content-Type' => 'application/pdf',`
`168`		`- 'Content-Disposition' => 'inline; filename="' . $fileName ?? basename($filePath) . '"',`
	`168`	`+ 'Content-Disposition' => 'inline; filename="'.$fileName ?? basename($filePath).'"',`
`169`	`169`	`]);`
`170`	`170`	`});`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@ public static function encrypt($sourcePath, $destPath, $deleteSourceFile = false`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/**`
`30`		`- * @param $sourcePath`
`31`		`- * @param $destPath`
`32`	`30`	`* @return bool`
`33`	`31`	`*`
`34`	`32`	`* @throws \Exception`
`@@ -41,7 +39,6 @@ public static function decrypt($sourcePath, $destPath = null)`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`/**`
`44`		`- * @param $sourcePath`
`45`	`42`	`* @return bool`
`46`	`43`	`*`
`47`	`44`	`* @throws \Exception`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ public function encrypt($sourcePath, $destPath)`
`119`	`119`	`\|\| ($i + 1 == $numberOfChunks && $fileSize !== strlen($plaintext) + $chunkSize * $i)`
`120`	`120`	`) {`
`121`	`121`	`fseek($fpIn, $chunkSize * $i);`
	`122`	`+`
`122`	`123`	`continue;`
`123`	`124`	`}`
`124`	`125`
`@@ -170,6 +171,7 @@ public function decrypt($sourcePath, $destPath)`
`170`	`171`	`\|\| ($i + 1 == $numberOfChunks && $fileSize !== strlen($ciphertext) + $chunkSize * $i)`
`171`	`172`	`) {`
`172`	`173`	`fseek($fpIn, 16 + 16 * (self::FILE_ENCRYPTION_BLOCKS + 1) * $i);`
	`174`	`+`
`173`	`175`	`continue;`
`174`	`176`	`}`
`175`	`177`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public function __construct($content, $filename, $extraHeaders = [])`
`10`	`10`	`{`
`11`	`11`	`$headers = [`
`12`	`12`	`'Content-Type' => 'application/pdf',`
`13`		`- 'Content-Disposition' => 'inline; filename="' . $filename . '"',`
	`13`	`+ 'Content-Disposition' => 'inline; filename="'.$filename.'"',`
`14`	`14`	`];`
`15`	`15`
`16`	`16`	`if (is_array($extraHeaders)) {`