Extractor: fixed extracting of special arrays [Closes #143]

nette · Oct 29, 2023 · 0106e52 · 0106e52
1 parent d915b7f
commit 0106e52
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/PhpGenerator/Extractor.php b/src/PhpGenerator/Extractor.php
@@ -418,12 +418,17 @@ private function toValue(Node\Expr $node): mixed
 			$res = [];
 			foreach ($node->items as $item) {
 				if ($item->unpack) {
-					$res[] = new Literal($this->getReformattedContents([$item], 0));
+					return new Literal($this->getReformattedContents([$node], 0));
 
 				} elseif ($item->key) {
 					$key = $item->key instanceof Node\Identifier
 						? $item->key->name
 						: $this->toValue($item->key);
+
+					if ($key instanceof Literal) {
+						return new Literal($this->getReformattedContents([$node], 0));
+					}
+
 					$res[$key] = $this->toValue($item->value);
 
 				} else {

diff --git a/tests/PhpGenerator/Extractor.extractAll.vars.phpt b/tests/PhpGenerator/Extractor.extractAll.vars.phpt
@@ -20,7 +20,9 @@ $file = (new Extractor(<<<'XX'
 		public $null = null;
 		public $scalar = [true, false, 1, 1.0, 'hello'];
 		public $const = [PHP_VERSION, self::Foo];
-		public $array = [1, 2, ['x' => [3]], ...self::Foo];
+		public $array = [1, 2, ['x' => [3]]];
+		public $arraySpec1 = [...self::Foo];
+		public $arraySpec2 = [self::class => 1];
 		public $concat = 'x' . 'y';
 		public $math = 10 * 3;
 
@@ -49,9 +51,17 @@ Assert::equal(
 	$class->getProperty('const')->getValue(),
 );
 Assert::equal(
-	[1, 2, ['x' => [3]], new Literal('...self::Foo')],
+	[1, 2, ['x' => [3]]],
 	$class->getProperty('array')->getValue(),
 );
+Assert::equal(
+	new Literal('[...self::Foo]'),
+	$class->getProperty('arraySpec1')->getValue(),
+);
+Assert::equal(
+	new Literal('[self::class => 1]'),
+	$class->getProperty('arraySpec2')->getValue(),
+);
 Assert::equal(
 	new Literal("'x' . 'y'"),
 	$class->getProperty('concat')->getValue(),