Adjust the sorting rules of variables to group variables in the same …

…configuration file together
worksome · Apr 22, 2024 · f729f37 · f729f37
1 parent 2468219
commit f729f37
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/Envy.php b/src/Envy.php
@@ -38,10 +38,9 @@ public function environmentCalls(bool $excludeCallsWithDefaults = false): Collec
     {
         // @phpstan-ignore-next-line
         return collect($this->finder->configFilePaths())
-            ->map(fn (string $path) => ($this->findEnvironmentCalls)($path, $excludeCallsWithDefaults))
-            ->flatten()
-            // @phpstan-ignore-next-line
-            ->sortBy(fn (EnvironmentCall $call) => $call->getKey());
+            ->sort()
+            ->map(fn (string $path) => ($this->findEnvironmentCalls)($path, $excludeCallsWithDefaults)->sortBy(fn (EnvironmentCall $call) => $call->getKey()))
+            ->flatten();
     }
 
     /**