Merge pull request #961 from tranvantri/master

Author: mfn

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.3",
+        "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
 {
@@ -23,4 +24,36 @@ public static function applyEach(Closure $callback, $valueOrValues)
 
         return $callback($valueOrValues);
     }
+
+    /**
+     * Check compatible ability to use thecodingmachine/safe.
+     *
+     * @return string|false
+     */
+    public static function shouldUseSafe(string $methodName)
+    {
+        $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(str_replace('\\Safe\\', '', $methodName), $skipFunctions)) {
+                return false;
+            }
+        }
+
+        if (!\is_callable($methodName)) {
+            return false;
+        }
+
+        return $methodName;
+    }
 }

src/Support/AliasArguments/ArrayKeyChange.php

@@ -3,6 +3,8 @@
 declare(strict_types = 1);
 namespace Rebing\GraphQL\Support\AliasArguments;
 
+use Rebing\GraphQL\Helpers;
+
 class ArrayKeyChange
 {
     public function modify(array $array, array $pathKeyMappings): array
@@ -21,9 +23,17 @@ public function modify(array $array, array $pathKeyMappings): array
      */
     private function orderPaths(array $paths): array
     {
-        \Safe\uksort($paths, function (string $a, string $b): int {
+        $callback = function (string $a, string $b): int {
             return $this->pathLevels($b) <=> $this->pathLevels($a);
-        });
+        };
+
+        $functionName = Helpers::shouldUseSafe('\\Safe\\uksort');
+
+        if (\is_callable($functionName)) {
+            $functionName($paths, $callback);
+        } else {
+            uksort($paths, $callback);
+        }
 
         return $paths;
     }