BlockServiceProvider: added type for the block instance to avoid some…

… erors when uses $this->app->bind with others providers
yarovikov · Oct 24, 2024 · 2ab7a02 · 2ab7a02
1 parent 280575f
commit 2ab7a02
Showing 1 changed file with 35 additions and 21 deletions.
diff --git a/src/Providers/BlockServiceProvider.php b/src/Providers/BlockServiceProvider.php
@@ -51,7 +51,10 @@ function (string $file): void {
                 $src = $this->formatFile($this->folder, $file);
 
                 $this->app->bind($src->handle, function () use ($src) {
-                    return new $src->class();
+                    $instance = new $src->class();
+                    $instance->type = 'block';
+
+                    return $instance;
                 });
 
                 $this->blocks->push($src->handle);
@@ -76,7 +79,7 @@ public function registerBlocks(): void
         }
 
         foreach ($blocks as $block) {
-            if (!WP_Block_Type_Registry::get_instance()->is_registered($this->app[$block]->name)) {
+            if (true === $this->checkIfIsBlock($block) && !WP_Block_Type_Registry::get_instance()->is_registered($this->app[$block]->name)) {
                 $this->app[$block]->registerBlockType();
             }
         }
@@ -96,7 +99,9 @@ public function enqueue(): void
         }
 
         foreach ($blocks as $block) {
-            $this->app[$block]->enqueue();
+            if (true === $this->checkIfIsBlock($block)) {
+                $this->app[$block]->enqueue();
+            }
         }
     }
 
@@ -111,7 +116,7 @@ public function enqueueBlockEditorAssets(): void
         $gutengood_blocks = [];
 
         foreach ($blocks as $block) {
-            if (false === $this->app[$block]->editor_script) {
+            if (true === $this->checkIfIsBlock($block) && false === $this->app[$block]->editor_script) {
                 $gutengood_blocks[] = (object) [
                     'title' => $this->app[$block]->title,
                     'name' => $this->app[$block]->name,
@@ -135,7 +140,9 @@ public function blockEndpoint(): void
         }
 
         foreach ($blocks as $block) {
-            $this->app[$block]->blockEndpoint();
+            if (true === $this->checkIfIsBlock($block)) {
+                $this->app[$block]->blockEndpoint();
+            }
         }
     }
 
@@ -153,22 +160,29 @@ public function registerMeta(): void
         }
 
         foreach ($blocks as $block) {
-            array_map(function (array $meta): void {
-                if (empty($meta) || empty($meta['post_type']) || empty($meta['meta_key'])) {
-                    return;
-                }
-
-                register_meta(
-                    $meta['post_type'],
-                    $meta['meta_key'],
-                    [
-                        'show_in_rest' => true,
-                        'single' => true,
-                        'type' => $meta['type'],
-                        'default' => $meta['default'],
-                    ]
-                );
-            }, $this->app[$block]->blockMeta());
+            if (true === $this->checkIfIsBlock($block)) {
+                array_map(function (array $meta): void {
+                    if (empty($meta) || empty($meta['post_type']) || empty($meta['meta_key'])) {
+                        return;
+                    }
+
+                    register_meta(
+                        $meta['post_type'],
+                        $meta['meta_key'],
+                        [
+                            'show_in_rest' => true,
+                            'single' => true,
+                            'type' => $meta['type'],
+                            'default' => $meta['default'],
+                        ]
+                    );
+                }, $this->app[$block]->blockMeta());
+            }
         }
     }
+
+    public function checkIfIsBlock(string $block): bool
+    {
+        return 'block' === ($this->app[$block]->type ?? '');
+    }
 }