Do not hardcode the version control backend in the constructor of the PHPCS_Diff class.

Author: david-binda

class-phpcs-diff.php

@@ -6,7 +6,7 @@ class PHPCS_Diff {
 	private $phpcs_command = 'phpcs'; // You might need to provde a path to phpcs.phar file.
 	private $standards_location = '~/PHP_CodeSniffer/Standards'; // @todo: adjust the path to standards
 
-	private $diff_parser;
+	private $version_control;
 
 	public $allowed_extensions;
 
@@ -20,11 +20,9 @@ class PHPCS_Diff {
 
 	private $no_diff_to_big = false;
 
-	public function __construct() {
+	public function __construct( $version_control ) {
 
-		require_once( __DIR__ . 'class-phpcs-diff-svn.php' );
-
-		$this->diff_parser = new PHPCS_Diff_SVN( 'hello-dolly' );
+		$this->version_control = $version_control;
 
 		$this->allowed_extensions = array( 'php', 'js' );
 	}
@@ -66,7 +64,7 @@ public function run( $repo, $oldest_rev, $newest_rev ) {
 			}
 		}
 
-		$diff  = trim( $this->diff_parser->get_diff( $repo, $newest_rev, $oldest_rev, array( 'ignore-space-change' => true ) ) );
+		$diff  = trim( $this->version_control->get_diff( $repo, $newest_rev, $oldest_rev, array( 'ignore-space-change' => true ) ) );
 
 		$this->stop_the_insanity();
 
@@ -80,7 +78,7 @@ public function run( $repo, $oldest_rev, $newest_rev ) {
 			return $error;
 		}
 
-		$diff_info	  = $this->diff_parser->parse_diff_for_info( $diff );
+		$diff_info	  = $this->version_control->parse_diff_for_info( $diff );
 		$file_diffs   = $diff_info['file_diffs'];
 
 		$found_issues = array();
@@ -156,7 +154,7 @@ private function run_phpcs_for_file_revision( $filename, $revision ) {
 
 		if ( false === $result ) {
 
-			$result = $this->diff_parser->run_phpcs_for_file_at_revision( $filename, $revision, $this->phpcs_command, $this->standards_location, $this->phpcs_standard );
+			$result = $this->version_control->run_phpcs_for_file_at_revision( $filename, $revision, $this->phpcs_command, $this->standards_location, $this->phpcs_standard );
 
 			if ( true !== $this->nocache ) {
 				wp_cache_set( $cache_key, $result, $cache_group, 6*HOUR_IN_SECONDS );

wp-cli-command.php

@@ -59,7 +59,10 @@ public function __invoke( $args, $assoc_args ) {
 			$excluded_exts = array_map( 'sanitize_text_field', explode( ',', $assoc_args['excluded-exts'] ) );
 		}
 
-		$phpcs = new PHPCS_Diff();
+		// @todo: replace SVN version control backend with any other parser you might want to use - eg.: git
+		require_once( __DIR__ . 'class-phpcs-diff-svn.php' );
+		$phpcs = new PHPCS_Diff( new PHPCS_Diff_SVN( 'hello-dolly' ) );
+
 		if ( true === array_key_exists( 'ignore-diff-too-big', $assoc_args ) ) {
 			$phpcs->set_no_diff_too_big( true );
 		}