Fix additional code issues with high warnings

iMattPro · iMattPro · commit e1e1dddf634b · 2025-12-11T11:21:26.000-08:00
diff --git a/src/Command/ValidateCommand.php b/src/Command/ValidateCommand.php
@@ -18,10 +18,8 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-
 class ValidateCommand extends Command
 {
-
 	protected function configure(): void
 	{
 		$this
@@ -36,6 +34,11 @@ protected function configure(): void
 			->addOption('debug', null, InputOption::VALUE_NONE, "Run in debug");
 	}
 
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @throws TestException
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$dir    = $input->getOption("dir");
diff --git a/src/Events/php_exporter.php b/src/Events/php_exporter.php
@@ -72,7 +72,7 @@ public function get_events()
 	 * @param string $name Name of the current event (used for error messages)
 	 * @param int    $line Line where the current event is placed in
 	 *
-	 * @return null
+	 * @return void
 	 */
 	public function set_current_event($name, $line)
 	{
@@ -85,7 +85,7 @@ public function set_current_event($name, $line)
 	 *
 	 * @param array $content Array with the lines of the file
 	 *
-	 * @return null
+	 * @return void
 	 */
 	public function set_content($content)
 	{
@@ -109,10 +109,9 @@ public function crawl_php_file($file)
 		if (strpos($content, "dispatcher->trigger_event('") || strpos($content, "dispatcher->dispatch('"))
 		{
 			$this->set_content(explode("\n", $content));
-			for ($i = 0, $num_lines = count($this->file_lines); $i < $num_lines; $i++)
-			{
+			foreach ($this->file_lines as $i => $file_line) {
 				$event_line          = false;
-				$found_trigger_event = strpos($this->file_lines[$i], "dispatcher->trigger_event('");
+				$found_trigger_event = strpos($file_line, "dispatcher->trigger_event('");
 				$arguments           = array();
 				if ($found_trigger_event !== false)
 				{
@@ -129,7 +128,7 @@ public function crawl_php_file($file)
 				}
 				else
 				{
-					$found_dispatch = strpos($this->file_lines[$i], "dispatcher->dispatch('");
+					$found_dispatch = strpos($file_line, "dispatcher->dispatch('");
 					if ($found_dispatch !== false)
 					{
 						$event_line = $i;
@@ -288,10 +287,8 @@ public function get_vars_from_single_line_array($line, $throw_multiline = true)
 
 			return $vars_array;
 		}
-		else
-		{
-			throw new \LogicException("Can not find '\$vars = array();'-line for event '{$this->current_event}' in file '{$this->current_clean_file}:{$this->current_event_line}'. Are you using UNIX style linefeed?", 1);
-		}
+
+		throw new \LogicException("Can not find '\$vars = array();'-line for event '{$this->current_event}' in file '{$this->current_clean_file}:{$this->current_event_line}'. Are you using UNIX style linefeed?", 1);
 	}
 
 	/**
@@ -540,7 +537,7 @@ public function validate_event($event_name, $line)
 	 * @param array $vars_array    Variables found in the array line
 	 * @param array $vars_docblock Variables found in the doc block
 	 *
-	 * @return null
+	 * @return void
 	 * @throws \LogicException
 	 */
 	public function validate_vars_docblock_array($vars_array, $vars_docblock)
diff --git a/src/Files/FileLoader.php b/src/Files/FileLoader.php
@@ -80,7 +80,7 @@ public function loadFile($fileName)
 			else if ($size > 1)
 			{
 				// Try to load the file, the last part of $split contains the extension
-				$file = self::tryLoadFile($fileName, $split[count($split) - 1]);
+				$file = $this->tryLoadFile($fileName, $split[count($split) - 1]);
 			}
 			else // Blank filename?
 			{
@@ -105,7 +105,7 @@ public function loadFile($fileName)
 	 * @param $fileName
 	 * @param $extension
 	 *
-	 * @return BinaryFile|ComposerFile|CssFile|HTMLFile|JavascriptFile|JsonFile|PHPFile|PlainFile|XmlFile|YmlFile|ImageFile|null
+	 * @return BinaryFile|ComposerFile|CssFile|HTMLFile|JavascriptFile|JsonFile|LangFile|LockFile|MigrationFile|PHPFile|PlainFile|XmlFile|YmlFile|ImageFile|null
 	 */
 	private function tryLoadFile($fileName, $extension)
 	{
@@ -117,9 +117,7 @@ private function tryLoadFile($fileName, $extension)
 			case 'php':
 				// First, check if this file is a lang file.
 				$file = basename($fileName);
-				$dir  = str_replace($file, '', $fileName);
-				$dir  = str_replace($this->basedir, '', $dir);
-				$dir  = str_replace('\\', '/', $dir);
+				$dir  = str_replace(array($file, $this->basedir, '\\'), array('', '', '/'), $fileName);
 				$dir  = explode('/', trim($dir, '/'));
 				$dir  = array_map('strtolower', $dir);
 
@@ -140,21 +138,19 @@ private function tryLoadFile($fileName, $extension)
 				return new HTMLFile($this->debug, $fileName, $this->rundir);
 
 			case 'json':
-				if (strtolower(basename($fileName)) == 'composer.json')
+				if (strtolower(basename($fileName)) === 'composer.json')
 				{
 					return new ComposerFile($this->debug, $fileName, $this->rundir);
 				}
-				else
-				{
-					return new JsonFile($this->debug, $fileName, $this->rundir);
-				}
+
+				return new JsonFile($this->debug, $fileName, $this->rundir);
 
 			case 'yml':
-				if (strtolower(basename($fileName)) == 'services.yml')
+				if (strtolower(basename($fileName)) === 'services.yml')
 				{
 					return new ServiceFile($this->debug, $fileName, $this->rundir);
 				}
-				if (strtolower(basename($fileName)) == 'routing.yml')
+				if (strtolower(basename($fileName)) === 'routing.yml')
 				{
 					return new RoutingFile($this->debug, $fileName, $this->rundir);
 				}
diff --git a/src/Files/Type/YmlFile.php b/src/Files/Type/YmlFile.php
@@ -19,7 +19,7 @@
 class YmlFile extends BaseFile implements YmlFileInterface
 {
 	/** @var array */
-	protected $yamlFile;
+	protected mixed $yamlFile;
 
 	public function __construct($debug, $filename, $rundir)
 	{
@@ -92,7 +92,7 @@ public function getYaml(): array
 	 * Get the file type for the specific file.
 	 * @return int
 	 */
-	function getFileType(): int
+	public function getFileType(): int
 	{
 		return Type::TYPE_YML;
 	}
diff --git a/src/Output/Message.php b/src/Output/Message.php
@@ -44,15 +44,15 @@ public function __toString()
 
 		switch ($this->type)
 		{
-			case Output::NOTICE:
+			case OutputInterface::NOTICE:
 				return "<noticeb>Notice:</noticeb><notice> $this->message{$file}</notice>";
-			case Output::WARNING:
+			case OutputInterface::WARNING:
 				return "<warningb>Warning:</warningb><warning> $this->message{$file}</warning>";
-			case Output::ERROR:
+			case OutputInterface::ERROR:
 				return "<errorb>Error:</errorb><error> $this->message{$file}</error>";
-			case Output::FATAL:
+			case OutputInterface::FATAL:
 				return "<fatalb>Fatal error:</fatalb><fatal> $this->message{$file}</fatal>";
-			case Output::DEBUG:
+			case OutputInterface::DEBUG:
 				return $this->message;
 		}
 	}
diff --git a/src/Tests/BaseTest.php b/src/Tests/BaseTest.php
@@ -96,12 +96,12 @@ public function validateFile(FileInterface $file)
 	}
 
 	/**
-	 * @param array $dirList
+	 * @param array $dirListing
 	 *
 	 * @return mixed|void
 	 * @throws Exception\TestException
 	 */
-	public function validateDirectory(array $dirList)
+	public function validateDirectory(array $dirListing)
 	{
 		throw new TestException("Test declared to be a directory listing test, but doesn't implement validateDirectory.");
 	}
@@ -151,9 +151,7 @@ private function boolToLang($bool)
 	 */
 	public function __toString()
 	{
-		$string = 'Test: ' . $this->testName() . '. ';
-
-		return $string;
+		return 'Test: ' . $this->testName() . '. ';
 	}
 
 	/**
@@ -173,6 +171,6 @@ protected function isTest(?FileInterface $file = null)
 		$dir = str_replace($this->basedir, '', $file->getFilename());
 		$dir = explode("/", $dir);
 
-		return ($dir[0] == 'test' || $dir[0] == 'tests') && $dir[1] != 'testFiles';
+		return ($dir[0] === 'test' || $dir[0] === 'tests') && $dir[1] !== 'testFiles';
 	}
 }
diff --git a/src/Tests/TestStartup.php b/src/Tests/TestStartup.php
@@ -199,9 +199,9 @@ private function rrmdir($dir)
 
 			foreach ($objects as $object)
 			{
-				if ($object != "." && $object != "..")
+				if ($object !== "." && $object !== "..")
 				{
-					if (filetype($dir . "/" . $object) == "dir")
+					if (filetype($dir . "/" . $object) === "dir")
 					{
 						$this->rrmdir($dir . "/" . $object);
 					}
diff --git a/src/Tests/Tests/epv_test_validate_directory_structure.php b/src/Tests/Tests/epv_test_validate_directory_structure.php
@@ -29,13 +29,13 @@ public function __construct($debug, OutputInterface $output, $basedir, $namespac
         $this->directory = true;
     }
 
-	public function validateDirectory(array $dirList, $validateLicenseContents = true)
+	public function validateDirectory(array $dirListing, $validateLicenseContents = true)
 	{
 		$files = array(
 			'license'  => false,
 			'composer' => false,
 		);
-		foreach ($dirList as $dir)
+		foreach ($dirListing as $dir)
 		{
 			switch (strtolower(basename($dir)))
 			{
@@ -72,11 +72,9 @@ public function validateDirectory(array $dirList, $validateLicenseContents = tru
 					{
 						$this->output->addMessage(Output::WARNING, 'The name of composer.json should be completely lowercase.');
 					}
-					$sp    = str_replace('\\', '/', $dir);
-					$sp    = str_replace(str_replace('\\', '/', $this->opendir), '', $sp);
-					$sp    = str_replace('/composer.json', '', $sp);
+					$sp    = str_replace(array('\\', str_replace('\\', '/', $this->opendir), '/composer.json'), array('/', '', ''), $dir);
 
-					if (!empty($sp) && $sp[0] == '/')
+					if (!empty($sp) && $sp[0] === '/')
 					{
 						// for some reason, there is a extra / on at least OS X
 						$sp = substr($sp, 1, strlen($sp));
diff --git a/src/Tests/Tests/epv_test_validate_event_names.php b/src/Tests/Tests/epv_test_validate_event_names.php
@@ -23,11 +23,11 @@ public function __construct($debug, OutputInterface $output, $basedir, $namespac
 		$this->directory = true;
 	}
 
-	public function validateDirectory(array $dirList)
+	public function validateDirectory(array $dirListing)
 	{
 		$exporter = new php_exporter($this->output, $this->opendir);
 
-		foreach ($dirList as $file)
+		foreach ($dirListing as $file)
 		{
 			try
 			{
diff --git a/src/Tests/Tests/epv_test_validate_languages.php b/src/Tests/Tests/epv_test_validate_languages.php
@@ -56,17 +56,17 @@ public function __construct($debug, OutputInterface $output, $basedir, $namespac
 	}
 
 	/**
-	 * @param array $files
+	 * @param array $dirListing
 	 *
 	 * @return void
 	 */
-	public function validateDirectory(array $files)
+	public function validateDirectory(array $dirListing)
 	{
 		$langs = [];
 		$expected_keys = [];
 		$expected_files = [];
 
-		foreach ($files as $file)
+		foreach ($dirListing as $file)
 		{
 			if (preg_match('#^' . preg_quote($this->basedir, '/') . 'language[\/\\\\]([a-z_]+?)[\/\\\\](.+\.php)$#', $file, $matches) === 1)
 			{
diff --git a/src/Tests/Tests/epv_test_validate_linefeeds.php b/src/Tests/Tests/epv_test_validate_linefeeds.php
@@ -53,14 +53,14 @@ public function validateFile(FileInterface $file)
 		$eola = array_keys($eols, max($eols));
 		$eol = implode("", $eola);
 
-		if ($eol == "\n") {
+		if ($eol === "\n") {
 			// Everything is good to go
 			return;
 		}
-		if ($eol == "\r\n") {
+		if ($eol === "\r\n") {
 			$this->addMessage(Output::FATAL, "Detected windows style newlines instead of UNIX newlines");
 		}
-		if ($eol == "\r") {
+		if ($eol === "\r") {
 			$this->addMessage(Output::FATAL, "Detected carriage return instead of UNIX newlines");
 		}
 	}
diff --git a/src/Tests/Tests/epv_test_validate_php_functions.php b/src/Tests/Tests/epv_test_validate_php_functions.php
@@ -492,7 +492,7 @@ private function getMethodName(Node $node)
      */
 	private function validateEnableGlobals($name, Node $node)
 	{
-		if ($name == 'enable_super_globals')
+		if ($name === 'enable_super_globals')
 		{
 			$this->addMessage(Output::FATAL, sprintf('The use of enable_super_globals() is not allowed for security reasons on line %s', $node->getAttribute('startLine')));
 		}
diff --git a/src/Tests/Tests/epv_test_validate_routing.php b/src/Tests/Tests/epv_test_validate_routing.php
@@ -66,11 +66,11 @@ private function validateRoutingName($route, RoutingFileInterface $file)
 	{
 		$vendor = str_replace('/', '_', $this->namespace);
 
-		if (strtolower(substr($route, 0, 6)) == 'phpbb.')
+		if (strtolower(substr($route, 0, 6)) === 'phpbb.')
 		{
 			$this->output->addMessage(Output::ERROR, sprintf('The phpbb vendorname should only be used for official extensions in route names in %s. Current service name: %s', $file->getSaveFilename(), $route));
 		}
-		else if (strtolower(substr($route, 0, 5)) == 'core.')
+		else if (strtolower(substr($route, 0, 5)) === 'core.')
 		{
 			$this->output->addMessage(Output::FATAL, sprintf('The core vendorname should not be used in route names in %s. Current route name: %s', $file->getSaveFilename(), $route));
 		}

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,8 @@`
`18`	`18`	`use Symfony\Component\Console\Input\InputOption;`
`19`	`19`	`use Symfony\Component\Console\Output\OutputInterface;`
`20`	`20`
`21`		`-`
`22`	`21`	`class ValidateCommand extends Command`
`23`	`22`	`{`
`24`		`-`
`25`	`23`	`protected function configure(): void`
`26`	`24`	`{`
`27`	`25`	`$this`
`@@ -36,6 +34,11 @@ protected function configure(): void`
`36`	`34`	`->addOption('debug', null, InputOption::VALUE_NONE, "Run in debug");`
`37`	`35`	`}`
`38`	`36`
	`37`	`+ /**`
	`38`	`+ * {@inheritDoc}`
	`39`	`+ *`
	`40`	`+ * @throws TestException`
	`41`	`+ */`
`39`	`42`	`protected function execute(InputInterface $input, OutputInterface $output): int`
`40`	`43`	`{`
`41`	`44`	`$dir = $input->getOption("dir");`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function get_events()`
`72`	`72`	`* @param string $name Name of the current event (used for error messages)`
`73`	`73`	`* @param int $line Line where the current event is placed in`
`74`	`74`	`*`
`75`		`- * @return null`
	`75`	`+ * @return void`
`76`	`76`	`*/`
`77`	`77`	`public function set_current_event($name, $line)`
`78`	`78`	`{`
`@@ -85,7 +85,7 @@ public function set_current_event($name, $line)`
`85`	`85`	`*`
`86`	`86`	`* @param array $content Array with the lines of the file`
`87`	`87`	`*`
`88`		`- * @return null`
	`88`	`+ * @return void`
`89`	`89`	`*/`
`90`	`90`	`public function set_content($content)`
`91`	`91`	`{`
`@@ -109,10 +109,9 @@ public function crawl_php_file($file)`
`109`	`109`	`if (strpos($content, "dispatcher->trigger_event('") \|\| strpos($content, "dispatcher->dispatch('"))`
`110`	`110`	`{`
`111`	`111`	`$this->set_content(explode("\n", $content));`
`112`		`- for ($i = 0, $num_lines = count($this->file_lines); $i < $num_lines; $i++)`
`113`		`- {`
	`112`	`+ foreach ($this->file_lines as $i => $file_line) {`
`114`	`113`	`$event_line = false;`
`115`		`- $found_trigger_event = strpos($this->file_lines[$i], "dispatcher->trigger_event('");`
	`114`	`+ $found_trigger_event = strpos($file_line, "dispatcher->trigger_event('");`
`116`	`115`	`$arguments = array();`
`117`	`116`	`if ($found_trigger_event !== false)`
`118`	`117`	`{`
`@@ -129,7 +128,7 @@ public function crawl_php_file($file)`
`129`	`128`	`}`
`130`	`129`	`else`
`131`	`130`	`{`
`132`		`- $found_dispatch = strpos($this->file_lines[$i], "dispatcher->dispatch('");`
	`131`	`+ $found_dispatch = strpos($file_line, "dispatcher->dispatch('");`
`133`	`132`	`if ($found_dispatch !== false)`
`134`	`133`	`{`
`135`	`134`	`$event_line = $i;`
`@@ -288,10 +287,8 @@ public function get_vars_from_single_line_array($line, $throw_multiline = true)`
`288`	`287`
`289`	`288`	`return $vars_array;`
`290`	`289`	`}`
`291`		`- else`
`292`		`- {`
`293`		`- throw new \LogicException("Can not find '\$vars = array();'-line for event '{$this->current_event}' in file '{$this->current_clean_file}:{$this->current_event_line}'. Are you using UNIX style linefeed?", 1);`
`294`		`- }`
	`290`	`+`
	`291`	`+ throw new \LogicException("Can not find '\$vars = array();'-line for event '{$this->current_event}' in file '{$this->current_clean_file}:{$this->current_event_line}'. Are you using UNIX style linefeed?", 1);`
`295`	`292`	`}`
`296`	`293`
`297`	`294`	`/**`
`@@ -540,7 +537,7 @@ public function validate_event($event_name, $line)`
`540`	`537`	`* @param array $vars_array Variables found in the array line`
`541`	`538`	`* @param array $vars_docblock Variables found in the doc block`
`542`	`539`	`*`
`543`		`- * @return null`
	`540`	`+ * @return void`
`544`	`541`	`* @throws \LogicException`
`545`	`542`	`*/`
`546`	`543`	`public function validate_vars_docblock_array($vars_array, $vars_docblock)`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function loadFile($fileName)`
`80`	`80`	`else if ($size > 1)`
`81`	`81`	`{`
`82`	`82`	`// Try to load the file, the last part of $split contains the extension`
`83`		`- $file = self::tryLoadFile($fileName, $split[count($split) - 1]);`
	`83`	`+ $file = $this->tryLoadFile($fileName, $split[count($split) - 1]);`
`84`	`84`	`}`
`85`	`85`	`else // Blank filename?`
`86`	`86`	`{`
`@@ -105,7 +105,7 @@ public function loadFile($fileName)`
`105`	`105`	`* @param $fileName`
`106`	`106`	`* @param $extension`
`107`	`107`	`*`
`108`		`- * @return BinaryFile\|ComposerFile\|CssFile\|HTMLFile\|JavascriptFile\|JsonFile\|PHPFile\|PlainFile\|XmlFile\|YmlFile\|ImageFile\|null`
	`108`	`+ * @return BinaryFile\|ComposerFile\|CssFile\|HTMLFile\|JavascriptFile\|JsonFile\|LangFile\|LockFile\|MigrationFile\|PHPFile\|PlainFile\|XmlFile\|YmlFile\|ImageFile\|null`
`109`	`109`	`*/`
`110`	`110`	`private function tryLoadFile($fileName, $extension)`
`111`	`111`	`{`
`@@ -117,9 +117,7 @@ private function tryLoadFile($fileName, $extension)`
`117`	`117`	`case 'php':`
`118`	`118`	`// First, check if this file is a lang file.`
`119`	`119`	`$file = basename($fileName);`
`120`		`- $dir = str_replace($file, '', $fileName);`
`121`		`- $dir = str_replace($this->basedir, '', $dir);`
`122`		`- $dir = str_replace('\\', '/', $dir);`
	`120`	`+ $dir = str_replace(array($file, $this->basedir, '\\'), array('', '', '/'), $fileName);`
`123`	`121`	`$dir = explode('/', trim($dir, '/'));`
`124`	`122`	`$dir = array_map('strtolower', $dir);`
`125`	`123`
`@@ -140,21 +138,19 @@ private function tryLoadFile($fileName, $extension)`
`140`	`138`	`return new HTMLFile($this->debug, $fileName, $this->rundir);`
`141`	`139`
`142`	`140`	`case 'json':`
`143`		`- if (strtolower(basename($fileName)) == 'composer.json')`
	`141`	`+ if (strtolower(basename($fileName)) === 'composer.json')`
`144`	`142`	`{`
`145`	`143`	`return new ComposerFile($this->debug, $fileName, $this->rundir);`
`146`	`144`	`}`
`147`		`- else`
`148`		`- {`
`149`		`- return new JsonFile($this->debug, $fileName, $this->rundir);`
`150`		`- }`
	`145`	`+`
	`146`	`+ return new JsonFile($this->debug, $fileName, $this->rundir);`
`151`	`147`
`152`	`148`	`case 'yml':`
`153`		`- if (strtolower(basename($fileName)) == 'services.yml')`
	`149`	`+ if (strtolower(basename($fileName)) === 'services.yml')`
`154`	`150`	`{`
`155`	`151`	`return new ServiceFile($this->debug, $fileName, $this->rundir);`
`156`	`152`	`}`
`157`		`- if (strtolower(basename($fileName)) == 'routing.yml')`
	`153`	`+ if (strtolower(basename($fileName)) === 'routing.yml')`
`158`	`154`	`{`
`159`	`155`	`return new RoutingFile($this->debug, $fileName, $this->rundir);`
`160`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`class YmlFile extends BaseFile implements YmlFileInterface`
`20`	`20`	`{`
`21`	`21`	`/** @var array */`
`22`		`- protected $yamlFile;`
	`22`	`+ protected mixed $yamlFile;`
`23`	`23`
`24`	`24`	`public function __construct($debug, $filename, $rundir)`
`25`	`25`	`{`
`@@ -92,7 +92,7 @@ public function getYaml(): array`
`92`	`92`	`* Get the file type for the specific file.`
`93`	`93`	`* @return int`
`94`	`94`	`*/`
`95`		`- function getFileType(): int`
	`95`	`+ public function getFileType(): int`
`96`	`96`	`{`
`97`	`97`	`return Type::TYPE_YML;`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,12 +96,12 @@ public function validateFile(FileInterface $file)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`
`99`		`- * @param array $dirList`
	`99`	`+ * @param array $dirListing`
`100`	`100`	`*`
`101`	`101`	`* @return mixed\|void`
`102`	`102`	`* @throws Exception\TestException`
`103`	`103`	`*/`
`104`		`- public function validateDirectory(array $dirList)`
	`104`	`+ public function validateDirectory(array $dirListing)`
`105`	`105`	`{`
`106`	`106`	`throw new TestException("Test declared to be a directory listing test, but doesn't implement validateDirectory.");`
`107`	`107`	`}`
`@@ -151,9 +151,7 @@ private function boolToLang($bool)`
`151`	`151`	`*/`
`152`	`152`	`public function __toString()`
`153`	`153`	`{`
`154`		`- $string = 'Test: ' . $this->testName() . '. ';`
`155`		`-`
`156`		`- return $string;`
	`154`	`+ return 'Test: ' . $this->testName() . '. ';`
`157`	`155`	`}`
`158`	`156`
`159`	`157`	`/**`
`@@ -173,6 +171,6 @@ protected function isTest(?FileInterface $file = null)`
`173`	`171`	`$dir = str_replace($this->basedir, '', $file->getFilename());`
`174`	`172`	`$dir = explode("/", $dir);`
`175`	`173`
`176`		`- return ($dir[0] == 'test' \|\| $dir[0] == 'tests') && $dir[1] != 'testFiles';`
	`174`	`+ return ($dir[0] === 'test' \|\| $dir[0] === 'tests') && $dir[1] !== 'testFiles';`
`177`	`175`	`}`
`178`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -199,9 +199,9 @@ private function rrmdir($dir)`
`199`	`199`
`200`	`200`	`foreach ($objects as $object)`
`201`	`201`	`{`
`202`		`- if ($object != "." && $object != "..")`
	`202`	`+ if ($object !== "." && $object !== "..")`
`203`	`203`	`{`
`204`		`- if (filetype($dir . "/" . $object) == "dir")`
	`204`	`+ if (filetype($dir . "/" . $object) === "dir")`
`205`	`205`	`{`
`206`	`206`	`$this->rrmdir($dir . "/" . $object);`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,13 @@ public function __construct($debug, OutputInterface $output, $basedir, $namespac`
`29`	`29`	`$this->directory = true;`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function validateDirectory(array $dirList, $validateLicenseContents = true)`
	`32`	`+ public function validateDirectory(array $dirListing, $validateLicenseContents = true)`
`33`	`33`	`{`
`34`	`34`	`$files = array(`
`35`	`35`	`'license' => false,`
`36`	`36`	`'composer' => false,`
`37`	`37`	`);`
`38`		`- foreach ($dirList as $dir)`
	`38`	`+ foreach ($dirListing as $dir)`
`39`	`39`	`{`
`40`	`40`	`switch (strtolower(basename($dir)))`
`41`	`41`	`{`
`@@ -72,11 +72,9 @@ public function validateDirectory(array $dirList, $validateLicenseContents = tru`
`72`	`72`	`{`
`73`	`73`	`$this->output->addMessage(Output::WARNING, 'The name of composer.json should be completely lowercase.');`
`74`	`74`	`}`
`75`		`- $sp = str_replace('\\', '/', $dir);`
`76`		`- $sp = str_replace(str_replace('\\', '/', $this->opendir), '', $sp);`
`77`		`- $sp = str_replace('/composer.json', '', $sp);`
	`75`	`+ $sp = str_replace(array('\\', str_replace('\\', '/', $this->opendir), '/composer.json'), array('/', '', ''), $dir);`
`78`	`76`
`79`		`- if (!empty($sp) && $sp[0] == '/')`
	`77`	`+ if (!empty($sp) && $sp[0] === '/')`
`80`	`78`	`{`
`81`	`79`	`// for some reason, there is a extra / on at least OS X`
`82`	`80`	`$sp = substr($sp, 1, strlen($sp));`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,11 @@ public function __construct($debug, OutputInterface $output, $basedir, $namespac`
`23`	`23`	`$this->directory = true;`
`24`	`24`	`}`
`25`	`25`
`26`		`- public function validateDirectory(array $dirList)`
	`26`	`+ public function validateDirectory(array $dirListing)`
`27`	`27`	`{`
`28`	`28`	`$exporter = new php_exporter($this->output, $this->opendir);`
`29`	`29`
`30`		`- foreach ($dirList as $file)`
	`30`	`+ foreach ($dirListing as $file)`
`31`	`31`	`{`
`32`	`32`	`try`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,17 +56,17 @@ public function __construct($debug, OutputInterface $output, $basedir, $namespac`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
`59`		`- * @param array $files`
	`59`	`+ * @param array $dirListing`
`60`	`60`	`*`
`61`	`61`	`* @return void`
`62`	`62`	`*/`
`63`		`- public function validateDirectory(array $files)`
	`63`	`+ public function validateDirectory(array $dirListing)`
`64`	`64`	`{`
`65`	`65`	`$langs = [];`
`66`	`66`	`$expected_keys = [];`
`67`	`67`	`$expected_files = [];`
`68`	`68`
`69`		`- foreach ($files as $file)`
	`69`	`+ foreach ($dirListing as $file)`
`70`	`70`	`{`
`71`	`71`	`if (preg_match('#^' . preg_quote($this->basedir, '/') . 'language[\/\\\\]([a-z_]+?)[\/\\\\](.+\.php)$#', $file, $matches) === 1)`
`72`	`72`	`{`