Changeset 56704 for trunk/tests/phpunit/tests/blocks/blockHooks.php

Timestamp:

09/26/2023 11:47:18 AM (3 years ago)

Author:

Bernhard Reiter

Message:

Blocks: Have get_hooked_blocks() return blocks grouped by position.

All existing calls of get_hooked_blocks() in non-test code are currently wrapped in an extra array_keys() call. This changeset absorbs that logic into the function and changes the structure of the return value accordingly.

Furthermore, this allows us to remove the extra $relative_position argument (introduced in [56673]) from the function again, as the same data can now be simply fetched via array access.

Props gziolo, spacedmonkey, mukesh27.
See #59383.

File:

• trunk/tests/phpunit/tests/blocks/blockHooks.php (modified) (5 diffs)

trunk/tests/phpunit/tests/blocks/blockHooks.php

@@ -71 +71 @@
                 $this->assertSame(
                         array(
-                                'tests/injected-one' => 'before',
-                                'tests/injected-two' => 'before',
+                                'before' => array(
+                                        'tests/injected-one',
+                                        'tests/injected-two',
+                                ),
                         ),
                         get_hooked_blocks( 'tests/hooked-at-before' ),
@@ -79 +81 @@
                 $this->assertSame(
                         array(
-                                'tests/injected-one' => 'after',
-                                'tests/injected-two' => 'after',
+                                'after' => array(
+                                        'tests/injected-one',
+                                        'tests/injected-two',
+                                ),
                         ),
                         get_hooked_blocks( 'tests/hooked-at-after' ),
@@ -87 +91 @@
                 $this->assertSame(
                         array(
-                                'tests/injected-two' => 'first_child',
+                                'first_child' => array(
+                                        'tests/injected-two',
+                                ),
                         ),
                         get_hooked_blocks( 'tests/hooked-at-first-child' ),
@@ -94 +100 @@
                 $this->assertSame(
                         array(
-                                'tests/injected-two' => 'last_child',
+                                'last_child' => array(
+                                        'tests/injected-two',
+                                ),
                         ),
                         get_hooked_blocks( 'tests/hooked-at-last-child' ),
@@ -101 +109 @@
                 $this->assertSame(
                         array(
-                                'tests/injected-one' => 'before',
-                                'tests/injected-two' => 'after',
+                                'before' => array(
+                                        'tests/injected-one',
+                                ),
+                                'after'  => array(
+                                        'tests/injected-two',
+                                ),
                         ),
                         get_hooked_blocks( 'tests/hooked-at-before-and-after' ),
                         'block hooked before one block and after another'
                 );
-                $this->assertSame(
-                        array(
-                                'tests/injected-one' => 'before',
-                        ),
-                        get_hooked_blocks( 'tests/hooked-at-before-and-after', 'before' ),
-                        'block hooked before one block and after another, filtered for before'
-                );
         }
 }