Use $this->repo instead of passing the variable to functions.

Add support for folder in case the repository can contain multiple folders for different project

Author: david-binda

class-phpcs-diff-svn.php

@@ -9,8 +9,11 @@ class PHPCS_Diff_SVN {
 	// Used to store details about the repo the class was initialized with.
 	public $repo; // Specific repository - eg.: plugin's name.
 	public $repo_url; // SVN repository URL.
+	public $folder = ''; // In case the repository has some other specific folders.
 
-	function __construct( $repo ) {
+	function __construct( $repo, $folder = false ) {
+
+		$repo = sanitize_title( $repo );
 
 		switch ( $repo ) {
 
@@ -22,9 +25,13 @@ function __construct( $repo ) {
 		}
 
 		$this->repo = $repo;
+
+		if ( false !== $folder && 0 === validate_file( $folder ) ) {
+			$this->folder = $folder;
+		}
 	}
 
-	public function get_diff( $folder, $end_revision, $start_revision = null, $options = array() ) {
+	public function get_diff( $end_revision, $start_revision = null, $options = array() ) {
 		$summarize			 = false;
 		$xml 				 = false;
 		$ignore_space_change = false;
@@ -43,7 +50,6 @@ public function get_diff( $folder, $end_revision, $start_revision = null, $optio
 		}
 
 		$end_revision 	= (int) $end_revision;
-		$folder 		= str_replace( '..', '', $folder ); // Prevent moving up a directory
 
 		if ( $start_revision && is_numeric( $start_revision ) ) {
 			$start_revision = (int) $start_revision;
@@ -52,7 +58,7 @@ public function get_diff( $folder, $end_revision, $start_revision = null, $optio
 			$start_revision = 1;
 		}
 
-		$repo_url = esc_url_raw( trailingslashit( $this->repo_url ) . trailingslashit( $this->repo ) . $folder );
+		$repo_url = esc_url_raw( trailingslashit( $this->repo_url ) . trailingslashit( $this->repo ) . $this->folder );
 
 		$diff = shell_exec(
 			sprintf( 'svn diff %s --non-interactive --no-auth-cache --username %s --password %s -r %d:%d %s %s %s',

class-phpcs-diff.php

@@ -48,13 +48,12 @@ public function set_excluded_extensions( $excluded_exts ) {
 		$this->excluded_extensions = $excluded_exts;
 	}
 
-	public function run( $repo, $oldest_rev, $newest_rev ) {
+	public function run( $oldest_rev, $newest_rev ) {
 
 		$oldest_rev = absint( $oldest_rev );
 		$newest_rev = absint( $newest_rev );
-		$repo	    = sanitize_title( $repo );
 
-		$cache_key	  = md5( 'phpcs_' . $repo . $oldest_rev . $newest_rev );
+		$cache_key	  = md5( 'phpcs_' . $this->version_control->repo . $oldest_rev . $newest_rev );
 		$cache_group  = 'vip-phpcs';
 
 		if ( true !== $this->nocache ) {
@@ -64,7 +63,7 @@ public function run( $repo, $oldest_rev, $newest_rev ) {
 			}
 		}
 
-		$diff  = trim( $this->version_control->get_diff( $repo, $newest_rev, $oldest_rev, array( 'ignore-space-change' => true ) ) );
+		$diff  = trim( $this->version_control->get_diff( $newest_rev, $oldest_rev, array( 'ignore-space-change' => true ) ) );
 
 		$this->stop_the_insanity();
 

wp-cli-command.php

@@ -41,7 +41,7 @@ class PHPCS_Diff_CLI_Command extends WP_CLI_Command {
 	 * wp phpcs-diff --repo="hello-dolly" --start_revision=99998 --end_revision=100000
 	 *
 	 * @subcommand phpcs-diff
-	 * @synopsis --repo=<repo> --start_revision=<start-revision> --end_revision=<end-revision> [--standard=<standard>] [--format=<format>] [--nocache] [--ignore-diff-too-big] [--excluded-exts=<excluded-exts>]
+	 * @synopsis --repo=<repo> --start_revision=<start-revision> --end_revision=<end-revision> [--standard=<standard>] [--format=<format>] [--nocache] [--ignore-diff-too-big] [--excluded-exts=<excluded-exts>] [--folder=<folder>]
 	 */
 	public function __invoke( $args, $assoc_args ) {
 
@@ -58,10 +58,14 @@ public function __invoke( $args, $assoc_args ) {
 		if ( true === array_key_exists( 'excluded-exts', $assoc_args ) && false === empty( $assoc_args['excluded-exts'] ) ) {
 			$excluded_exts = array_map( 'sanitize_text_field', explode( ',', $assoc_args['excluded-exts'] ) );
 		}
+		$folder = false;
+		if ( true === array_key_exists( 'folder', $assoc_args ) && false === empty( sanitize_text_field( $assoc_args['folder'] ) && 0 === validate_file( sanitize_text_field( $assoc_args['folder'] ) ) ) ) {
+			$folder = sanitize_text_field( $assoc_args['folder'] );
+		}
 
 		// @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( $repo ) );
+		$phpcs = new PHPCS_Diff( new PHPCS_Diff_SVN( $repo, $folder ) );
 
 		if ( true === array_key_exists( 'ignore-diff-too-big', $assoc_args ) ) {
 			$phpcs->set_no_diff_too_big( true );