Remove the need to specify folder, since it can be included in the repository URL by default

Author: david-binda

class-phpcs-diff-svn.php

@@ -7,28 +7,23 @@ class PHPCS_Diff_SVN {
 	private $svn_password = ''; // @todo: add your SVN password here
 
 	// Used to store details about the repo the class was initialized with.
-	public $repo; // Specific repository - eg.: plugin's name.
+	public $repo; // repository's slug.
 	public $repo_url; // SVN repository URL.
-	public $folder = ''; // In case the repository has some other specific folders.
 
-	function __construct( $repo, $folder = false ) {
+	function __construct( $repo ) {
 
 		$repo = sanitize_title( $repo );
 
 		switch ( $repo ) {
 
 			case 'hello-dolly':
-				$this->repo_url = 'https://plugins.svn.wordpress.org/';
+				$this->repo_url = 'https://plugins.svn.wordpress.org/hello-dolly';
 				break;
 
 			# Add new repos here. See details at the top of this file.
 		}
 
 		$this->repo = $repo;
-
-		if ( false !== $folder && 0 === validate_file( $folder ) ) {
-			$this->folder = $folder;
-		}
 	}
 
 	public function get_diff( $end_revision, $start_revision = null, $options = array() ) {
@@ -58,7 +53,7 @@ public function get_diff( $end_revision, $start_revision = null, $options = arra
 			$start_revision = 1;
 		}
 
-		$repo_url = esc_url_raw( trailingslashit( $this->repo_url ) . trailingslashit( $this->repo ) . $this->folder );
+		$repo_url = esc_url_raw( trailingslashit( $this->repo_url ) );
 
 		$diff = shell_exec(
 			sprintf( 'svn diff %s --non-interactive --no-auth-cache --username %s --password %s -r %d:%d %s %s %s',
@@ -164,7 +159,7 @@ public static function parse_diff_for_info( $diff_file ){
 
 	public function run_phpcs_for_file_at_revision( $filename, $revision, $phpcs_command, $standards_location, $phpcs_standard ) {
 		$command_string	= sprintf( 'svn cat %s --non-interactive --no-auth-cache --username %s --password %s -r %d | %s --runtime-set installed_paths %s --standard=%s --stdin-path=%s',
-			escapeshellarg( esc_url_raw( $this->repo_url . $filename ) ),
+			escapeshellarg( esc_url_raw( trailingslashit( $this->repo_url ) . $filename ) ),
 			escapeshellarg( $this->svn_username ),
 			escapeshellarg( $this->svn_password ),
 			absint( $revision ),

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>] [--folder=<folder>]
+	 * @synopsis --repo=<repo> --start_revision=<start-revision> --end_revision=<end-revision> [--standard=<standard>] [--format=<format>] [--nocache] [--ignore-diff-too-big] [--excluded-exts=<excluded-exts>]
 	 */
 	public function __invoke( $args, $assoc_args ) {
 
@@ -58,14 +58,10 @@ 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, $folder ) );
+		$phpcs = new PHPCS_Diff( new PHPCS_Diff_SVN( $repo ) );
 
 		if ( true === array_key_exists( 'ignore-diff-too-big', $assoc_args ) ) {
 			$phpcs->set_no_diff_too_big( true );
@@ -81,7 +77,7 @@ public function __invoke( $args, $assoc_args ) {
 		if ( true === isset( $excluded_exts ) && false === empty( $excluded_exts ) && true === is_array( $excluded_exts ) ) {
 			$phpcs->set_excluded_extensions( $excluded_exts );
 		}
-		$found_issues = $phpcs->run( $repo, $start_revision, $end_revision );
+		$found_issues = $phpcs->run( $start_revision, $end_revision );
 
 		if ( is_wp_error( $found_issues ) ) {
 			WP_CLI::error( $found_issues->get_error_message(), true );