Fixed bug #20402 : SVN pre-commit hook fails due to unknown argument …

…error
cmdsecure · Sep 11, 2014 · 2e12bfc · 2e12bfc
1 parent 45d711d
commit 2e12bfc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 19 deletions.
diff --git a/CodeSniffer/CLI.php b/CodeSniffer/CLI.php
@@ -470,9 +470,7 @@ public function processShortArgument($arg, $pos)
             if ($this->dieOnUnknownArg === false) {
                 $this->values[$arg] = $arg;
             } else {
-                echo 'ERROR: option "'.$arg.'" not known.'.PHP_EOL.PHP_EOL;
-                $this->printUsage();
-                exit(2);
+                $this->processUnknownArgument('-'.$arg, $pos);
             }
         }//end switch
 
@@ -643,9 +641,7 @@ public function processLongArgument($arg, $pos)
                         $this->values[$arg] = $value;
                     }
                 } else {
-                    echo 'ERROR: option "'.$arg.'" not known.'.PHP_EOL.PHP_EOL;
-                    $this->printUsage();
-                    exit(2);
+                    $this->processUnknownArgument('--'.$arg, $pos);
                 }
             }//end if
 
@@ -667,6 +663,17 @@ public function processLongArgument($arg, $pos)
      */
     public function processUnknownArgument($arg, $pos)
     {
+        // We don't know about any additional switches; just files.
+        if ($arg{0} === '-') {
+            if ($this->dieOnUnknownArg === false) {
+                return;
+            }
+
+            echo 'ERROR: option "'.$arg.'" not known.'.PHP_EOL.PHP_EOL;
+            $this->printUsage();
+            exit(2);
+        }
+
         $file = PHP_CodeSniffer::realpath($arg);
         if (file_exists($file) === false) {
             if ($this->dieOnUnknownArg === false) {

diff --git a/package.xml b/package.xml
@@ -62,6 +62,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #20378 : Report appended to existing file if no errors found in run
   - Fixed bug #20381 : Invalid "Comment closer must be on a new line"
     -- Thanks to Brad Kent for the patch
+  - Fixed bug #20402 : SVN pre-commit hook fails due to unknown argument error
  </notes>
  <contents>
   <dir name="/">

diff --git a/scripts/phpcs-svn-pre-commit b/scripts/phpcs-svn-pre-commit
@@ -57,19 +57,16 @@ class PHP_CodeSniffer_SVN_Hook extends PHP_CodeSniffer_CLI
     /**
      * Processes an unknown command line argument.
      *
-     * All unknown args are sent to SVN commands.
+     * Assumes all unknown arguments are files and folders to check.
      *
-     * @param string $arg    The command line argument.
-     * @param int    $pos    The position of the argument on the command line.
-     * @param array  $values An array of values determined from CLI args.
+     * @param string $arg The command line argument.
+     * @param int    $pos The position of the argument on the command line.
      *
-     * @return array The updated CLI values.
-     * @see getCommandLineValues()
+     * @return void
      */
-    public function processUnknownArgument($arg, $pos, $values)
+    public function processUnknownArgument($arg, $pos)
     {
-        $values['svnArgs'][] = escapeshellarg($arg);
-        return $values;
+        $this->values['svnArgs'][] = escapeshellarg($arg);
 
     }//end processUnknownArgument()
 
@@ -80,12 +77,15 @@ class PHP_CodeSniffer_SVN_Hook extends PHP_CodeSniffer_CLI
      * @param array $values An array of values determined from CLI args.
      *
      * @return int The number of error and warning messages shown.
-     * @see getCommandLineValues()
+     * @see    getCommandLineValues()
      */
     public function process($values=array())
     {
         if (empty($values) === true) {
-            $values = parent::getCommandLineValues();
+            $values = $this->getCommandLineValues();
+        } else {
+            $values       = array_merge($this->getDefaults(), $values);
+            $this->values = $values;
         }
 
         // Get list of files in this transaction.
@@ -127,6 +127,8 @@ class PHP_CodeSniffer_SVN_Hook extends PHP_CodeSniffer_CLI
         // let PHP_CodeSniffer decide on the defaults.
         if (empty($values['extensions']) === false) {
             $phpcs->setAllowedFileExtensions($values['extensions']);
+        } else {
+            $phpcs->setAllowedFileExtensions(array_keys($phpcs->defaultFileExtensions));
         }
 
         // Set ignore patterns if they were specified.
@@ -217,11 +219,11 @@ class PHP_CodeSniffer_SVN_Hook extends PHP_CodeSniffer_CLI
 }//end class
 
 $phpcs = new PHP_CodeSniffer_SVN_Hook();
+
+PHP_CodeSniffer_Reporting::startTiming();
 $phpcs->checkRequirements();
 
 $numErrors = $phpcs->process();
 if ($numErrors !== 0) {
     exit(1);
 }
-
-?>