Merge branch 'release/1.0.4'

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.0.4
+
+* [Added] Possibility to load blocks from subfolders (block-name/template.php instead of the default block-name.php)
+* [Fixed] Error with invalid array key if file didn't have a block header
+* [Fixed] Hardcoded default blocks path
+* [Fixed] Missing Filesystem dependency, thanks to @joshuafredrickson
+
 ## 1.0.3
 
 * [Added] Filters for config

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "micropackage/block-loader",
-	"version": "1.0.3",
+	"version": "1.0.4",
 	"description": "Block Loader - automatic Gutenberg blocks from template files.",
 	"license": "GPL-3.0-or-later",
 	"authors": [
@@ -20,7 +20,8 @@
 	"require": {
 		"php": ">=5.6",
 		"micropackage/singleton": "^1.1",
-		"micropackage/dochooks": "^1.0"
+		"micropackage/dochooks": "^1.0",
+		"micropackage/filesystem": "^1.1"
 	},
 	"require-dev": {
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",

src/BlockLoader.php

@@ -185,7 +185,7 @@ public function register_metabox_blocks( $meta_boxes ) {
 	public function get_blocks() {
 		$paths = apply_filters(
 			'micropackage/block-loader/paths',
-			[ wp_normalize_path( "$this->root_dir/blocks" ) ]
+			[ wp_normalize_path( "{$this->root_dir}/{$this->config['dir']}" ) ]
 		);
 
 		$blocks = [];
@@ -210,11 +210,19 @@ private function get_blocks_from_path( $path ) {
 
 		if ( $files ) {
 			foreach ( $files as $file ) {
-				$filepath = $fs->path( $file['name'] );
+				if ( $fs->is_file( $file['name'] ) ) {
+					$filename = $file['name'];
+				} elseif ( $fs->is_file( "{$file['name']}/template.php" ) ) {
+					$filename = "{$file['name']}/template.php";
+				} else {
+					continue;
+				}
+
+				$filepath = $fs->path( $filename );
 				$data     = $this->get_block_data( $filepath );
-				$slug     = basename( $filepath, '.php' );
+				$slug     = basename( $file['name'], '.php' );
 
-				if ( ! $data['title'] ) {
+				if ( ! isset( $data['title'] ) ) {
 					continue;
 				}