Symplify / PHP7_CodeSniffer

src/Config.php

Indentation +30 added lines, -30 removed lines

@@ -76,31 +76,31 @@ 
      * @var array<string, mixed>
      */
     private $settings = array(
-                         'files'           => null,
-                         'standards'       => null,
-                         'verbosity'       => null,
-                         'interactive'     => null,
-                         'explain'         => null,
-                         'local'           => null,
-                         'showSources'     => null,
-                         'showProgress'    => null,
-                         'tabWidth'        => null,
-                         'extensions'      => null,
-                         'sniffs'          => null,
-                         'ignored'         => null,
-                         'reportFile'      => null,
-                         'filter'          => null,
-                         'bootstrap'       => null,
-                         'reports'         => null,
-                         'basepath'        => null,
-                         'reportWidth'     => null,
-                         'errorSeverity'   => null,
-                         'warningSeverity' => null,
-                         'recordErrors'    => null,
-                         'suffix'          => null,
-                         'stdin'           => null,
-                         'stdinContent'    => null,
-                         'stdinPath'       => null,
+                            'files'           => null,
+                            'standards'       => null,
+                            'verbosity'       => null,
+                            'interactive'     => null,
+                            'explain'         => null,
+                            'local'           => null,
+                            'showSources'     => null,
+                            'showProgress'    => null,
+                            'tabWidth'        => null,
+                            'extensions'      => null,
+                            'sniffs'          => null,
+                            'ignored'         => null,
+                            'reportFile'      => null,
+                            'filter'          => null,
+                            'bootstrap'       => null,
+                            'reports'         => null,
+                            'basepath'        => null,
+                            'reportWidth'     => null,
+                            'errorSeverity'   => null,
+                            'warningSeverity' => null,
+                            'recordErrors'    => null,
+                            'suffix'          => null,
+                            'stdin'           => null,
+                            'stdinContent'    => null,
+                            'stdinPath'       => null,
                         );
 
     /**
@@ -393,11 +393,11 @@ 
         $this->showProgress    = false;
         $this->tabWidth        = 0;
         $this->extensions      = array(
-                                  'php' => 'PHP',
-                                  'inc' => 'PHP',
-                                  'js'  => 'JS',
-                                  'css' => 'CSS',
-                                 );
+                                    'php' => 'PHP',
+                                    'inc' => 'PHP',
+                                    'js'  => 'JS',
+                                    'css' => 'CSS',
+                                    );
         $this->sniffs          = array();
         $this->ignored         = array();
         $this->filter          = null;

Switch Indentation +227 added lines, -227 removed lines

@@ -184,35 +184,35 @@ 
         }
 
         switch ($name) {
-        case 'reportWidth' :
-            // Support auto terminal width.
-            if ($value === 'auto' && preg_match('|\d+ (\d+)|', shell_exec('stty size 2>&1'), $matches) === 1) {
-                $value = (int) $matches[1];
-            } else {
-                $value = (int) $value;
-            }
-            break;
-        case 'standards' :
-            $cleaned = array();
-
-            // Check if the standard name is valid, or if the case is invalid.
-            $installedStandards = Util\Standards::getInstalledStandards();
-            foreach ($value as $standard) {
-                foreach ($installedStandards as $validStandard) {
-                    if (strtolower($standard) === strtolower($validStandard)) {
-                        $standard = $validStandard;
-                        break;
-                    }
+            case 'reportWidth' :
+                // Support auto terminal width.
+                if ($value === 'auto' && preg_match('|\d+ (\d+)|', shell_exec('stty size 2>&1'), $matches) === 1) {
+                    $value = (int) $matches[1];
+                } else {
+                    $value = (int) $value;
                 }
+                break;
+            case 'standards' :
+                $cleaned = array();
+
+                // Check if the standard name is valid, or if the case is invalid.
+                $installedStandards = Util\Standards::getInstalledStandards();
+                foreach ($value as $standard) {
+                    foreach ($installedStandards as $validStandard) {
+                        if (strtolower($standard) === strtolower($validStandard)) {
+                            $standard = $validStandard;
+                            break;
+                        }
+                    }
 
-                $cleaned[] = $standard;
-            }
+                    $cleaned[] = $standard;
+                }
 
-            $value = $cleaned;
-            break;
-        default :
-            // No validation required.
-            break;
+                $value = $cleaned;
+                break;
+            default :
+                // No validation required.
+                break;
         }//end switch
 
         $this->settings[$name] = $value;
@@ -471,68 +471,68 @@ 
     public function processShortArgument($arg, $pos)
     {
         switch ($arg) {
-        case 'h':
-        case '?':
-            $this->printUsage();
-            exit(0);
-        case 'i' :
-            Util\Standards::printInstalledStandards();
-            exit(0);
-        case 'v' :
-            $this->verbosity++;
-            $this->overriddenDefaults['verbosity'] = true;
-            break;
-        case 'l' :
-            $this->local = true;
-            $this->overriddenDefaults['local'] = true;
-            break;
-        case 's' :
-            $this->showSources = true;
-            $this->overriddenDefaults['showSources'] = true;
-            break;
-        case 'a' :
-            $this->interactive = true;
-            $this->overriddenDefaults['interactive'] = true;
-            break;
-        case 'e':
-            $this->explain = true;
-            $this->overriddenDefaults['explain'] = true;
-            break;
-        case 'p' :
-            $this->showProgress = true;
-            $this->overriddenDefaults['showProgress'] = true;
-            break;
-        case 'm' :
-            $this->recordErrors = false;
-            $this->overriddenDefaults['recordErrors'] = true;
-            break;
-        case 'd' :
-            $ini = explode('=', $this->cliArgs[($pos + 1)]);
-            $this->cliArgs[($pos + 1)] = '';
-            if (isset($ini[1]) === true) {
-                ini_set($ini[0], $ini[1]);
-            } else {
-                ini_set($ini[0], true);
-            }
-            break;
-        case 'n' :
-            if (isset($this->overriddenDefaults['warningSeverity']) === false) {
-                $this->warningSeverity = 0;
-                $this->overriddenDefaults['warningSeverity'] = true;
-            }
-            break;
-        case 'w' :
-            if (isset($this->overriddenDefaults['warningSeverity']) === false) {
-                $this->warningSeverity = $this->errorSeverity;
-                $this->overriddenDefaults['warningSeverity'] = true;
-            }
-            break;
-        default:
-            if ($this->dieOnUnknownArg === false) {
-                $this->values[$arg] = $arg;
-            } else {
-                $this->processUnknownArgument('-'.$arg, $pos);
-            }
+            case 'h':
+            case '?':
+                $this->printUsage();
+                exit(0);
+            case 'i' :
+                Util\Standards::printInstalledStandards();
+                exit(0);
+            case 'v' :
+                $this->verbosity++;
+                $this->overriddenDefaults['verbosity'] = true;
+                break;
+            case 'l' :
+                $this->local = true;
+                $this->overriddenDefaults['local'] = true;
+                break;
+            case 's' :
+                $this->showSources = true;
+                $this->overriddenDefaults['showSources'] = true;
+                break;
+            case 'a' :
+                $this->interactive = true;
+                $this->overriddenDefaults['interactive'] = true;
+                break;
+            case 'e':
+                $this->explain = true;
+                $this->overriddenDefaults['explain'] = true;
+                break;
+            case 'p' :
+                $this->showProgress = true;
+                $this->overriddenDefaults['showProgress'] = true;
+                break;
+            case 'm' :
+                $this->recordErrors = false;
+                $this->overriddenDefaults['recordErrors'] = true;
+                break;
+            case 'd' :
+                $ini = explode('=', $this->cliArgs[($pos + 1)]);
+                $this->cliArgs[($pos + 1)] = '';
+                if (isset($ini[1]) === true) {
+                    ini_set($ini[0], $ini[1]);
+                } else {
+                    ini_set($ini[0], true);
+                }
+                break;
+            case 'n' :
+                if (isset($this->overriddenDefaults['warningSeverity']) === false) {
+                    $this->warningSeverity = 0;
+                    $this->overriddenDefaults['warningSeverity'] = true;
+                }
+                break;
+            case 'w' :
+                if (isset($this->overriddenDefaults['warningSeverity']) === false) {
+                    $this->warningSeverity = $this->errorSeverity;
+                    $this->overriddenDefaults['warningSeverity'] = true;
+                }
+                break;
+            default:
+                if ($this->dieOnUnknownArg === false) {
+                    $this->values[$arg] = $arg;
+                } else {
+                    $this->processUnknownArgument('-'.$arg, $pos);
+                }
         }//end switch
 
     }//end processShortArgument()
@@ -549,167 +549,167 @@ 
     public function processLongArgument($arg, $pos)
     {
         switch ($arg) {
-        case 'help':
-            $this->printUsage();
-            exit(0);
-        case 'version':
-            echo 'Symplify\PHP7_CodeSniffer version '.self::VERSION;
-            exit(0);
-        case 'cache':
-            if (defined('Symplify\PHP7_CodeSniffer_IN_TESTS') === false) {
-                $this->cache = true;
+            case 'help':
+                $this->printUsage();
+                exit(0);
+            case 'version':
+                echo 'Symplify\PHP7_CodeSniffer version '.self::VERSION;
+                exit(0);
+            case 'cache':
+                if (defined('Symplify\PHP7_CodeSniffer_IN_TESTS') === false) {
+                    $this->cache = true;
+                    $this->overriddenDefaults['cache'] = true;
+                }
+                break;
+            case 'no-cache':
+                $this->cache = false;
                 $this->overriddenDefaults['cache'] = true;
-            }
-            break;
-        case 'no-cache':
-            $this->cache = false;
-            $this->overriddenDefaults['cache'] = true;
-            break;
-        default:
-            if (substr($arg, 0, 7) === 'sniffs=') {
-                $sniffs = explode(',', substr($arg, 7));
-                foreach ($sniffs as $sniff) {
-                    if (substr_count($sniff, '.') !== 2) {
-                        echo 'ERROR: The specified sniff code "'.$sniff.'" is invalid'.PHP_EOL.PHP_EOL;
-                        $this->printUsage();
-                        exit(2);
+                break;
+            default:
+                if (substr($arg, 0, 7) === 'sniffs=') {
+                    $sniffs = explode(',', substr($arg, 7));
+                    foreach ($sniffs as $sniff) {
+                        if (substr_count($sniff, '.') !== 2) {
+                            echo 'ERROR: The specified sniff code "'.$sniff.'" is invalid'.PHP_EOL.PHP_EOL;
+                            $this->printUsage();
+                            exit(2);
+                        }
                     }
-                }
 
-                $this->sniffs = $sniffs;
-                $this->overriddenDefaults['sniffs'] = true;
-            } else if (substr($arg, 0, 10) === 'bootstrap=') {
-                $files     = explode(',', substr($arg, 10));
-                $bootstrap = array();
-                foreach ($files as $file) {
-                    $path = Util\Common::realpath($file);
-                    if ($path === false) {
-                        echo 'ERROR: The specified bootstrap file "'.$file.'" does not exist'.PHP_EOL.PHP_EOL;
-                        $this->printUsage();
-                        exit(2);
+                    $this->sniffs = $sniffs;
+                    $this->overriddenDefaults['sniffs'] = true;
+                } else if (substr($arg, 0, 10) === 'bootstrap=') {
+                    $files     = explode(',', substr($arg, 10));
+                    $bootstrap = array();
+                    foreach ($files as $file) {
+                        $path = Util\Common::realpath($file);
+                        if ($path === false) {
+                            echo 'ERROR: The specified bootstrap file "'.$file.'" does not exist'.PHP_EOL.PHP_EOL;
+                            $this->printUsage();
+                            exit(2);
+                        }
+
+                        $bootstrap[] = $path;
                     }
 
-                    $bootstrap[] = $path;
-                }
+                    $this->bootstrap = array_merge($this->bootstrap, $bootstrap);
+                    $this->overriddenDefaults['bootstrap'] = true;
+                } else if (substr($arg, 0, 11) === 'stdin-path=') {
+                    $this->stdinPath = Util\Common::realpath(substr($arg, 11));
 
-                $this->bootstrap = array_merge($this->bootstrap, $bootstrap);
-                $this->overriddenDefaults['bootstrap'] = true;
-            } else if (substr($arg, 0, 11) === 'stdin-path=') {
-                $this->stdinPath = Util\Common::realpath(substr($arg, 11));
+                    // It may not exist and return false instead, so use whatever they gave us.
+                    if ($this->stdinPath === false) {
+                        $this->stdinPath = trim(substr($arg, 11));
+                    }
 
-                // It may not exist and return false instead, so use whatever they gave us.
-                if ($this->stdinPath === false) {
-                    $this->stdinPath = trim(substr($arg, 11));
-                }
+                    $this->overriddenDefaults['stdinPath'] = true;
+                } else if (substr($arg, 0, 9) === 'basepath=') {
+                    if (isset($this->overriddenDefaults['basepath']) === true) {
+                        break;
+                    }
 
-                $this->overriddenDefaults['stdinPath'] = true;
-            } else if (substr($arg, 0, 9) === 'basepath=') {
-                if (isset($this->overriddenDefaults['basepath']) === true) {
-                    break;
-                }
+                    $this->basepath = Util\Common::realpath(substr($arg, 9));
 
-                $this->basepath = Util\Common::realpath(substr($arg, 9));
+                    // It may not exist and return false instead.
+                    if ($this->basepath === false) {
+                        $this->basepath = substr($arg, 9);
+                    }
 
-                // It may not exist and return false instead.
-                if ($this->basepath === false) {
-                    $this->basepath = substr($arg, 9);
-                }
+                    $this->overriddenDefaults['basepath'] = true;
 
-                $this->overriddenDefaults['basepath'] = true;
+                    if (is_dir($this->basepath) === false) {
+                        echo 'ERROR: The specified basepath "'.$this->basepath.'" points to a non-existent directory'.PHP_EOL.PHP_EOL;
+                        $this->printUsage();
+                        exit(2);
+                    }
+                } else if (substr($arg, 0, 7) === 'filter=') {
+                    if (isset($this->overriddenDefaults['filter']) === true) {
+                        break;
+                    }
 
-                if (is_dir($this->basepath) === false) {
-                    echo 'ERROR: The specified basepath "'.$this->basepath.'" points to a non-existent directory'.PHP_EOL.PHP_EOL;
-                    $this->printUsage();
-                    exit(2);
-                }
-            } else if (substr($arg, 0, 7) === 'filter=') {
-                if (isset($this->overriddenDefaults['filter']) === true) {
-                    break;
-                }
+                    $this->filter = substr($arg, 7);
+                    $this->overriddenDefaults['filter'] = true;
+                } else if (substr($arg, 0, 9) === 'standard=') {
+                    $standards = trim(substr($arg, 9));
+                    if ($standards !== '') {
+                        $this->standards = explode(',', $standards);
+                    }
 
-                $this->filter = substr($arg, 7);
-                $this->overriddenDefaults['filter'] = true;
-            } else if (substr($arg, 0, 9) === 'standard=') {
-                $standards = trim(substr($arg, 9));
-                if ($standards !== '') {
-                    $this->standards = explode(',', $standards);
-                }
+                    $this->overriddenDefaults['standards'] = true;
+                } else if (substr($arg, 0, 11) === 'extensions=') {
+                    $extensions    = explode(',', substr($arg, 11));
+                    $newExtensions = array();
+                    foreach ($extensions as $ext) {
+                        $slash = strpos($ext, '/');
+                        if ($slash !== false) {
+                            // They specified the tokenizer too.
+                            list($ext, $tokenizer) = explode('/', $ext);
+                            $newExtensions[$ext]   = strtoupper($tokenizer);
+                            continue;
+                        }
 
-                $this->overriddenDefaults['standards'] = true;
-            } else if (substr($arg, 0, 11) === 'extensions=') {
-                $extensions    = explode(',', substr($arg, 11));
-                $newExtensions = array();
-                foreach ($extensions as $ext) {
-                    $slash = strpos($ext, '/');
-                    if ($slash !== false) {
-                        // They specified the tokenizer too.
-                        list($ext, $tokenizer) = explode('/', $ext);
-                        $newExtensions[$ext]   = strtoupper($tokenizer);
-                        continue;
+                        if (isset($this->extensions[$ext]) === true) {
+                            $newExtensions[$ext] = $this->extensions[$ext];
+                        } else {
+                            $newExtensions[$ext] = 'PHP';
+                        }
                     }
 
-                    if (isset($this->extensions[$ext]) === true) {
-                        $newExtensions[$ext] = $this->extensions[$ext];
-                    } else {
-                        $newExtensions[$ext] = 'PHP';
-                    }
-                }
+                    $this->extensions = $newExtensions;
+                    $this->overriddenDefaults['extensions'] = true;
+                } else if (substr($arg, 0, 7) === 'suffix=') {
+                    $this->suffix = explode(',', substr($arg, 7));
+                    $this->overriddenDefaults['suffix'] = true;
+                } else if (substr($arg, 0, 9) === 'severity=') {
+                    $this->errorSeverity   = (int) substr($arg, 9);
+                    $this->warningSeverity = $this->errorSeverity;
+                    $this->overriddenDefaults['errorSeverity']   = true;
+                    $this->overriddenDefaults['warningSeverity'] = true;
+                } else if (substr($arg, 0, 15) === 'error-severity=') {
+                    $this->errorSeverity = (int) substr($arg, 15);
+                    $this->overriddenDefaults['errorSeverity'] = true;
+                } else if (substr($arg, 0, 17) === 'warning-severity=') {
+                    $this->warningSeverity = (int) substr($arg, 17);
+                    $this->overriddenDefaults['warningSeverity'] = true;
+                } else if (substr($arg, 0, 7) === 'ignore=') {
+                    // Split the ignore string on commas, unless the comma is escaped
+                    // using 1 or 3 slashes (\, or \\\,).
+                    $patterns = preg_split(
+                        '/(?<=(?<!\\\\)\\\\\\\\),|(?<!\\\\),/',
+                        substr($arg, 7)
+                    );
+
+                    $ignored = array();
+                    foreach ($patterns as $pattern) {
+                        $pattern = trim($pattern);
+                        if ($pattern === '') {
+                            continue;
+                        }
 
-                $this->extensions = $newExtensions;
-                $this->overriddenDefaults['extensions'] = true;
-            } else if (substr($arg, 0, 7) === 'suffix=') {
-                $this->suffix = explode(',', substr($arg, 7));
-                $this->overriddenDefaults['suffix'] = true;
-            } else if (substr($arg, 0, 9) === 'severity=') {
-                $this->errorSeverity   = (int) substr($arg, 9);
-                $this->warningSeverity = $this->errorSeverity;
-                $this->overriddenDefaults['errorSeverity']   = true;
-                $this->overriddenDefaults['warningSeverity'] = true;
-            } else if (substr($arg, 0, 15) === 'error-severity=') {
-                $this->errorSeverity = (int) substr($arg, 15);
-                $this->overriddenDefaults['errorSeverity'] = true;
-            } else if (substr($arg, 0, 17) === 'warning-severity=') {
-                $this->warningSeverity = (int) substr($arg, 17);
-                $this->overriddenDefaults['warningSeverity'] = true;
-            } else if (substr($arg, 0, 7) === 'ignore=') {
-                // Split the ignore string on commas, unless the comma is escaped
-                // using 1 or 3 slashes (\, or \\\,).
-                $patterns = preg_split(
-                    '/(?<=(?<!\\\\)\\\\\\\\),|(?<!\\\\),/',
-                    substr($arg, 7)
-                );
-
-                $ignored = array();
-                foreach ($patterns as $pattern) {
-                    $pattern = trim($pattern);
-                    if ($pattern === '') {
-                        continue;
+                        $ignored[$pattern] = 'absolute';
                     }
 
-                    $ignored[$pattern] = 'absolute';
-                }
-
-                $this->ignored = $ignored;
-                $this->overriddenDefaults['ignored'] = true;
-            } else if (substr($arg, 0, 10) === 'tab-width=') {
-                $this->tabWidth = (int) substr($arg, 10);
-                $this->overriddenDefaults['tabWidth'] = true;
-            } else {
-                if ($this->dieOnUnknownArg === false) {
-                    $eqPos = strpos($arg, '=');
-                    if ($eqPos === false) {
-                        $this->values[$arg] = $arg;
+                    $this->ignored = $ignored;
+                    $this->overriddenDefaults['ignored'] = true;
+                } else if (substr($arg, 0, 10) === 'tab-width=') {
+                    $this->tabWidth = (int) substr($arg, 10);
+                    $this->overriddenDefaults['tabWidth'] = true;
+                } else {
+                    if ($this->dieOnUnknownArg === false) {
+                        $eqPos = strpos($arg, '=');
+                        if ($eqPos === false) {
+                            $this->values[$arg] = $arg;
+                        } else {
+                            $value = substr($arg, ($eqPos + 1));
+                            $arg   = substr($arg, 0, $eqPos);
+                            $this->values[$arg] = $value;
+                        }
                     } else {
-                        $value = substr($arg, ($eqPos + 1));
-                        $arg   = substr($arg, 0, $eqPos);
-                        $this->values[$arg] = $value;
+                        $this->processUnknownArgument('--'.$arg, $pos);
                     }
-                } else {
-                    $this->processUnknownArgument('--'.$arg, $pos);
-                }
-            }//end if
+                }//end if
 
-            break;
+                break;
         }//end switch
 
     }//end processLongArgument()

src/Runner.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
         // Other report formats don't really make sense in interactive mode
         // so we hard-code the full report here and when outputting.
         if ($this->config->interactive === true) {
-            $this->config->reports  = array('full' => null);
+            $this->config->reports = array('full' => null);
         }
 
         // Disable caching if we are processing STDIN as we can't be 100%