Use GNU licenses without "-only"

Author: ara303

features/scaffold-package-readme.feature

@@ -538,7 +538,7 @@ Feature: Scaffold a README.md file for an existing package
       }
       """
 
-    When I run `wp scaffold package-readme foo --license=GPL-2.0-only`
+    When I run `wp scaffold package-readme foo --license=GPL-2.0`
     Then the foo/README.md file should exist
     And the foo/LICENSE file should exist
     And the foo/LICENSE file should contain:
@@ -547,7 +547,7 @@ Feature: Scaffold a README.md file for an existing package
       """
     And the foo/composer.json file should contain:
       """
-      "license": "GPL-2.0-only"
+      "license": "GPL-2.0"
       """
 
   Scenario: Scaffold a README.md with --license=none removes LICENSE and sets proprietary

src/ScaffoldPackageCommand.php

@@ -40,7 +40,7 @@ class ScaffoldPackageCommand {
 	 * : Specify a destination directory for the command. Defaults to WP-CLI's `packages/local/` directory.
 	 *
 	 * [--license=<license>]
-	 * : License for the package by SPDX code (omitting "-only" from GNU codes).
+	 * : License for the package by SPDX code. Omit "-only" for GNU licenses.
 	 * ---
 	 * default: MIT
 	 * options:
@@ -298,7 +298,7 @@ public function package( $args, $assoc_args ) {
 	 * : Name of default branch of the underlying repository. Defaults to main.
 	 *
 	 * [--license=<license>]
-	 * : License for the package by SPDX code (omitting "-only" from GNU codes).
+	 * : License for the package by SPDX code. Omit "-only" for GNU licenses.
 	 * ---
 	 * default: MIT
 	 * options:
@@ -923,12 +923,6 @@ private function resolve_license_file_path( $license, $template_path ) {
 		if ( file_exists( $license_path ) ) {
 			return $license_path;
 		}
-
-		$without_only = (string) preg_replace( '/-only$/', '', $normalized );
-		if ( $without_only !== $normalized && file_exists( $template_path . 'licenses/' . $without_only ) ) {
-			return $template_path . 'licenses/' . $without_only;
-		}
-
 		return null;
 	}