Merge branch '5.2' into 5

silverstripe · Jul 29, 2024 · 1c77aa9 · 1c77aa9
2 parents db05a28 + d9bccaf
commit 1c77aa9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/Core/CustomMethods.php b/src/Core/CustomMethods.php
@@ -171,11 +171,11 @@ protected function getExtraMethodConfig($method)
         }
         // Lazy define methods
         $lowerClass = strtolower(static::class);
-        if (!isset(self::$extra_methods[$lowerClass])) {
+        if (!isset(self::class::$extra_methods[$lowerClass])) {
             $this->defineMethods();
         }
 
-        return self::$extra_methods[$lowerClass][strtolower($method)] ?? null;
+        return self::class::$extra_methods[$lowerClass][strtolower($method)] ?? null;
     }
 
     /**
@@ -190,8 +190,8 @@ public function allMethodNames($custom = false)
 
         // Query extra methods
         $lowerClass = strtolower(static::class);
-        if ($custom && isset(self::$extra_methods[$lowerClass])) {
-            $methods = array_merge(self::$extra_methods[$lowerClass], $methods);
+        if ($custom && isset(self::class::$extra_methods[$lowerClass])) {
+            $methods = array_merge(self::class::$extra_methods[$lowerClass], $methods);
         }
 
         return $methods;
@@ -207,19 +207,19 @@ protected static function findBuiltInMethods($class = null)
     {
         $class = is_object($class) ? get_class($class) : ($class ?: static::class);
         $lowerClass = strtolower($class);
-        if (isset(self::$built_in_methods[$lowerClass])) {
-            return self::$built_in_methods[$lowerClass];
+        if (isset(self::class::$built_in_methods[$lowerClass])) {
+            return self::class::$built_in_methods[$lowerClass];
         }
 
         // Build new list
         $reflection = new ReflectionClass($class);
         $methods = $reflection->getMethods(ReflectionMethod::IS_PUBLIC);
-        self::$built_in_methods[$lowerClass] = [];
+        self::class::$built_in_methods[$lowerClass] = [];
         foreach ($methods as $method) {
             $name = $method->getName();
-            self::$built_in_methods[$lowerClass][strtolower($name)] = $name;
+            self::class::$built_in_methods[$lowerClass][strtolower($name)] = $name;
         }
-        return self::$built_in_methods[$lowerClass];
+        return self::class::$built_in_methods[$lowerClass];
     }
 
     /**
@@ -280,10 +280,10 @@ protected function addMethodsFrom($property, $index = null)
 
         // Merge with extra_methods
         $lowerClass = strtolower($class);
-        if (isset(self::$extra_methods[$lowerClass])) {
-            self::$extra_methods[$lowerClass] = array_merge(self::$extra_methods[$lowerClass], $newMethods);
+        if (isset(self::class::$extra_methods[$lowerClass])) {
+            self::class::$extra_methods[$lowerClass] = array_merge(self::class::$extra_methods[$lowerClass], $newMethods);
         } else {
-            self::$extra_methods[$lowerClass] = $newMethods;
+            self::class::$extra_methods[$lowerClass] = $newMethods;
         }
     }
 
@@ -305,17 +305,17 @@ protected function removeMethodsFrom($property, $index = null)
         }
 
         $lowerClass = strtolower($class);
-        if (!isset(self::$extra_methods[$lowerClass])) {
+        if (!isset(self::class::$extra_methods[$lowerClass])) {
             return;
         }
         $methods = $this->findMethodsFrom($extension);
 
         // Unset by key
-        self::$extra_methods[$lowerClass] = array_diff_key(self::$extra_methods[$lowerClass], $methods);
+        self::class::$extra_methods[$lowerClass] = array_diff_key(self::class::$extra_methods[$lowerClass], $methods);
 
         // Clear empty list
-        if (empty(self::$extra_methods[$lowerClass])) {
-            unset(self::$extra_methods[$lowerClass]);
+        if (empty(self::class::$extra_methods[$lowerClass])) {
+            unset(self::class::$extra_methods[$lowerClass]);
         }
     }
 
@@ -328,7 +328,7 @@ protected function removeMethodsFrom($property, $index = null)
      */
     protected function addWrapperMethod($method, $wrap)
     {
-        self::$extra_methods[strtolower(static::class)][strtolower($method)] = [
+        self::class::$extra_methods[strtolower(static::class)][strtolower($method)] = [
             'wrap' => $wrap,
             'method' => $method
         ];
@@ -343,7 +343,7 @@ protected function addWrapperMethod($method, $wrap)
      */
     protected function addCallbackMethod($method, $callback)
     {
-        self::$extra_methods[strtolower(static::class)][strtolower($method)] = [
+        self::class::$extra_methods[strtolower(static::class)][strtolower($method)] = [
             'callback' => $callback,
         ];
     }

diff --git a/src/Core/Extensible.php b/src/Core/Extensible.php
@@ -191,7 +191,7 @@ public static function add_extension($classOrExtension, $extension = null)
         $subclasses = ClassInfo::subclassesFor($class);
         $subclasses[] = $class;
         foreach ($subclasses as $subclass) {
-            unset(self::$extra_methods[strtolower($subclass)]);
+            unset(self::class::$extra_methods[strtolower($subclass)]);
         }
 
         Config::modify()
@@ -248,7 +248,7 @@ public static function remove_extension($extension)
         $subclasses = ClassInfo::subclassesFor($class);
         $subclasses[] = $class;
         foreach ($subclasses as $subclass) {
-            unset(self::$extra_methods[strtolower($subclass)]);
+            unset(self::class::$extra_methods[strtolower($subclass)]);
         }
     }
 
@@ -300,7 +300,7 @@ public static function get_extra_config_sources($class = null)
         }
 
         // If this class is unextendable, NOP
-        if (in_array($class, self::$unextendable_classes)) {
+        if (in_array($class, self::class::$unextendable_classes)) {
             return null;
         }
 
@@ -364,7 +364,7 @@ public static function has_extension($classOrExtension, $requiredExtension = nul
         }
 
         $requiredExtension = Extension::get_classname_without_arguments($requiredExtension);
-        $extensions = self::get_extensions($class);
+        $extensions = self::class::get_extensions($class);
         foreach ($extensions as $extension) {
             if (strcasecmp($extension ?? '', $requiredExtension ?? '') === 0) {
                 return true;