Merge branch '5' into 6.0

silverstripe · Jan 14, 2025 · dd6d7d8 · dd6d7d8
2 parents 4bddf25 + 0aa00a6
commit dd6d7d8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/src/Dev/Deprecation.php b/src/Dev/Deprecation.php
@@ -144,6 +144,9 @@ public static function withSuppressedNotice(callable $func): mixed
      */
     protected static function get_called_method_from_trace($backtrace, $level = 1)
     {
+        if ($backtrace === null) {
+            return '';
+        }
         $level = (int)$level;
         if (!$level) {
             $level = 1;
@@ -188,8 +191,11 @@ private static function get_called_from_trace(array $backtrace, int $level): arr
         return $called;
     }
 
-    private static function isCalledFromSupportedCode(array $backtrace): bool
+    private static function isCalledFromSupportedCode(?array $backtrace): bool
     {
+        if ($backtrace === null) {
+            return false;
+        }
         $called = Deprecation::get_called_from_trace($backtrace, 1);
         $file = $called['file'] ?? '';
         if (!$file) {

diff --git a/src/Forms/SearchableDropdownField.php b/src/Forms/SearchableDropdownField.php
@@ -27,18 +27,6 @@ public function __construct(
         $this->setHasEmptyDefault(true);
     }
 
-    /**
-     * @param string $string
-     * @return $this
-     *
-     * @deprecated 5.2.0 Use setPlaceholder() instead
-     */
-    public function setEmptyString($string)
-    {
-        Deprecation::notice('5.2.0', 'Use setPlaceholder() instead');
-        return parent::setEmptyString($string);
-    }
-
     public function getValueForValidation(): mixed
     {
         $arr = $this->getValueArray();

diff --git a/src/Forms/SearchableDropdownTrait.php b/src/Forms/SearchableDropdownTrait.php
@@ -158,8 +158,7 @@ public function getPlaceholder(): string
      * Calling this will also call setHasEmptyDefault(true), if the method exists on the class,
      * which is required for the placeholder functionality to work on SearchableDropdownField
      *
-     * In the case of SearchableDropField this method should be used instead of setEmptyString() which
-     * will be remvoved in a future version
+     * In the case of SearchableDropField this method should be used instead of setEmptyString()
      */
     public function setPlaceholder(string $placeholder): static
     {