update thecodingmachine/safe 2.4

Author: tranvantri

composer.json

@@ -39,7 +39,7 @@
         "illuminate/contracts": "^6.0|^8.0|^9.0",
         "illuminate/support": "^6.0|^8.0|^9.0",
         "laragraph/utils": "^1",
-        "thecodingmachine/safe": "^1.1 || ^2",
+        "thecodingmachine/safe": "^1.1|^2.4",
         "webonyx/graphql-php": "^14.6.4"
     },
     "require-dev": {

src/Helpers.php

@@ -4,6 +4,7 @@
 namespace Rebing\GraphQL;
 
 use Closure;
+use OutOfBoundsException;
 
 class Helpers
 {
@@ -27,31 +28,32 @@ public static function applyEach(Closure $callback, $valueOrValues)
     /**
      * Check compatible ability to use thecodingmachine/safe.
      *
-     * @param string $methodName
-     * @return bool
+     * @return string|false
      */
-    public static function shouldUseSafe(string $methodName): bool
+    public static function shouldUseSafe(string $methodName)
     {
-        $safeVersion = \Composer\InstalledVersions::getVersion('thecodingmachine/safe');
+        $packageName = 'thecodingmachine/safe';
+        $safeVersion = \Composer\InstalledVersions::getVersion($packageName);
+
+        if (!$safeVersion) {
+            throw new OutOfBoundsException("Package {$packageName} is being replaced or provided but is not really installed");
+        }
 
         $skipFunctions = [
             'uksort',
         ];
 
         // Version 2.
-        if (version_compare($safeVersion, '2', '>='))
-        {
-            if (in_array($methodName, $skipFunctions))
-            {
+        if (version_compare($safeVersion, '2', '>=')) {
+            if (\in_array(str_replace('\\Safe\\', '', $methodName), $skipFunctions)) {
                 return false;
             }
         }
 
-        if (!is_callable('\\Safe\\' . $methodName))
-        {
+        if (!\is_callable($methodName)) {
             return false;
         }
 
-        return true;
+        return $methodName;
     }
 }

src/Support/AliasArguments/ArrayKeyChange.php

@@ -27,8 +27,10 @@ private function orderPaths(array $paths): array
             return $this->pathLevels($b) <=> $this->pathLevels($a);
         };
 
-        if (Helpers::shouldUseSafe('uksort')) {
-            \Safe\uksort($paths, $callback);
+        $functionName = Helpers::shouldUseSafe('\\Safe\\uksort');
+
+        if (\is_callable($functionName)) {
+            $functionName($paths, $callback);
         } else {
             uksort($paths, $callback);
         }