wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Jul 22, 2023 · 42b57d8 · 42b57d8
1 parent 5314fb2
commit 42b57d8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -34,6 +34,7 @@
         "ext-zip": "*",
         "composer-runtime-api": "^2.2",
         "composer/semver": "^1.5 || ^3.0",
+        "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
         "symfony/console": "^4.3.4 || ^5.0 || ^6.0",
         "symfony/polyfill-ctype": "^1.9",
         "symfony/process": "^4.3.4 || ^5.0 || ^6.0"

diff --git a/src/OperatingSystem.php b/src/OperatingSystem.php
@@ -2,6 +2,7 @@
 
 namespace Orchestra\DuskUpdater;
 
+use Illuminate\Support\Str;
 use InvalidArgumentException;
 
 class OperatingSystem
@@ -142,7 +143,7 @@ public static function onWindows(): bool
             return PHP_OS_FAMILY === 'Windows';
         }
 
-        return PHP_OS === 'WINNT' || mb_strpos(php_uname(), 'Microsoft') !== false;
+        return PHP_OS === 'WINNT' || Str::contains(php_uname(), 'Microsoft');
     }
 
     /**

diff --git a/src/helpers.php b/src/helpers.php
@@ -2,13 +2,15 @@
 
 namespace Orchestra\DuskUpdater;
 
+use Illuminate\Support\Str;
+
 /**
  * Rename exported ChromeDriver binary filename.
  */
 function rename_chromedriver_binary(string $binary, string $operatingSystem): string
 {
-    return mb_strpos($binary, DIRECTORY_SEPARATOR) > 0
-        ? array_reverse(explode(DIRECTORY_SEPARATOR, str_replace('chromedriver', 'chromedriver-'.$operatingSystem, $binary), 2))[0]
+    return Str::contains($binary, DIRECTORY_SEPARATOR)
+        ? Str::after(str_replace('chromedriver', 'chromedriver-'.$operatingSystem, $binary), DIRECTORY_SEPARATOR)
         : str_replace('chromedriver', 'chromedriver-'.$operatingSystem, $binary);
 }