Make the resuable framework the dominant/overriding option

Author: iMattPro

language/en/common.php

@@ -130,7 +130,7 @@
 	'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_CUSTOM'	=> 'Create a standalone GitHub Actions workflow [Deprecated: not recommended unless you plan to modify jobs or steps]',
 	'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_CUSTOM_UI'	=> 'GitHub Actions Workflow (Standalone – Deprecated)',
-	'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_CUSTOM_EXPLAIN'	=> 'Deprecated: Creates a fully standalone workflow to run PHPUnit tests without using the shared phpBB framework. This overrides the reusable workflow and is no longer recommended. The file is saved in .github/workflows and runs on each commit and pull request.',
+	'SKELETON_QUESTION_COMPONENT_GITHUBACTIONS_CUSTOM_EXPLAIN'	=> 'Deprecated: Creates a standalone workflow for PHPUnit tests without the shared phpBB framework. Will be overridden if the reusable workflow is also selected. Saved in .github/workflows and runs on each commit and pull request.',
 	'SKELETON_QUESTION_COMPONENT_BUILD'				=> 'Create a sample build script for phing',
 	'SKELETON_QUESTION_COMPONENT_BUILD_UI'			=> 'Build script (phing)',
 	'SKELETON_QUESTION_COMPONENT_BUILD_EXPLAIN'		=> 'A phing build script is generated for your extension which can be used to generate build packages to help simplify the release or deployment processes.',

skeleton/.github/workflows/tests.yml.twig

@@ -1,6 +1,41 @@
 name: Tests
 
-{% if COMPONENT.githubactions_custom %}
+{% if COMPONENT.githubactions %}
+# For most extensions, this workflow should not need changing;
+# simply commit it to your repository.
+#
+# See the README for full details and configuration instructions:
+#  - https://github.com/phpbb-extensions/test-framework
+#
+on:
+  push:
+    # Run tests when commits are pushed to these branches in your repo,
+    # or remove this branches section to run tests on all your branches
+    branches:
+      - main      # Main production branch
+      - master    # Legacy or alternative main branch
+      - dev/*     # Any feature branches under "dev/", e.g., dev/new-feature
+      - release-* # Any release branches under "release-", e.g., release-1.0.0
+
+  pull_request:
+    # Run tests when pull requests are made on these branches in your repo,
+    # or remove this branches section to run tests on all your branches
+    branches:
+      - main
+      - master
+      - dev/*
+
+jobs:
+  call-tests:
+    name: Extension tests
+      # Set the phpBB branch to test your extension with after the @ symbol
+      # - 3.3.x: Targets the phpBB 3.3.x release line
+    # - master: Targets the latest development version of phpBB (master branch)
+    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@{{ skeleton_version_compare(REQUIREMENTS.phpbb_version_min, "4.0", "<") ? '3.3.x' : 'master' }}
+    with:
+      # Your extension vendor/package name
+      EXTNAME: {{ EXTENSION.vendor_name }}/{{ EXTENSION.extension_name }}
+{% elseif COMPONENT.githubactions_custom %}
 env:
     EXTNAME: {{ EXTENSION.vendor_name }}/{{ EXTENSION.extension_name }} # Your extension vendor/package name
     SNIFF: 1            # Run code sniffer on your code? 1 or 0
@@ -425,39 +460,4 @@ jobs:
               run: phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml --bootstrap ./tests/bootstrap.php
               working-directory: ./phpBB3
     # END Other Tests Job
-{% else %}
-# For most extensions, this workflow should not need changing;
-# simply commit it to your repository.
-#
-# See the README for full details and configuration instructions:
-#  - https://github.com/phpbb-extensions/test-framework
-#
-on:
-  push:
-    # Run tests when commits are pushed to these branches in your repo,
-    # or remove this branches section to run tests on all your branches
-    branches:
-      - main      # Main production branch
-      - master    # Legacy or alternative main branch
-      - dev/*     # Any feature branches under "dev/", e.g., dev/new-feature
-      - release-* # Any release branches under "release-", e.g., release-1.0.0
-
-  pull_request:
-    # Run tests when pull requests are made on these branches in your repo,
-    # or remove this branches section to run tests on all your branches
-    branches:
-      - main
-      - master
-      - dev/*
-
-jobs:
-  call-tests:
-    name: Extension tests
-      # Set the phpBB branch to test your extension with after the @ symbol
-      # - 3.3.x: Targets the phpBB 3.3.x release line
-      # - master: Targets the latest development version of phpBB (master branch)
-    uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@{{ skeleton_version_compare(REQUIREMENTS.phpbb_version_min, "4.0", "<") ? '3.3.x' : 'master' }}
-    with:
-      # Your extension vendor/package name
-      EXTNAME: {{ EXTENSION.vendor_name }}/{{ EXTENSION.extension_name }}
 {% endif %}