initi

infinum · May 14, 2024 · f89b3b3 · f89b3b3
1 parent 4c85c35
commit f89b3b3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 61 deletions.
diff --git a/src/Init/InitAllCli.php b/src/Init/InitAllCli.php
@@ -85,9 +85,8 @@ public function getDoc(): array
 	/* @phpstan-ignore-next-line */
 	public function __invoke(array $args, array $assocArgs)
 	{
-		$groupOutput = $assocArgs[self::ARG_GROUP_OUTPUT];
-
 		$assocArgs = $this->prepareArgs($assocArgs);
+		$groupOutput = $assocArgs[self::ARG_GROUP_OUTPUT];
 
 		if (!$groupOutput) {
 			$this->getIntroText();

diff --git a/src/Init/InitBlocksCli.php b/src/Init/InitBlocksCli.php
@@ -124,15 +124,6 @@ public function getDoc(): array
 	{
 		return [
 			'shortdesc' => 'Create all files for blocks to work.',
-			'synopsis' => [
-				[
-					'type' => 'flag',
-					'name' => 'use_all',
-					'description' => 'Output all items to your project.',
-					'optional' => true,
-					'default' => false,
-				],
-			],
 			'longdesc' => $this->prepareLongDesc("
 				This command will copy all initial blocks, components, manifests and service classes to you project in order to start using block editor.
 
@@ -145,46 +136,18 @@ public function getDoc(): array
 	/* @phpstan-ignore-next-line */
 	public function __invoke(array $args, array $assocArgs)
 	{
-		$groupOutput = $assocArgs[self::ARG_GROUP_OUTPUT];
-		$all = $assocArgs['use_all'] ?? false;
-
 		$assocArgs = $this->prepareArgs($assocArgs);
+		$groupOutput = $assocArgs[self::ARG_GROUP_OUTPUT];
 
 		if (!$groupOutput) {
 			$this->getIntroText();
+			$this->cliLog("%w╭\n│ %nCreating block editor files", 'mixed');
 		}
 
-		$this->cliLog("%w╭\n│ %nCreating block editor files", 'mixed');
-
-		$commands = static::COMMANDS;
-
-		if ($all) {
-			$commands = [];
-			$type = \getenv('ES_TEST') ? 'test' : 'default';
-
-			foreach (\array_keys(static::COMMANDS) as $command) {
-				switch ($command) {
-					case UseBlockCli::class:
-						$commands[$command][$type] = $this->getFolderItems(Helpers::getProjectPaths('blocksSourceCustom'));
-						break;
-					case UseComponentCli::class:
-						$commands[$command][$type] = $this->getFolderItems(Helpers::getProjectPaths('blocksSourceComponents'));
-						break;
-					case UseVariationCli::class:
-						$commands[$command][$type] = $this->getFolderItems(Helpers::getProjectPaths('blocksSourceVariations'));
-						break;
-					default:
-						$commands[$command] = [];
-						break;
-				}
-			}
-		}
-
-		$this->getInitBlocks($assocArgs, $commands);
-
-		$this->cliLog('╰', 'w');
+		$this->getInitBlocks($assocArgs, static::COMMANDS);
 
 		if (!$groupOutput) {
+			$this->cliLog('╰', 'w');
 			$this->cliLogAlert('Files copied! Run `npm start` to build all the assets.\n\nHappy developing!', 'success', \__('Ready to go!', 'eightshift-libs'));
 		}
 	}
@@ -206,23 +169,17 @@ private function getInitBlocks(array $assocArgs, array $commands): void
 			if ($items) {
 				$innerItems = $items['default'];
 
-				if (\getenv('ES_TEST')) {
-					$innerItems = $items['test'];
-				}
-
 				$class->__invoke([], \array_merge(
 					$assocArgs,
 					[
 						'name' => \implode(",", $innerItems),
-						self::ARG_GROUP_OUTPUT => true,
 						'checkDependency' => false,
 					]
 				));
 			} else {
 				$class->__invoke([], \array_merge(
 					$assocArgs,
 					[
-						self::ARG_GROUP_OUTPUT => true,
 						'checkDependency' => false,
 					]
 				));

diff --git a/src/Init/InitThemeCli.php b/src/Init/InitThemeCli.php
@@ -123,7 +123,6 @@ public function __invoke(array $args, array $assocArgs)
 		foreach (static::COMMANDS as $item) {
 			$label = $item['label'] ?? '';
 			$items = $item['items'] ?? [];
-			$type = $item['type'] ?? '';
 
 			if ($label) {
 				$this->cliLog($label, 'C');
@@ -134,16 +133,9 @@ public function __invoke(array $args, array $assocArgs)
 					$reflectionClass = new ReflectionClass($className);
 					$class = $reflectionClass->newInstanceArgs([$this->commandParentName]);
 
-					$class->__invoke([], \array_merge(
-						$assocArgs,
-						[
-							self::ARG_GROUP_OUTPUT => $type === 'blocks',
-						]
-					));
+					$class->__invoke([], $assocArgs);
 				}
 			}
-
-			$this->cliLog("\n");
 		}
 
 		if (!$groupOutput) {

diff --git a/src/Init/InitThemeSetupCli.php b/src/Init/InitThemeSetupCli.php
@@ -122,8 +122,7 @@ public function __invoke(array $args, array $assocArgs)
 	{
 		$assocArgs = $this->prepareSetupArgs($assocArgs);
 
-		$assocArgs['actionOutput'] = 'file created';
-		$assocArgs[self::ARG_GROUP_OUTPUT] = true;
+		$groupOutput = $assocArgs[self::ARG_GROUP_OUTPUT];
 
 		$this->getIntroText();
 
@@ -160,7 +159,7 @@ public function __invoke(array $args, array $assocArgs)
 		WP_CLI::runcommand('theme activate ' . $assocArgs[self::ARG_TEXTDOMAIN]);
 		$this->cliLog('--------------------------------------------------', 'C');
 		$this->cliLog("Installing theme service classes", 'C');
-		WP_CLI::runcommand('boilerplate init theme --group_output=true');
+		WP_CLI::runcommand("boilerplate init theme --{$groupOutput}=true");
 		$this->cliLog('--------------------------------------------------', 'C');
 		$this->cliLog("Building the new theme assets", 'C');
 		WP_CLI::runcommand("eval 'shell_exec(\"cd {$newDestionation} && npm run build\");'");