Changeset 13713

Timestamp:

05/16/2024 05:27:41 AM (7 months ago)

Author:

dd32

Message:

Plugin Directory: Blocks: Import blocks registered with new WP_Block_Type().

See #6170.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -1014 +1014 @@
                 foreach ( $matches as $match ) {
                     $blocks[] = (object) [
-                        'name' => $match[1],
+                        'name'  => $match[1],
                         'title' => $match[2],
                     ];
@@ -1020 +1020 @@
             }
         }
+
         if ( 'php' === $ext ) {
             // Parse a php-style register_block_type() call.
             // Again this assumes literal strings, and only parses the name and title.
             $contents = file_get_contents( $filename );
+
+            // Search out register_block_type() calls.
             if ( $contents && preg_match_all( "#register_block_type\s*[(]\s*['\"]([-\w]+/[-\w]+)['\"](?!\s*[.])#ms", $contents, $matches, PREG_SET_ORDER ) ) {
                 foreach ( $matches as $match ) {
                     $blocks[] = (object) [
-                        'name' => $match[1],
+                        'name'  => $match[1],
                         'title' => null,
                     ];
                 }
             }
-        }
+
+            // Search out WP_Block_Type() instances.
+            if ( $contents && preg_match_all( "#new\s+WP_Block_Type\s*[(]\s*['\"]([-\w]+\/[-\w]+)['\"](?!\s*[.])(\s*,[^;]{0,500}['\"]title['\"]\s*=>\s*['\"]([^'\"]+)['\"](?!\s*[.]))?#ms", $contents, $matches, PREG_SET_ORDER ) ) {
+                var_dump( $filename, $matches );
+                foreach ( $matches as $match ) {
+                    $blocks[] = (object) [
+                        'name'  => $match[1],
+                        'title' => $match[3] ?? null,
+                    ];
+                }
+            }
+
+        }
+
         if ( 'block.json' === basename( $filename ) ) {
             // A block.json file should have everything we want.