Tasks: Php - fixed strictTypesDeclarationFixer()

janpecha · Dec 14, 2023 · 67d71ae · 67d71ae
1 parent e77e974
commit 67d71ae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Tasks/Php.php b/src/Tasks/Php.php
@@ -37,7 +37,7 @@ public static function strictTypesDeclarationFixer(string &$contents, \Nette\Cod
 		{
 			$declarations = Utils\PhpCode::getDeclarations($contents);
 
-			if (!preg_match('#\bstrict_types\s*=\s*1\b#', implode('', $declarations))) {
+			if (!preg_match('#\bstrict_types\s*=\s*1\b#', implode("\n", $declarations))) {
 				if (str_starts_with($contents, '<?php')) {
 					$result->fix('Added missing declare(strict_types=1)');
 					$indent = Utils\FileContent::detectIndentation($contents);

diff --git a/tests/CodeChecker/Tasks/Php.strictTypesDeclarationFixer.phpt b/tests/CodeChecker/Tasks/Php.strictTypesDeclarationFixer.phpt
@@ -56,3 +56,16 @@ test('Fix no indentation', function () {
 		"\t\tnamespace Foo;",
 	]), $content);
 });
+
+
+test('Multiple declares (invalid)', function () {
+	$result = new Result;
+	$content = implode("\n", [
+		'<?php',
+		'declare(strict_types=1);',
+		'declare(strict_types=1);',
+		"\t\tnamespace Foo;",
+	]);
+	Tasks\Php::strictTypesDeclarationFixer($content, $result);
+	Assert::same([], $result->getMessages());
+});