Ticket #49194: 49194-sort-p…tes-by-title.diff

src/wp-includes/class-wp-theme.php

@@ -1385 +1385 @@
                         }
                 }
 
+                /*
+                 * Sort post templates by their translated, human-readable template name
+                 * instead of by filename or slug.
+                 */
+                foreach ( array_keys( $post_templates ) as $type ) {
+                        if ( ! is_array( $post_templates[ $type ] ) ) {
+                                continue;
+                        }
+
+                        uasort( $post_templates[ $type ], 'strnatcasecmp' );
+                }
+
                 return $post_templates;
         }
 

new file tests/phpunit/data/themedir1/page-templates/template-a-zebra.php

@@ +1 @@
+<?php
+/*
+   Template Name: Zebra Template
+ */
+?>

new file tests/phpunit/data/themedir1/page-templates/template-z-alpha.php

@@ +1 @@
+<?php
+/*
+   Template Name: Alpha Template
+ */
+?>

tests/phpunit/tests/theme/wpTheme.php

@@ -348 +348 @@
                 $this->assertCount( 2, $filter->get_events(), 'Should only be 4, as second run should not be cached' );
         }
 
+        /**
+         * @ticket 49194
+         *
+         * @covers WP_Theme::get_post_templates
+         */
+        public function test_get_post_templates_should_sort_templates_by_template_name() {
+                $theme = new WP_Theme( 'page-templates', $this->theme_root );
+
+                $post_templates = $theme->get_post_templates();
+
+                $this->assertArrayHasKey( 'page', $post_templates );
+
+                $actual = array_intersect_key(
+                        $post_templates['page'],
+                        array(
+                                'template-z-alpha.php' => true,
+                                'template-a-zebra.php' => true,
+                        )
+                );
+
+                $this->assertSame(
+                        array(
+                                'template-z-alpha.php' => 'Alpha Template',
+                                'template-a-zebra.php' => 'Zebra Template',
+                        ),
+                        $actual
+                );
+        }
+
         /**
          * Test get_files for an existing theme.
          *