Merge a9ed7b986f689c4f04e34cca168bfdec1ed42154 into dca4404f0fa353845c59d3656e78f4e637e5c786

code/Model/SiteTree.php

@@ -2747,6 +2747,8 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
     protected function getClassDropdown()
     {
         $classes = SiteTree::page_type_classes();
+        $currentClass = null;
+
         $result = [];
         foreach ($classes as $class) {
             $instance = singleton($class);
@@ -2772,15 +2774,20 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
                 }
             }
 
-            $result[$class] = $instance->i18n_singular_name();
+            $pageTypeName = $instance->i18n_singular_name();
+
+            $currentClass = $class;
+            $result[$class] = $pageTypeName;
         }
 
-        // Sort alphabetically, and put current on top
+        // sort alphabetically, and put current on top
         asort($result);
-        if (isset($result[$this->ClassName])) {
-            $currentPageTypeName = $result[$this->ClassName];
-            unset($result[$this->ClassName]);
-            $result = [$this->ClassName => $currentPageTypeName] + $result;
+        if ($currentClass) {
+            $currentPageTypeName = $result[$currentClass];
+            unset($result[$currentClass]);
+            $result = array_reverse($result ?? []);
+            $result[$currentClass] = $currentPageTypeName;
+            $result = array_reverse($result ?? []);
         }
 
         return $result;

tests/php/Model/SiteTreeTest.php

@@ -1272,7 +1272,7 @@ class SiteTreeTest extends SapphireTest
     #[DataProvider('allowedChildrenProvider')]
     public function testAllowedChildren($className, $expected, $assertionMessage)
     {
-        $class = new $className();
+        $class = new $className;
         $this->assertEquals($expected, $class->allowedChildren(), $assertionMessage);
     }
 
@@ -1351,9 +1351,6 @@ class SiteTreeTest extends SapphireTest
         );
     }
 
-    /**
-     * @return void
-     */
     public function testClassDropdown()
     {
         $sitetree = new SiteTree();
@@ -1375,18 +1372,7 @@ class SiteTreeTest extends SapphireTest
 
         $this->assertArrayNotHasKey(SiteTreeTest_NotRoot::class, $method->invoke($rootPage));
         $this->assertArrayHasKey(SiteTreeTest_NotRoot::class, $method->invoke($nonRootPage));
-        foreach ([SiteTreeTest_ClassA::class, SiteTreeTest_ClassB::class] as $className) {
-            $otherPage = new $className();
-            $otherPage->write();
-            $result = $method->invoke(object: $otherPage);
-            $this->assertEquals(array_key_first($result), $className);
-            // remove the first element as this is not alphabetical
-            array_shift($result);
-            // create a sorted array
-            $resultSorted = $result;
-            asort($resultSorted);
-            $this->assertEquals($result, $resultSorted);
-        }
+
         Security::setCurrentUser(null);
     }