Improve static analysis and formatting

Author: westonruter

includes/class-amp-theme-support.php

@@ -13,7 +13,6 @@
 use AmpProject\AmpWP\QueryVar;
 use AmpProject\AmpWP\ConfigurationArgument;
 use AmpProject\AmpWP\Services;
-use AmpProject\AmpWP\Transformer;
 use AmpProject\Attribute;
 use AmpProject\Dom\Document;
 use AmpProject\Extension;

src/Cli/OptimizerCommand.php

@@ -14,7 +14,6 @@
 use AmpProject\AmpWP\Optimizer\OptimizerService;
 use AmpProject\Optimizer\Error;
 use AmpProject\Optimizer\ErrorCollection;
-use AmpProject\Optimizer\TransformationEngine;
 use WP_CLI;
 
 /**
@@ -67,7 +66,7 @@ public function __construct( OptimizerService $optimizer_service ) {
 	 * @param array $assoc_args Associative array of associative arguments.
 	 * @throws WP_CLI\ExitException If the requested file could not be read.
 	 */
-	public function optimize( $args, $assoc_args ) {
+	public function optimize( $args, /** @noinspection PhpUnusedParameterInspection */ $assoc_args ) {
 		$file = '-';
 
 		if ( count( $args ) > 0 ) {

src/Cli/TransformerCommand.php

@@ -214,6 +214,7 @@ public function config( $args, $assoc_args ) {
 			$config_array = $this->configuration->getTransformerConfiguration( $transformer_class )->toArray();
 		} catch ( UnknownConfigurationClass $exception ) {
 			WP_CLI::error( $exception->getMessage() );
+
 			return;
 		}
 

src/Cli/ValidationCommand.php

@@ -439,7 +439,7 @@ public function generate_nonce() {
 	 * @throws WP_CLI\ExitException If an error occurred during the validation.
 	 */
 	public function check_url( $args ) {
-		list($url) = $args;
+		list( $url ) = $args;
 
 		$host            = wp_parse_url( $url, PHP_URL_HOST );
 		$parsed_home_url = wp_parse_url( home_url( '/' ) );

src/Infrastructure/ServiceBasedPlugin.php

@@ -293,7 +293,7 @@ protected function register_service( $id, $class ) {
 
 		$this->service_container->put( $id, $service );
 
-		if ( $service instanceof CliCommand && defined( 'WP_CLI' ) && WP_CLI ) {
+		if ( $service instanceof CliCommand && is_callable( $service ) && defined( 'WP_CLI' ) && WP_CLI ) {
 			WP_CLI::add_command( $service::get_command_name(), $service );
 		}