Changeset 44146

Timestamp:

12/14/2018 02:14:13 AM (6 years ago)

Author:

jeremyfelt

Message:

Blocks: Add the reusable block post type, wp_block.

Merges [43804] from the 5.0 branch to trunk.

See #45098.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-admin/edit.php (modified) (1 diff)
• src/wp-includes/capabilities.php (modified) (1 diff)
• src/wp-includes/post.php (modified) (1 diff)
• tests/phpunit/tests/blocks/render-reusable.php (copied) (copied from branches/5.0/tests/phpunit/tests/blocks/render-reusable.php)
• tests/phpunit/tests/user/capabilities.php (modified) (4 diffs)

trunk/src/wp-admin/edit.php

@@ -200 +200 @@
 wp_enqueue_script( 'inline-edit-post' );
 wp_enqueue_script( 'heartbeat' );
+
+if ( 'wp_block' === $post_type ) {
+    wp_enqueue_script( 'wp-list-reusable-blocks' );
+    wp_enqueue_style( 'wp-list-reusable-blocks' );
+}
 
 $title = $post_type_object->labels->name;

trunk/src/wp-includes/capabilities.php

@@ -575 +575 @@
             }
 
+            // Block capabilities map to their post equivalent.
+            $block_caps = array(
+                'edit_blocks',
+                'edit_others_blocks',
+                'publish_blocks',
+                'read_private_blocks',
+                'delete_blocks',
+                'delete_private_blocks',
+                'delete_published_blocks',
+                'delete_others_blocks',
+                'edit_private_blocks',
+                'edit_published_blocks',
+            );
+            if ( in_array( $cap, $block_caps, true ) ) {
+                $cap = str_replace( '_blocks', '_posts', $cap );
+            }
+
             // If no meta caps match, return the original cap.
             $caps[] = $cap;

trunk/src/wp-includes/post.php

@@ -250 +250 @@
             'delete_with_user' => false,
             'supports'         => array(),
+        )
+    );
+
+    register_post_type(
+        'wp_block',
+        array(
+            'labels'          => array(
+                'name'          => __( 'Blocks' ),
+                'singular_name' => __( 'Block' ),
+                'search_items'  => __( 'Search Blocks' ),
+            ),
+            'public'          => false,
+            '_builtin'        => true, /* internal use only. don't use this when registering your own post type. */
+            'show_ui'         => true,
+            'show_in_menu'    => false,
+            'rewrite'         => false,
+            'capability_type' => 'block',
+            'capabilities'    => array(
+                // You need to be able to edit posts, in order to read blocks in their raw form.
+                'read'                   => 'edit_posts',
+                // You need to be able to publish posts, in order to create blocks.
+                'create_posts'           => 'publish_posts',
+                'edit_published_posts'   => 'edit_published_posts',
+                'delete_published_posts' => 'delete_published_posts',
+                'edit_others_posts'      => 'edit_others_posts',
+                'delete_others_posts'    => 'delete_others_posts',
+            ),
+            'map_meta_cap'    => true,
+            'supports'        => array(
+                'title',
+                'editor',
+            ),
         )
     );

trunk/tests/phpunit/tests/user/capabilities.php

@@ -18 +18 @@
     protected static $super_admin = null;
 
+    protected static $block_id;
+
     public static function wpSetUpBeforeClass( $factory ) {
         self::$users       = array(
@@ -28 +30 @@
         self::$super_admin = $factory->user->create_and_get( array( 'role' => 'contributor' ) );
         grant_super_admin( self::$super_admin->ID );
+
+        self::$block_id = $factory->post->create(
+            array(
+                'post_author'  => self::$users['administrator']->ID,
+                'post_type'    => 'wp_block',
+                'post_status'  => 'publish',
+                'post_title'   => 'Test Block',
+                'post_content' => '<!-- wp:core/paragraph --><p>Hello world!</p><!-- /wp:core/paragraph -->',
+            )
+        );
     }
 
@@ -36 +48 @@
 
     }
+
+    public static function wpTearDownAfterClass() {
+        wp_delete_post( self::$block_id, true );
+    }
+
 
     function _flush_roles() {
@@ -2096 +2113 @@
         $this->assertSame( 333, $roles->get_site_id() );
     }
+
+    /**
+     * @dataProvider data_block_caps
+     */
+    function test_block_caps( $role, $cap, $use_post, $expected ) {
+        if ( $use_post ) {
+            $this->assertEquals( $expected, self::$users[ $role ]->has_cap( $cap, self::$block_id ) );
+        } else {
+            $this->assertEquals( $expected, self::$users[ $role ]->has_cap( $cap ) );
+        }
+    }
+
+    function data_block_caps() {
+        $post_caps = array(
+            'edit_block',
+            'read_block',
+            'delete_block',
+        );
+
+        $all_caps = array(
+            'edit_block',
+            'read_block',
+            'delete_block',
+            'edit_blocks',
+            'edit_others_blocks',
+            'publish_blocks',
+            'read_private_blocks',
+            'delete_blocks',
+            'delete_private_blocks',
+            'delete_published_blocks',
+            'delete_others_blocks',
+            'edit_private_blocks',
+            'edit_published_blocks',
+        );
+
+        $roles = array(
+            'administrator' => $all_caps,
+            'editor'        => $all_caps,
+            'author'        => array(
+                'read_block',
+                'edit_blocks',
+                'publish_blocks',
+                'delete_blocks',
+                'delete_published_blocks',
+                'edit_published_blocks',
+            ),
+            'contributor'   => array(
+                'read_block',
+                'edit_blocks',
+                'delete_blocks',
+            ),
+            'subscriber'    => array(),
+        );
+
+        $data = array();
+
+        foreach ( $roles as $role => $caps ) {
+            foreach ( $caps as $cap ) {
+                $use_post = in_array( $cap, $post_caps, true );
+                $data[]   = array( $role, $cap, $use_post, true );
+            }
+
+            foreach ( $all_caps as $cap ) {
+                if ( ! in_array( $cap, $caps, true ) ) {
+                    $use_post = in_array( $cap, $post_caps, true );
+                    $data[]   = array( $role, $cap, $use_post, false );
+                }
+            }
+        }
+
+        return $data;
+    }
 }