Merge branch 'master' into pr

# Conflicts: # composer.json
staudenmeir · Dec 3, 2023 · 862aa81 · 862aa81
2 parents 3a55b50 + dfcc1a9
commit 862aa81
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -15,34 +15,37 @@
     },
     "require-dev": {
         "awobaz/compoships": "^2.2",
+        "barryvdh/laravel-ide-helper": "^2.13",
         "illuminate/pagination": "^10.0",
+        "korridor/laravel-has-many-merged": "^1.0",
+        "mockery/mockery": "^1.6",
+        "orchestra/testbench": "^8.13",
+        "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^10.1",
         "staudenmeir/eloquent-eager-limit": "^1.8",
         "staudenmeir/eloquent-json-relations": "^1.8.2",
-        "staudenmeir/laravel-adjacency-list": "^1.13.7",
-        "korridor/laravel-has-many-merged": "^1.0",
-        "phpstan/phpstan": "^1.10",
-        "barryvdh/laravel-ide-helper": "^2.13",
-        "mockery/mockery": "^1.6",
-        "orchestra/testbench": "^8.13"
+        "staudenmeir/laravel-adjacency-list": "^1.13.7"
     },
     "autoload": {
         "psr-4": {
             "Staudenmeir\\EloquentHasManyDeep\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
     "extra": {
         "laravel": {
             "providers": [
                 "Staudenmeir\\EloquentHasManyDeep\\Providers\\EloquentHasManyDeepServiceProvider"
             ]
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    },
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "config": {
+        "sort-packages": true
+    }
 }