Remove transitional code

Author: schlessera

utils/maintenance/Contrib_List_Command.php

@@ -59,20 +59,13 @@ public function __invoke( $_, $assoc_args ) {
 		}
 
 		// Identify all command dependencies and their contributors
-
-		// TODO: Bundle repo needs to be switched to `wp-cli/wp-cli-bundle` for next release.
-		$bundle = 'wp-cli/wp-cli';
+		$bundle = 'wp-cli/wp-cli-bundle';
 
 		$milestones = GitHub::get_project_milestones( 'wp-cli/wp-cli', [ 'state' => 'closed' ] );
 		// Cheap way to get the latest closed milestone
 		$milestone = array_shift( $milestones );
 		$tag       = is_object( $milestone ) ? "v{$milestone->title}" : 'master';
 
-		// TODO: Only needed for switch from v1 to v2.
-		if ( 'wp-cli/wp-cli' === $bundle ) {
-			$tag = 'v1.5.1';
-		}
-
 		$composer_lock_url = sprintf( 'https://raw.githubusercontent.com/%s/%s/composer.lock', $bundle, $tag );
 		WP_CLI::log( 'Fetching ' . $composer_lock_url );
 		$response = Utils\http_request( 'GET', $composer_lock_url );
@@ -81,11 +74,6 @@ public function __invoke( $_, $assoc_args ) {
 		}
 		$composer_json = json_decode( $response->body, true );
 
-		// TODO: Only need for initial v2.
-		$composer_json['packages'][] = [
-			'name'    => 'wp-cli/i18n-command',
-			'version' => 'v2',
-		];
 		usort(
 			$composer_json['packages'],
 			function ( $a, $b ) {

utils/maintenance/Release_Notes_Command.php

@@ -114,8 +114,7 @@ private function get_bundle_release_notes( $source, $format ) {
 
 		// Identify all command dependencies and their release notes
 
-		// TODO: Bundle repo needs to be switched to `wp-cli/wp-cli-bundle` for next release.
-		$bundle = 'wp-cli/wp-cli';
+		$bundle = 'wp-cli/wp-cli-bundle';
 
 		$milestones = GitHub::get_project_milestones(
 			'wp-cli/wp-cli',
@@ -125,11 +124,6 @@ private function get_bundle_release_notes( $source, $format ) {
 		$milestone = array_shift( $milestones );
 		$tag       = is_object( $milestone ) ? "v{$milestone->title}" : 'master';
 
-		// TODO: Only needed for switch from v1 to v2.
-		if ( 'wp-cli/wp-cli' === $bundle ) {
-			$tag = 'v1.5.1';
-		}
-
 		$composer_lock_url = sprintf(
 			'https://raw.githubusercontent.com/%s/%s/composer.lock',
 			$bundle,
@@ -146,11 +140,6 @@ private function get_bundle_release_notes( $source, $format ) {
 		}
 		$composer_json = json_decode( $response->body, true );
 
-		// TODO: Only need for initial v2.
-		$composer_json['packages'][] = [
-			'name'    => 'wp-cli/i18n-command',
-			'version' => 'v2',
-		];
 		usort(
 			$composer_json['packages'],
 			function ( $a, $b ) {