Merge pull request #174 from thomas-kl1/patch-1

Use output mode configured in `ValueGenerator` instance
laminas · Mar 8, 2023 · ad8b360 · ad8b360
2 parents 37757c6 + 65c0584
commit ad8b360
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 2 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1874,6 +1874,7 @@
       <code>simpleArray</code>
       <code>unsortedKeysArray</code>
       <code>validConstantTypes</code>
+      <code>multipleOutputArray</code>
     </PossiblyUnusedMethod>
   </file>
   <file src="test/Generic/Prototype/PrototypeClassFactoryTest.php">

diff --git a/src/Generator/ValueGenerator.php b/src/Generator/ValueGenerator.php
@@ -371,7 +371,7 @@ public function generate()
                     $newType = self::TYPE_AUTO;
                 }
 
-                $curValue = new self($curValue, $newType, self::OUTPUT_MULTIPLE_LINE, $this->getConstants());
+                $curValue = new self($curValue, $newType, $this->outputMode, $this->getConstants());
                 $curValue->setIndentation($this->indentation);
             }
         }

diff --git a/test/Generator/ValueGeneratorTest.php b/test/Generator/ValueGeneratorTest.php
@@ -19,7 +19,6 @@
 use PHPUnit\Framework\TestCase;
 
 use function fopen;
-use function sprintf;
 use function str_replace;
 
 #[CoversClass(ValueGenerator::class)]
@@ -498,4 +497,55 @@ public function testExceptionInvalidValue(mixed $value, string $type): void
         $this->expectExceptionMessage('Type "' . $type . '" is unknown or cannot be used');
         $valueGenerator->generate();
     }
+
+    /**
+     * @param ValueGenerator::OUTPUT_* $outputMode
+     */
+    #[DataProvider('multipleOutputArray')]
+    public function testArrayWithOutputMode(
+        array $array,
+        string $type,
+        string $outputMode,
+        string $output
+    ): void {
+        $valueGenerator = new ValueGenerator($array, $type, $outputMode);
+
+        self::assertSame($valueGenerator->generate(), $output);
+    }
+
+    /**
+     * Data provider for testArrayWithOutputMode test
+     */
+    public static function multipleOutputArray(): array
+    {
+        $array = [
+            'foo' => [
+                'bar',
+            ],
+        ];
+
+        $singleLine   = '[\'foo\' => [\'bar\']]';
+        $multipleLine = <<<EOS
+[
+    'foo' => [
+        'bar',
+    ],
+]
+EOS;
+
+        return [
+            'singleLine'   => [
+                $array,
+                ValueGenerator::TYPE_ARRAY_SHORT,
+                ValueGenerator::OUTPUT_SINGLE_LINE,
+                $singleLine,
+            ],
+            'multipleLine' => [
+                $array,
+                ValueGenerator::TYPE_ARRAY_SHORT,
+                ValueGenerator::OUTPUT_MULTIPLE_LINE,
+                $multipleLine,
+            ],
+        ];
+    }
 }