[TwigBridge] Make LintCommand::$namePatterns private

nicolas-grekas · nicolas-grekas · commit 138f55b48728 · 2022-04-04T20:24:44.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
@@ -39,16 +39,13 @@
 #[AsCommand(name: 'lint:twig', description: 'Lint a Twig template and outputs encountered errors')]
 class LintCommand extends Command
 {
-    protected string|array $namePatterns;
-    private Environment $twig;
     private string $format;
 
-    public function __construct(Environment $twig, string|array $namePatterns = ['*.twig'])
-    {
+    public function __construct(
+        private Environment $twig,
+        private string|array $namePatterns = ['*.twig'],
+    ){ 
         parent::__construct();
-
-        $this->twig = $twig;
-        $this->namePatterns = $namePatterns;
     }
 
     protected function configure()
diff --git a/src/Symfony/Bundle/TwigBundle/Command/LintCommand.php b/src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
@@ -47,9 +47,7 @@ protected function configure()
     protected function findFiles(string $filename): iterable
     {
         if (str_starts_with($filename, '@')) {
-            $dir = $this->getApplication()->getKernel()->locateResource($filename);
-
-            return Finder::create()->files()->in($dir)->name($this->namePatterns);
+            $filename = $this->getApplication()->getKernel()->locateResource($filename);
         }
 
         return parent::findFiles($filename);

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,7 @@ protected function configure()`
`47`	`47`	`protected function findFiles(string $filename): iterable`
`48`	`48`	`{`
`49`	`49`	`if (str_starts_with($filename, '@')) {`
`50`		`- $dir = $this->getApplication()->getKernel()->locateResource($filename);`
`51`		`-`
`52`		`- return Finder::create()->files()->in($dir)->name($this->namePatterns);`
	`50`	`+ $filename = $this->getApplication()->getKernel()->locateResource($filename);`
`53`	`51`	`}`
`54`	`52`
`55`	`53`	`return parent::findFiles($filename);`