Merge 5c9c5519f3 into 16cb2702af

MNT Fix unit test

src/ORM/Filters/SearchFilterable.php

@@ -40,7 +40,18 @@ trait SearchFilterable
                 $filterServiceName = "DataListFilter.{$secondArg}";
             }
         }
+        if (is_array($value)) {
+            foreach ($value as $key => $val) {
+                if ($val === '' || $val === 'null') {
+                    $value[] = null;
+                }
 
+            }
+        } else {
+            if ($value === '' || $value === 'null') {
+                $value = ['', null];
+            }
+        }
         // Build instance
         return Injector::inst()->create($filterServiceName, $fieldName, $value, $modifiers);
     }

tests/php/Security/VersionedMemberAuthenticatorTest.php

@@ -43,6 +43,14 @@ class VersionedMemberAuthenticatorTest extends SapphireTest
             return;
         }
 
+        // Explicity add the Versioned extension to Member, even though it's already in $required_extensions.
+        // This is done to call `unset(self::class::$extra_methods[strtolower($subclass)]);` in
+        // Extensible::add_extension() so when CustomMethods::getExtraMethodConfig() updates the $extra_methods
+        // it will include methods of Versioned such as publishSingle()
+        // This issue will only occur when running subsequent unit test classes in the same process, rather than this
+        // this unit test class in isolation
+        Member::add_extension(Versioned::class);
+
         // Enforce dummy validation (this can otherwise be influenced by recipe config)
         Deprecation::withSuppressedNotice(
             fn() => PasswordValidator::singleton()