Aug 12, 2024 · Aug 21, 2024 · Aug 25, 2024 · Aug 21, 2024
diff --git a/extension.neon b/extension.neon
diff --git a/src/Rules/Symfony/TwigTemplateExistsRule.php b/src/Rules/Symfony/TwigTemplateExistsRule.php
diff --git a/tests/Rules/Symfony/ExampleTwigController.php b/tests/Rules/Symfony/ExampleTwigController.php
diff --git a/tests/Rules/Symfony/TwigTemplateExistsRuleMoreTemplatesTest.php b/tests/Rules/Symfony/TwigTemplateExistsRuleMoreTemplatesTest.php
diff --git a/tests/Rules/Symfony/TwigTemplateExistsRuleTest.php b/tests/Rules/Symfony/TwigTemplateExistsRuleTest.php
diff --git a/tests/Rules/Symfony/data/bar.html.twig → ...ules/Symfony/twig/admin/backend.html.twig b/tests/Rules/Symfony/data/bar.html.twig → ...ules/Symfony/twig/admin/backend.html.twig
diff --git a/tests/Rules/Symfony/templates/foo.html.twig → ...ules/Symfony/twig/templates/foo.html.twig b/tests/Rules/Symfony/templates/foo.html.twig → ...ules/Symfony/twig/templates/foo.html.twig
diff --git a/tests/Rules/Symfony/twig/user/bar.html.twig b/tests/Rules/Symfony/twig/user/bar.html.twig
Original file line number	Diff line number	Diff line change
Expand Up		@@ -116,7 +116,7 @@ parametersSchema:
		constantHassers: bool()
		console_application_loader: schema(string(), nullable())
zacharylund marked this conversation as resolved. Show resolved Hide resolved
		consoleApplicationLoader: schema(string(), nullable())
	twigTemplateDirectories: listOf(string())
	twigTemplateDirectories: arrayOf(schema(string(), nullable()))
		])

		services:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,7 @@
		use function file_exists;
		use function in_array;
		use function is_string;
	use function preg_match;
		use function sprintf;

		/**
Expand All		@@ -24,10 +25,10 @@
		final class TwigTemplateExistsRule implements Rule
		{

	/** @var list<string> */
	/** @var array<string, string\|null> */
		private $twigTemplateDirectories;

	/** @param list<string> $twigTemplateDirectories */
	/** @param array<string, string\|null> $twigTemplateDirectories */
		public function __construct(array $twigTemplateDirectories)
		{
		$this->twigTemplateDirectories = $twigTemplateDirectories;
Expand Down Expand Up		@@ -108,7 +109,18 @@ private function getTwigTemplateArg(MethodCall $node, Scope $scope): ?Arg

		private function twigTemplateExists(string $templateName): bool
		{
	foreach ($this->twigTemplateDirectories as $twigTemplateDirectory) {
	if (preg_match('#^@(.+)\/(.+)$#', $templateName, $matches) === 1) {
	$templateNamespace = $matches[1];
	$templateName = $matches[2];
	} else {
	$templateNamespace = null;
	}

	foreach ($this->twigTemplateDirectories as $twigTemplateDirectory => $namespace) {
	if ($namespace !== $templateNamespace) {
	continue;
	}

		$templatePath = $twigTemplateDirectory . '/' . $templateName;

		if (file_exists($templatePath)) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,6 +61,10 @@ public function foo(): void
		$this->render($name);

		$this->render($this->getName());

	$this->render('@admin/backend.html.twig');
	$this->render('@admin/foo.html.twig');
	$this->render('backend.html.twig');
		}

		private function getName(): string
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,8 +14,9 @@ final class TwigTemplateExistsRuleMoreTemplatesTest extends RuleTestCase
		protected function getRule(): Rule
		{
		return new TwigTemplateExistsRule([
	__DIR__ . '/data',
	__DIR__ . '/templates',
	__DIR__ . '/twig/templates' => null,
	__DIR__ . '/twig/admin' => 'admin',
	__DIR__ . '/twig/user' => null,
		]);
		}

Expand All		@@ -30,6 +31,14 @@ public function testGetArgument(): void
		'Twig template "baz.html.twig" does not exist.',
		61,
		],
	[
	'Twig template "@admin/foo.html.twig" does not exist.',
	66,
	],
	[
	'Twig template "backend.html.twig" does not exist.',
	67,
	],
		]
		);
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,7 +13,10 @@ final class TwigTemplateExistsRuleTest extends RuleTestCase

		protected function getRule(): Rule
		{
	return new TwigTemplateExistsRule([__DIR__ . '/templates']);
	return new TwigTemplateExistsRule([
	__DIR__ . '/twig/templates' => null,
	__DIR__ . '/twig/admin' => 'admin',
	]);
		}

		public function testGetArgument(): void
Expand Down Expand Up		@@ -83,6 +86,14 @@ public function testGetArgument(): void
		'Twig template "baz.html.twig" does not exist.',
		61,
		],
	[
	'Twig template "@admin/foo.html.twig" does not exist.',
	66,
	],
	[
	'Twig template "backend.html.twig" does not exist.',
	67,
	],
		]
		);
		}
Expand Down