Merge branch 'release/4.1.0'

Author: mikaelcom

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 4.1.1 - 2021/02/05
+- issue #12 - Use array short notation
+
 ## 4.0.1 - 2021/02/04
 - Add back `getMainElement` method to `AbstractComponent`
 

src/Element/AssignedValueElementTrait.php

@@ -99,7 +99,14 @@ protected function getScalarValue($value)
 
     protected function getAnyValue($value): string
     {
-        $exportedValue = var_export($value, true);
+        if (is_array($value)) {
+            $exportedValue = empty($value) ? '[]' : implode("\n", array_map(function ($line) {
+                return 'array (' === $line ? '[' : (')' === $line ? ']' : $line);
+            }, explode("\n", var_export($value, true))));
+        } else {
+            $exportedValue = var_export($value, true);
+        }
+
         // work around for known bug https://bugs.php.net/bug.php?id=66866
         if (is_float($value) && strlen((string) $value) !== strlen((string) $exportedValue)) {
             $exportedValue = (string) $value;

src/Element/PhpFunctionParameter.php

@@ -27,7 +27,7 @@ public function endsWithSemicolon(): bool
     protected function getAnyValue($value): string
     {
         if (is_array($value)) {
-            return str_replace([self::BREAK_LINE_CHAR, ' '], '', var_export($value, true));
+            return str_replace([self::BREAK_LINE_CHAR, ' '], '', parent::getAnyValue($value));
         }
 
         return parent::getAnyValue($value);

tests/Element/PhpFunctionParameterTest.php

@@ -70,7 +70,7 @@ public function testToStringEmptyArrayValue()
     {
         $functionParameter = new PhpFunctionParameter('foo', [], 'array');
 
-        $this->assertSame('array $foo = array()', $functionParameter->toString());
+        $this->assertSame('array $foo = []', $functionParameter->toString());
     }
 
     public function testToStringWithNamespace()

tests/Element/PhpPropertyTest.php

@@ -87,7 +87,7 @@ public function testPublicGetPhpDeclarationArray()
             1,
         ]);
 
-        $this->assertSame("public \$foo = array (\n  0 => '0',\n  1 => 1,\n);", $property->getPhpDeclaration());
+        $this->assertSame("public \$foo = [\n  0 => '0',\n  1 => 1,\n];", $property->getPhpDeclaration());
     }
 
     public function testPublicGetPhpDeclarationNewInstance()

tests/Element/PhpVariableTest.php

@@ -50,14 +50,21 @@ public function testGetPhpDeclarationNumberOneValue()
         $this->assertSame('$foo = 1;', $variable->getPhpDeclaration());
     }
 
+    public function testGetPhpDeclarationEmptyArrayValue()
+    {
+        $variable = new PhpVariable('foo', []);
+
+        $this->assertSame("\$foo = [];", $variable->getPhpDeclaration());
+    }
+
     public function testGetPhpDeclarationArray()
     {
         $variable = new PhpVariable('foo', [
             '0',
             1,
         ]);
 
-        $this->assertSame("\$foo = array (\n  0 => '0',\n  1 => 1,\n);", $variable->getPhpDeclaration());
+        $this->assertSame("\$foo = [\n  0 => '0',\n  1 => 1,\n];", $variable->getPhpDeclaration());
     }
 
     public function testGetPhpDeclarationNewInstance()