Merge pull request #74 from creative-commoners/pulls/1/stop-depr

API Stop using deprecated API
silverstripe · Nov 13, 2022 · ec39cb4 · ec39cb4
2 parents 453f6d6 + f49fcd5
commit ec39cb4
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Collections/MemoryConfigCollection.php b/src/Collections/MemoryConfigCollection.php
@@ -221,8 +221,16 @@ public function update($class, $name, $value)
         return $this;
     }
 
+    /**
+     * @param string $class
+     * @param string $name
+     * @param array $value - non-array values are @deprecated 1.12.0
+     */
     public function merge($class, $name, $value)
     {
+        if (!is_array($value)) {
+            Deprecation::notice('1.12.0', 'Use set() if $value is not an array instead');
+        }
         // Detect mergeable config
         $existing = $this->get($class, $name, true);
         if (is_array($value) && is_array($existing)) {