Some manual coding standards cleanup

Author: danielbachhuber

.maintenance/src/GitHub.php

@@ -303,11 +303,7 @@ public static function get_project_milestone_pull_requests(
 			list( $body, $headers ) = self::request( $request_url, $args );
 			foreach ( $body as $issue ) {
 				if ( ! empty( $issue->pull_request ) ) {
-					//if ( ! $only_merged || self::was_pull_request_merged( $project, $issue->number ) ) {
-						$pull_requests[] = $issue;
-					//} else {
-						//WP_CLI::warning( "Skipping PR {$issue->number} ({$issue->title}), as it was not merged." );
-					//}
+					$pull_requests[] = $issue;
 				}
 			}
 			$args        = array();
@@ -479,7 +475,8 @@ public static function request(
 				'User-Agent' => 'WP-CLI',
 			)
 		);
-		if ( $token = getenv( 'GITHUB_TOKEN' ) ) {
+		$token   = getenv( 'GITHUB_TOKEN' )
+		if ( $token ) {
 			$headers['Authorization'] = 'token ' . $token;
 		}
 
@@ -495,7 +492,7 @@ public static function request(
 
 		$response = Utils\http_request( $verb, $url, $args, $headers );
 
-		if ( 20 != substr( $response->status_code, 0, 2 ) ) {
+		if ( 20 !== (int) substr( $response->status_code, 0, 2 ) ) {
 			if ( isset( $args['throw_errors'] ) && false === $args['throw_errors'] ) {
 				return false;
 			}

.maintenance/src/Release_Command.php

@@ -46,7 +46,7 @@ public function close_released( $args, $assoc_args ) {
 			foreach ( $milestones as $milestone ) {
 				WP_CLI::log( "Checking milestone '{$milestone->title}'..." );
 				foreach ( $releases as $release ) {
-					if ( $release->tag_name === $milestone->title || $release->tag_name === "v{$milestone->title}" ) {
+					if ( $release->tag_name === $milestone->title || "v{$milestone->title}" === $release->tag_name ) {
 						WP_CLI::log( "Found matching release '{$release->tag_name}', closing milestone '{$milestone->title}'..." );
 						GitHub::close_milestone( $repo, $milestone->number );
 					}
@@ -95,7 +95,7 @@ public function generate( $args, $assoc_args ) {
 			foreach ( $milestones as $milestone ) {
 				WP_CLI::log( "Checking milestone '{$milestone->title}'..." );
 				foreach ( $releases as $release ) {
-					if ( $release->tag_name === $milestone->title || $release->tag_name === "v{$milestone->title}" ) {
+					if ( $release->tag_name === $milestone->title || "v{$milestone->title}" === $release->tag_name ) {
 						WP_CLI::log( "Found matching release '{$release->tag_name}', skipping milestone '{$milestone->title}'..." );
 						continue 2;
 					}
@@ -116,7 +116,7 @@ public function generate( $args, $assoc_args ) {
 				WP_CLI::log( "{$title} ({$tag})\n{$release_notes}" );
 				WP_CLI::log( '-----' );
 
-				fwrite( STDOUT, 'Is the above correct?' . ' [y/n] ' );
+				fwrite( STDOUT, 'Is the above correct? [y/n] ' );
 				$answer = strtolower( trim( fgets( STDIN ) ) );
 				if ( 'y' !== $answer ) {
 					continue 2;
@@ -212,6 +212,7 @@ private function get_release_notes(
 					}
 
 					WP_CLI::warning( "Release notes not found for {$repo}@{$tag}, falling back to pull-request source" );
+					// Intentionally falling through.
 				case 'pull-request':
 					$pull_requests = GitHub::get_project_milestone_pull_requests(
 						$repo,
@@ -230,7 +231,7 @@ private function get_release_notes(
 			}
 		}
 
-		$template = $format === 'html' ? '<ul>%s</ul>' : '%s';
+		$template = 'html' === $format ? '<ul>%s</ul>' : '%s';
 
 		return sprintf( $template, implode( '', $entries ) );
 	}
@@ -239,7 +240,7 @@ private function get_pull_request_reference(
 		$pull_request,
 		$format
 	) {
-		$template = $format === 'html' ?
+		$template = 'html' === $format ?
 			'<li>%1$s [<a href="%3$s">#%2$d</a>]</li>' :
 			'- %1$s [[#%2$d](%3$s)]' . PHP_EOL;
 
@@ -278,7 +279,7 @@ static function ( $repo ) {
 				GitHub::get_organization_repos(),
 				static function ( $repo ) use ( $exclude ) {
 					if ( null === $exclude ) {
-						return $repo->archived === false && $repo->disabled === false;
+						return false === $repo->archived && false === $repo->disabled;
 					}
 
 					return ! in_array( $repo->full_name, (array) $exclude, true );