Merge defaults recursively

brandonkelly · brandonkelly · commit 2118f9cf5a30 · 2025-01-20T10:57:39.000-08:00
For #195
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Endpoint configs are now merged into the `defaults` array recursively, making it possible to specify default criteria params. ([#195](https://github.com/craftcms/element-api/issues/195))
 - Fixed an error that occurred if no cache tags were registered by an endpoint’s element query. ([#196](https://github.com/craftcms/element-api/issues/196))
 
 ## 4.1.0 - 2024-03-14
diff --git a/src/controllers/DefaultController.php b/src/controllers/DefaultController.php
@@ -83,7 +83,7 @@ public function actionIndex(string $pattern): Response
 
             if (is_array($config)) {
                 // Merge in the defaults
-                $config = array_merge($plugin->getDefaultResourceAdapterConfig(), $config);
+                $config = ArrayHelper::merge($plugin->getDefaultResourceAdapterConfig(), $config);
             }
 
             // Prevent API endpoints from getting indexed

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function actionIndex(string $pattern): Response`
`83`	`83`
`84`	`84`	`if (is_array($config)) {`
`85`	`85`	`// Merge in the defaults`
`86`		`- $config = array_merge($plugin->getDefaultResourceAdapterConfig(), $config);`
	`86`	`+ $config = ArrayHelper::merge($plugin->getDefaultResourceAdapterConfig(), $config);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`// Prevent API endpoints from getting indexed`