Improvements for the CLI

teichsta · Oct 5, 2022 · f962c63 · f962c63
1 parent 6302c62
commit f962c63
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/src/Cms/App.php b/src/Cms/App.php
@@ -1231,6 +1231,10 @@ public function path(): string
 	 */
 	public function render(string $path = null, string $method = null)
 	{
+		if (($_ENV['KIRBY_RENDER'] ?? true) === false) {
+			return null;
+		}
+
 		return $this->io($this->call($path, $method));
 	}
 

diff --git a/src/Cms/AppPlugins.php b/src/Cms/AppPlugins.php
@@ -52,6 +52,7 @@ trait AppPlugins
 		'blueprints' => [],
 		'cacheTypes' => [],
 		'collections' => [],
+		'commands' => [],
 		'components' => [],
 		'controllers' => [],
 		'collectionFilters' => [],
@@ -215,6 +216,17 @@ protected function extendCacheTypes(array $cacheTypes): array
 		return $this->extensions['cacheTypes'] = array_merge($this->extensions['cacheTypes'], $cacheTypes);
 	}
 
+	/**
+	 * Registers additional CLI commands
+	 *
+	 * @param array $commands
+	 * @return array
+	 */
+	protected function extendCommands(array $commands): array
+	{
+		return $this->extensions['commands'] = array_merge($this->extensions['commands'], $commands);
+	}
+
 	/**
 	 * Registers additional collection filters
 	 *

diff --git a/src/Cms/Core.php b/src/Cms/Core.php
@@ -306,6 +306,7 @@ public function roots(): array
 			'blueprints'  => fn (array $roots) => $roots['site'] . '/blueprints',
 			'cache'       => fn (array $roots) => $roots['site'] . '/cache',
 			'collections' => fn (array $roots) => $roots['site'] . '/collections',
+			'commands'    => fn (array $roots) => $roots['site'] . '/commands',
 			'config'      => fn (array $roots) => $roots['site'] . '/config',
 			'controllers' => fn (array $roots) => $roots['site'] . '/controllers',
 			'languages'   => fn (array $roots) => $roots['site'] . '/languages',