Fix type error when using paths intersection mode

PHP-CS-Fixer · Jan 2, 2023 · 9a8fb76 · 9a8fb76
1 parent 72cf37c
commit 9a8fb76
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 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/src/Console/ConfigurationResolver.php b/src/Console/ConfigurationResolver.php
@@ -932,6 +932,10 @@ private function resolveOptionBooleanValue(string $optionName): bool
     {
         $value = $this->options[$optionName];
 
+        if (\is_bool($value)) {
+            return $value;
+        }
+
         if (!\is_string($value)) {
             throw new InvalidConfigurationException(sprintf('Expected boolean or string value for option "%s".', $optionName));
         }

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,18 @@
  */
 final class FixCommandTest extends TestCase
 {
+    public function testIntersectionPathMode(): void
+    {
+        $cmdTester = $this->doTestExecute([
+            '--path-mode' => 'intersection',
+        ]);
+
+        static::assertSame(
+            Command::SUCCESS,
+            $cmdTester->getStatusCode()
+        );
+    }
+
     public function testEmptyRulesValue(): void
     {
         $this->expectException(