Refactor handling of github actions in CLI

Author: iMattPro

console/create.php

@@ -159,53 +159,31 @@ protected function get_component_data()
 		$components = $this->packager->get_component_dialog_values();
 		foreach ($components as $component => $details)
 		{
-			foreach ($details['dependencies'] as $depends)
+			// Skip early as it's handled elsewhere
+			if ($component === 'githubactions_deprecated')
 			{
-				if (empty($this->data['components'][$depends]))
-				{
-					$this->data['components'][$component] = false;
-					continue 2;
-				}
+				continue;
 			}
 
-			// Special logic for GitHub Actions options
-			if ($component === 'githubactions')
+			// Check dependencies
+			if (!$this->check_dependencies($details['dependencies']))
 			{
-				$question = $this->language->lang('SKELETON_QUESTION_COMPONENT_GITHUBACTIONS') . $this->language->lang('COLON');
-				$choices = [
-					$this->language->lang('SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_0'),
-					$this->language->lang('SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_1'),
-					$this->language->lang('SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_2'),
-				];
-
-				$question = new ChoiceQuestion($question, $choices, 0);
-
-				$choice = $this->helper->ask($this->input, $this->output, $question);
-				$index = array_search($choice, $choices, true);
-
-				$this->data['components']['githubactions'] = false;
-				$this->data['components']['githubactions_deprecated'] = false;
-
-				if ($index === 1)
-				{
-					$this->data['components']['githubactions'] = true;
-				}
-				else if ($index === 2)
-				{
-					$this->data['components']['githubactions_deprecated'] = true;
-				}
-
+				$this->data['components'][$component] = false;
 				continue;
 			}
 
-			if ($component === 'githubactions_deprecated')
+			// Handle GitHub Actions
+			if ($component === 'githubactions')
 			{
-				// Already handled via githubactions logic
+				$this->handle_github_actions();
 				continue;
 			}
 
 			// Default logic for all other components
-			$this->data['components'][$component] = $this->get_user_input('component_' . $component, $details['default']);
+			$this->data['components'][$component] = $this->get_user_input(
+				'component_' . $component,
+				$details['default']
+			);
 		}
 	}
 
@@ -239,4 +217,61 @@ protected function get_user_input($value, $default)
 
 		return $return_value;
 	}
+
+	/**
+	 * Check if all dependencies are satisfied
+	 *
+	 * @param array $dependencies List of dependencies to check
+	 * @return bool
+	 */
+	private function check_dependencies(array $dependencies): bool
+	{
+		foreach ($dependencies as $depends)
+		{
+			if (empty($this->data['components'][$depends]))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Handle GitHub Actions specific logic
+	 */
+	private function handle_github_actions(): void
+	{
+		$question = $this->language->lang('SKELETON_QUESTION_COMPONENT_GITHUBACTIONS') . $this->language->lang('COLON');
+		$choices = [
+			$this->language->lang('SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_CLI', 0),
+			$this->language->lang('SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_CLI', 1),
+			$this->language->lang('SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_CLI', 2),
+		];
+
+		$question = new ChoiceQuestion($question, $choices, 0);
+
+		$choice = $this->helper->ask($this->input, $this->output, $question);
+		$index = array_search($choice, $choices, true);
+
+		$this->data['components']['githubactions'] = false;
+		$this->data['components']['githubactions_deprecated'] = false;
+
+		// Initialize both flags to false
+		$this->data['components'] = array_merge(
+			$this->data['components'],
+			[
+				'githubactions' => false,
+				'githubactions_deprecated' => false
+			]
+		);
+
+		if ($index === 1)
+		{
+			$this->data['components']['githubactions'] = true;
+		}
+		else if ($index === 2)
+		{
+			$this->data['components']['githubactions_deprecated'] = true;
+		}
+	}
 }

language/en/common.php

@@ -120,10 +120,12 @@
 	'SKELETON_QUESTION_COMPONENT_TESTS'				=> 'Create sample PHPUnit tests',
 	'SKELETON_QUESTION_COMPONENT_TESTS_UI'			=> 'Tests (PHPUnit)',
 	'SKELETON_QUESTION_COMPONENT_TESTS_EXPLAIN'		=> 'Unit tests can test an extension to verify that specific portions of its source code work properly. This helps ensure basic code integrity and prevents regressions as an extension is being developed and debugged.',
-	'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS'		=> 'Create a GitHub Actions workflow to run tests in your repository',
-	'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_0'	=> 'No (Default)',
-	'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_1'	=> 'Reusable (Recommended – uses phpBB’s maintained workflow)',
-	'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_2'	=> 'Standalone (Deprecated – overrides reusable workflow)',
+	'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS'		=> 'Create a GitHub Actions workflow',
+	'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_CLI'	=> [
+		0	=> 'No (Default)',
+		1	=> 'Reusable (Recommended – uses phpBB’s maintained workflow)',
+		2	=> 'Standalone (Deprecated - customise and maintain your own workflow)',
+	],
 	'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_UI'	=> 'GitHub Actions Workflow (Reusable – Recommended)',
 	'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_EXPLAIN'	=> 'Creates a GitHub Actions workflow that uses a reusable, phpBB-maintained framework to run PHPUnit tests on your repository. The workflow file is saved in .github/workflows and runs automatically on each commit and pull request.',
 	'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_DEPRECATED'	=> 'Create a standalone GitHub Actions workflow [Deprecated: not recommended unless you plan to modify jobs or steps]',

tests/console/create_test.php

@@ -184,7 +184,7 @@ public function get_questions()
 //			'SKELETON_QUESTION_COMPONENT_NOTIFICATION'	=> 'y',
 //			'SKELETON_QUESTION_COMPONENT_PERMISSIONS'	=> 'y',
 			'SKELETON_QUESTION_COMPONENT_TESTS'			=> 'y',
-			'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS'	=> 'y',
+			'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS'	=> 2,
 //			'SKELETON_QUESTION_COMPONENT_BUILD'			=> 'y',
 		];
 	}