Merge pull request #134 from Tobion/short-array-syntax

use short array syntax by default with param type array

Author: Ocramius

src/Generator/ValueGenerator.php

@@ -185,7 +185,7 @@ public function getConstants()
      */
     public function isValidConstantType()
     {
-        if ($this->type == self::TYPE_AUTO) {
+        if ($this->type === self::TYPE_AUTO) {
             $type = $this->getAutoDeterminedType($this->value);
         } else {
             $type = $this->type;
@@ -336,13 +336,13 @@ public function generate()
     {
         $type = $this->type;
 
-        if ($type != self::TYPE_AUTO) {
+        if ($type !== self::TYPE_AUTO) {
             $type = $this->getValidatedType($type);
         }
 
         $value = $this->value;
 
-        if ($type == self::TYPE_AUTO) {
+        if ($type === self::TYPE_AUTO) {
             $type = $this->getAutoDeterminedType($value);
         }
 
@@ -388,12 +388,12 @@ public function generate()
             case self::TYPE_ARRAY:
             case self::TYPE_ARRAY_LONG:
             case self::TYPE_ARRAY_SHORT:
-                if ($type == self::TYPE_ARRAY_SHORT) {
-                    $startArray = '[';
-                    $endArray   = ']';
-                } else {
+                if ($type === self::TYPE_ARRAY_LONG) {
                     $startArray = 'array(';
-                    $endArray = ')';
+                    $endArray   = ')';
+                } else {
+                    $startArray = '[';
+                    $endArray = ']';
                 }
 
                 $output .= $startArray;

test/Generator/MethodGeneratorTest.php

@@ -233,7 +233,7 @@ public function testDefaultValueGenerationDoesNotIncludeTrailingSemicolon()
 
         $method->setParameter($param);
         $generated = $method->generate();
-        self::assertRegExp('/array \$options = array\(\)\)/', $generated, $generated);
+        self::assertContains('array $options = [])', $generated);
     }
 
     public function testCreateFromArray()

test/Generator/ParameterGeneratorTest.php

@@ -181,8 +181,8 @@ public function dataFromReflectionGenerate()
             ['defaultNull', '$value = null'],
             ['fromArray', 'array $array'],
             ['hasNativeDocTypes', '$integer'],
-            ['defaultArray', '$array = array()'],
-            ['defaultArrayWithValues', '$array = array(1, 2, 3)'],
+            ['defaultArray', '$array = []'],
+            ['defaultArrayWithValues', '$array = [1, 2, 3]'],
             ['defaultFalse', '$val = false'],
             ['defaultTrue', '$val = true'],
             ['defaultZero', '$number = 0'],

test/Generator/PropertyGeneratorTest.php

@@ -108,14 +108,14 @@ public function testPropertyMultilineValue() : void
         ];
 
         $expectedSource = <<<EOS
-    public \$myFoo = array(
+    public \$myFoo = [
         5,
         'one' => 1,
         'two' => '2',
         'null' => null,
         'true' => true,
         'bar\'s' => 'bar\'s',
-    );
+    ];
 EOS;
 
         $property = new PropertyGenerator('myFoo', $targetValue);

test/Generator/TestAsset/ParameterClass.php

@@ -40,7 +40,7 @@ public function fromArray(array $array)
 
     }
 
-    public function defaultArray($array = array())
+    public function defaultArray($array = [])
     {
 
     }
@@ -70,7 +70,7 @@ public function defaultFloat($float = 1.34)
 
     }
 
-    public function defaultArrayWithValues($array = array(0 => 1, 1 => 2, 2 => 3))
+    public function defaultArrayWithValues($array = [0 => 1, 1 => 2, 2 => 3])
     {
 
     }

test/Generator/TestAsset/TestClassWithManyProperties.php

@@ -27,17 +27,17 @@ class TestClassWithManyProperties
 
     private static $_bazStaticProperty = self::FOO;
 
-    private $_bazProperty = array(true, false, true);
+    private $_bazProperty = [true, false, true];
 
-    protected $_complexType = array(
+    protected $_complexType = [
         5,
         'one' => 1,
         'two' => '2',
-        array(
+        [
             'bar',
             'baz',
             "\n"
-        )
-    );
+        ]
+    ];
 
 }

test/Generator/ValueGeneratorTest.php

@@ -92,7 +92,7 @@ public function validConstantTypes()
         return [
             [
                 new PropertyValueGenerator([], PropertyValueGenerator::TYPE_ARRAY, ValueGenerator::OUTPUT_SINGLE_LINE),
-                '    const FOO = array();',
+                '    const FOO = [];',
             ],
             [
                 new PropertyValueGenerator(
@@ -139,12 +139,12 @@ protected function generateArrayData($longOutput, array $value)
             'auto'        => [
                 ValueGenerator::TYPE_AUTO,
                 $value,
-                $longOutput,
+                $shortOutput,
             ],
             'array'       => [
                 ValueGenerator::TYPE_ARRAY,
                 $value,
-                $longOutput,
+                $shortOutput,
             ],
             'array long'  => [
                 ValueGenerator::TYPE_ARRAY_LONG,

test/Reflection/ClassReflectionTest.php

@@ -100,7 +100,7 @@ public function getProp2(\$param1, TestSampleClass \$param2)
 
     public function getIterator()
     {
-        return array();
+        return [];
     }
 
 }
@@ -133,7 +133,7 @@ public function getProp2(\$param1, TestSampleClass \$param2)
 
     public function getIterator()
     {
-        return array();
+        return [];
     }
 
 }

test/Reflection/TestAsset/TestSampleClass2.php

@@ -25,7 +25,7 @@ public function getProp2($param1, TestSampleClass $param2)
 
     public function getIterator()
     {
-        return array();
+        return [];
     }
 
 }

test/Reflection/TestAsset/TestSampleClass9.php

@@ -27,7 +27,7 @@ public function getProp2($param1, TestSampleClass $param2)
 
     public function getIterator()
     {
-        return array();
+        return [];
     }
 
 }