Fix possible errors

Author: iMattPro

src/Files/Line.php

@@ -12,9 +12,9 @@
 
 class Line implements LineInterface
 {
-	private $file;
-	private $lineNr;
-	private $line;
+	private FileInterface $file;
+	private int $lineNr;
+	private string $line;
 
 	/**
 	 * @param FileInterface $file
@@ -32,7 +32,7 @@ public function __construct(FileInterface $file, $lineNr, $line)
 	 * Get the file for this specific line.
 	 * @return FileInterface
 	 */
-	public function getFile()
+	public function getFile(): FileInterface
 	{
 		return $this->file;
 	}
@@ -41,7 +41,7 @@ public function getFile()
 	 * Get the line number.
 	 * @return int
 	 */
-	public function getLineNr()
+	public function getLineNr(): int
 	{
 		return $this->lineNr;
 	}
@@ -50,8 +50,8 @@ public function getLineNr()
 	 * Get the actual code for this line.
 	 * @return string
 	 */
-	public function getLine()
+	public function getLine(): string
 	{
-		return $this->getLine();
+		return $this->line;
 	}
 }

src/Files/Type/YmlFile.php

@@ -41,6 +41,7 @@ public function __construct($debug, $filename, $rundir)
 				$currentPathInfo = pathinfo($filename);
 				$dirname = $currentPathInfo['dirname'];
 
+				$imports = array();
 				foreach ($content['imports'] as $import)
 				{
 					if (isset($import['resource']))
@@ -58,11 +59,16 @@ public function __construct($debug, $filename, $rundir)
 							$extraContent = array();
 						}
 
-						// Imports are at the top of the yaml file, so these should be loaded first.
-						// The values of the current yaml file will overwrite existing array values of the imports.
-						$content = array_replace_recursive($extraContent, $content);
+						// Collect all imports
+						$imports[] = $extraContent;
 					}
 				}
+
+				// Imports are at the top of the yaml file, so these should be loaded first.
+				// The values of the current yaml file will overwrite existing array values of the imports.
+				// Merge all imports and content in a single operation
+				$imports[] = $content;
+				$content = array_replace_recursive(...$imports);
 			}
 			$this->yamlFile = $content;
 		}

src/Tests/TestStartup.php

@@ -83,7 +83,7 @@ private function initGit($git, $branch)
 
 		$this->output->writeln(sprintf("Checkout %s from git on branch %s.", $git, $branch));
 		$tmpdir = sys_get_temp_dir();
-		$uniq   = $tmpdir . DIRECTORY_SEPARATOR . uniqid();
+		$uniq   = $tmpdir . DIRECTORY_SEPARATOR . uniqid('', true);
 
 		@mkdir($uniq);
 

src/Tests/Tests/epv_test_validate_languages.php

@@ -68,7 +68,7 @@ public function validateDirectory(array $files)
 
 		foreach ($files as $file)
 		{
-			if (preg_match('#^' . preg_quote($this->basedir) . 'language[\/\\\\]([a-z_]+?)[\/\\\\](.+\.php)$#', $file, $matches) === 1)
+			if (preg_match('#^' . preg_quote($this->basedir, '/') . 'language[\/\\\\]([a-z_]+?)[\/\\\\](.+\.php)$#', $file, $matches) === 1)
 			{
 				$language = $matches[1]; // language, e.g. "en"
 				$relative_filename = $matches[2]; // file name relative to language's base dir, e.g. "info_acp_ext.php"