Merge pull request #1244 from PHPCSStandards/phpcs-4.x/feature/155-normalize-some-code-style-rules-6

CS: normalize code style rules [6]

Author: jrfnl

autoload.php

@@ -92,7 +92,7 @@ public static function load(string $className)
                 } else {
                     self::$composerAutoloader = false;
                 }
-            }//end if
+            }
 
             $ds   = DIRECTORY_SEPARATOR;
             $path = false;
@@ -332,4 +332,4 @@ public static function getLoadedFiles()
     // it gets a chance to hear about every autoload request, and record
     // the file and class name for it.
     spl_autoload_register(__NAMESPACE__ . '\Autoload::load', true, true);
-}//end if
+}

phpcs.xml.dist

@@ -44,7 +44,6 @@
     <rule ref="Squiz.Commenting.DocCommentAlignment"/>
     <rule ref="Squiz.Commenting.EmptyCatchComment"/>
     <rule ref="Squiz.Commenting.InlineComment"/>
-    <rule ref="Squiz.Commenting.LongConditionClosingComment"/>
     <rule ref="Squiz.Commenting.PostStatementComment">
         <exclude name="Squiz.Commenting.PostStatementComment.AnnotationFound"/>
     </rule>

scripts/BuildRequirementsCheckMatrix.php

@@ -174,8 +174,8 @@ private function getMissingExtensionsBuilds()
                         ];
                     }
                 }
-            }//end foreach
-        }//end foreach
+            }
+        }
 
         return $builds;
     }

scripts/build-phar.php

@@ -136,7 +136,7 @@ function stripWhitespaceAndComments(string $fullpath, Config $config)
         }
 
         ++$fileCount;
-    }//end foreach
+    }
 
     // Add requirements check.
     $phar->addFromString('requirements.php', stripWhitespaceAndComments(realpath(__DIR__ . '/../requirements.php'), $config));
@@ -168,7 +168,7 @@ function stripWhitespaceAndComments(string $fullpath, Config $config)
     $phar->setStub($stub);
 
     echo 'done' . PHP_EOL;
-}//end foreach
+}
 
 Timing::printRunTime();
 

src/Config.php

@@ -344,7 +344,7 @@ public function __set(string $name, $value)
         default :
             // No validation required.
             break;
-        }//end switch
+        }
 
         $this->settings[$name] = $value;
     }
@@ -444,7 +444,7 @@ public function __construct(array $cliArgs = [], bool $dieOnUnknownArg = true)
                 $lastDir    = $currentDir;
                 $currentDir = dirname($currentDir);
             } while ($currentDir !== '.' && $currentDir !== $lastDir && Common::isReadable($currentDir) === true);
-        }//end if
+        }
 
         if (defined('STDIN') === false
             || PHP_OS_FAMILY === 'Windows'
@@ -478,7 +478,7 @@ public function __construct(array $cliArgs = [], bool $dieOnUnknownArg = true)
                 $this->overriddenDefaults['stdin']        = true;
                 $this->overriddenDefaults['stdinContent'] = true;
             }
-        }//end if
+        }
 
         fclose($handle);
     }
@@ -529,8 +529,8 @@ public function setCommandLineValues(array $args)
                 }
             } else {
                 $this->processUnknownArgument($arg, $i);
-            }//end if
-        }//end for
+            }
+        }
     }
 
 
@@ -764,7 +764,7 @@ public function processShortArgument(string $arg, int $pos)
             } else {
                 $this->processUnknownArgument('-' . $arg, $pos);
             }
-        }//end switch
+        }
     }
 
 
@@ -958,7 +958,7 @@ public function processLongArgument(string $arg, int $pos)
                             $this->cacheFile = $dir . '/' . basename($this->cacheFile);
                         }
                     }
-                }//end if
+                }
 
                 $this->overriddenDefaults['cacheFile'] = true;
 
@@ -1035,7 +1035,7 @@ public function processLongArgument(string $arg, int $pos)
                     }
 
                     $this->reportFile = $dir . '/' . basename($this->reportFile);
-                }//end if
+                }
 
                 $this->overriddenDefaults['reportFile'] = true;
 
@@ -1106,8 +1106,8 @@ public function processLongArgument(string $arg, int $pos)
                                 $error .= $this->printShortUsage(true);
                                 throw new DeepExitException($error, ExitCode::PROCESS_ERROR);
                             }
-                        }//end if
-                    }//end if
+                        }
+                    }
 
                     $reports[$report] = $output;
                 } else {
@@ -1120,7 +1120,7 @@ public function processLongArgument(string $arg, int $pos)
                     foreach ($reportNames as $report) {
                         $reports[$report] = null;
                     }
-                }//end if
+                }
 
                 // Remove the default value so the CLI value overrides it.
                 if (isset($this->overriddenDefaults['reports']) === false) {
@@ -1293,9 +1293,9 @@ public function processLongArgument(string $arg, int $pos)
                 } else {
                     $this->processUnknownArgument('--' . $arg, $pos);
                 }
-            }//end if
+            }
             break;
-        }//end switch
+        }
     }
 
 
@@ -1343,7 +1343,7 @@ private function parseSniffCodes(string $input, string $argument)
                 $parts    = explode('.', $sniff, 4);
                 $sniffs[] = $parts[0] . '.' . $parts[1] . '.' . $parts[2];
             }
-        }//end foreach
+        }
 
         $sniffs = array_reduce(
             $sniffs,
@@ -1639,7 +1639,7 @@ public function setConfigData(string $key, ?string $value, bool $temp = false)
                 $error = 'ERROR: Config file ' . $configFile . ' is not writable' . PHP_EOL . PHP_EOL;
                 throw new DeepExitException($error, ExitCode::PROCESS_ERROR);
             }
-        }//end if
+        }
 
         $phpCodeSnifferConfig = self::getAllConfigData();