bug: Fix type error when using paths intersection mode (#6734)

PHP-CS-Fixer · Jan 2, 2023 · 936edf0 · 936edf0
1 parent 5120e61
commit 936edf0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/Console/Command/FixCommand.php b/src/Console/Command/FixCommand.php
@@ -272,7 +272,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         $progressType = $resolver->getProgress();
-        $finder = $resolver->getFinder();
+        $finder = new \ArrayIterator(iterator_to_array($resolver->getFinder()));
 
         if (null !== $stdErr && $resolver->configFinderIsOverridden()) {
             $stdErr->writeln(
@@ -283,7 +283,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         if ('none' === $progressType || null === $stdErr) {
             $progressOutput = new NullOutput();
         } else {
-            $finder = new \ArrayIterator(iterator_to_array($finder));
             $progressOutput = new ProcessOutput(
                 $stdErr,
                 $this->eventDispatcher,

diff --git a/tests/Console/Command/FixCommandTest.php b/tests/Console/Command/FixCommandTest.php
@@ -19,6 +19,7 @@
 use PhpCsFixer\Console\Command\FixCommand;
 use PhpCsFixer\Tests\TestCase;
 use PhpCsFixer\ToolInfo;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -29,6 +30,19 @@
  */
 final class FixCommandTest extends TestCase
 {
+    public function testIntersectionPathMode(): void
+    {
+        $cmdTester = $this->doTestExecute([
+            '--path-mode' => 'intersection',
+            '--show-progress' => 'none',
+        ]);
+
+        static::assertSame(
+            Command::SUCCESS,
+            $cmdTester->getStatusCode()
+        );
+    }
+
     public function testEmptyRulesValue(): void
     {
         $this->expectException(
@@ -93,7 +107,7 @@ private function getDefaultArguments(): array
         return [
             'path' => [__FILE__],
             '--path-mode' => 'override',
-            '--allow-risky' => true,
+            '--allow-risky' => 'yes',
             '--dry-run' => true,
             '--using-cache' => 'no',
             '--show-progress' => 'none',