Changeset 60839 for branches/4.7/tests/phpunit/tests/customize/nav-menu-item-setting.php

Timestamp:

09/30/2025 05:06:42 PM (9 months ago)

Author:

desrosj

Message:

Grouped backports for the 4.7 branch.

• REST API: Increase the specificity of capability checks for collections when the edit context is in use.
• Menus: Prevent HTML in menu item titles from being rendered unexpectedly.

Merges [60814], [60815], [60816] to the 4.7 branch.

Props andraganescu, desrosj, ehti, hurayraiit, iandunn, joehoyle, johnbillion, jorbin, mnelson4, noisysocks, peterwilsoncc, phillsav, rmccue, timothyblynjacobs, vortfu, westonruter , whyisjake, zieladam.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/customize/nav-menu-item-setting.php (modified) (10 diffs)

branches/4.7/tests/phpunit/tests/customize/nav-menu-item-setting.php

@@ +1 @@
+
 <?php
 /**
@@ -90 +91 @@
             'xfn' => '',
             'status' => 'publish',
-            'original_title' => '',
             'nav_menu_term_id' => 0,
             '_invalid' => false,
@@ -154 +154 @@
         $menu_id = wp_create_nav_menu( 'Menu' );
         $item_title = 'Greetings';
-        $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
-            'menu-item-type' => 'post_type',
-            'menu-item-object' => 'post',
-            'menu-item-object-id' => $post_id,
-            'menu-item-title' => $item_title,
-            'menu-item-status' => 'publish',
-        ) );
+        $item_id = wp_update_nav_menu_item(
+            $menu_id,
+            0,
+            array(
+                'menu-item-type'      => 'post_type',
+                'menu-item-object'    => 'post',
+                'menu-item-object-id' => $post_id,
+                'menu-item-title'     => $item_title,
+                'menu-item-status'    => 'publish',
+            )
+        );
 
         $post = get_post( $item_id );
@@ -170 +174 @@
 
         $value = $setting->value();
-        $this->assertEquals( $menu_item->title, $value['title'] );
-        $this->assertEquals( $menu_item->type, $value['type'] );
+        $this->assertSame( $menu_item->title, $value['title'] );
+        $this->assertSame( $menu_item->type, $value['type'] );
         $this->assertEquals( $menu_item->object_id, $value['object_id'] );
-        $this->assertEquals( $menu_id, $value['nav_menu_term_id'] );
-        $this->assertEquals( 'Hello World', $value['original_title'] );
+        $this->assertSame( $menu_id, $value['nav_menu_term_id'] );
+        $this->assertSame( 'Hello World', $value['original_title'] );
 
         $other_menu_id = wp_create_nav_menu( 'Menu2' );
-        wp_update_nav_menu_item( $other_menu_id, $item_id, array(
-            'menu-item-title' => 'Hola',
-        ) );
+        wp_update_nav_menu_item(
+            $other_menu_id,
+            $item_id,
+            array(
+                'menu-item-title' => 'Hola',
+            )
+        );
         $value = $setting->value();
-        $this->assertEquals( 'Hola', $value['title'] );
-        $this->assertEquals( $other_menu_id, $value['nav_menu_term_id'] );
+        $this->assertSame( 'Hola', $value['title'] );
+        $this->assertSame( $other_menu_id, $value['nav_menu_term_id'] );
     }
 
@@ -209 +217 @@
 
         $value = $setting->value();
-        $this->assertEquals( '', $value['title'] );
-        $this->assertEquals( $original_title, $value['original_title'] );
+        $this->assertSame( '', $value['title'] );
+        $this->assertSame( $original_title, $value['original_title'] );
     }
 
@@ -225 +233 @@
         $menu_id = wp_create_nav_menu( 'Menu' );
         $item_title = 'Greetings';
-        $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
-            'menu-item-type' => 'taxonomy',
-            'menu-item-object' => 'category',
-            'menu-item-object-id' => $tax_id,
-            'menu-item-title' => $item_title,
-            'menu-item-status' => 'publish',
-        ) );
+        $item_id = wp_update_nav_menu_item(
+            $menu_id,
+            0,
+            array(
+                'menu-item-type'      => 'taxonomy',
+                'menu-item-object'    => 'category',
+                'menu-item-object-id' => $tax_id,
+                'menu-item-title'     => $item_title,
+                'menu-item-status'    => 'publish',
+            )
+        );
 
         $post = get_post( $item_id );
@@ -241 +253 @@
 
         $value = $setting->value();
-        $this->assertEquals( $menu_item->title, $value['title'] );
-        $this->assertEquals( $menu_item->type, $value['type'] );
+        $this->assertSame( $menu_item->title, $value['title'] );
+        $this->assertSame( $menu_item->type, $value['type'] );
         $this->assertEquals( $menu_item->object_id, $value['object_id'] );
-        $this->assertEquals( $menu_id, $value['nav_menu_term_id'] );
-        $this->assertEquals( 'Salutations', $value['original_title'] );
+        $this->assertSame( $menu_id, $value['nav_menu_term_id'] );
+        $this->assertSame( 'Salutations', $value['original_title'] );
     }
 
@@ -272 +284 @@
 
         $value = $setting->value();
-        $this->assertEquals( $menu_item->type_label, 'Custom Label' );
-        $this->assertEquals( $menu_item->type_label, $value['type_label'] );
+        $this->assertSame( $menu_item->type_label, 'Custom Label' );
+        $this->assertSame( $menu_item->type_label, $value['type_label'] );
     }
 
@@ -487 +499 @@
             'xfn' => 'hello " inject="',
             'status' => 'forbidden',
-            'original_title' => 'Hi<script>unfilteredHtml()</script>',
+            'original_title'   => 'Hi<script>unfilteredHtml()</script>',
             'nav_menu_term_id' => 'heilo',
             '_invalid' => false,
@@ -506 +518 @@
             'xfn' => 'hello  inject',
             'status' => 'draft',
-            'original_title' => 'Hi',
+            'original_title'   => 'Hi<script>unfilteredHtml()</script>',
             'nav_menu_term_id' => 0,
         );