Merge branch 'feature/php-short-array-syntax'

zendframework · Jun 5, 2015 · 0c4c71c · 0c4c71c
2 parents 845d1c2 + 3d81544
commit 0c4c71c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.php_cs b/.php_cs
@@ -32,6 +32,7 @@ $config->fixers(
         'object_operator',
         'php_closing_tag',
         'remove_lines_between_uses',
+        'short_array_syntax',
         'short_tag',
         'standardize_not_equal',
         'trailing_spaces',

diff --git a/test/DebugTest.php b/test/DebugTest.php
@@ -31,7 +31,7 @@ public function testDebugDump()
         Debug::setSapi('cli');
         $data = 'string';
         $result = Debug::Dump($data, null, false);
-        $result = str_replace(array(PHP_EOL, "\n"), '_', $result);
+        $result = str_replace([PHP_EOL, "\n"], '_', $result);
         $expected = "__string(6) \"string\"__";
         $this->assertEquals($expected, $result);
     }
@@ -44,10 +44,10 @@ public function testDebugCgi()
 
         // Has to check for two strings, because xdebug internally handles CLI vs Web
         $this->assertContains($result,
-            array(
+            [
                 "<pre>string(6) \"string\"\n</pre>",
                 "<pre>string(6) &quot;string&quot;\n</pre>",
-            )
+            ]
         );
     }
 
@@ -71,7 +71,7 @@ public function testDebugDumpLabel()
         $data = 'string';
         $label = 'LABEL';
         $result = Debug::Dump($data, $label, false);
-        $result = str_replace(array(PHP_EOL, "\n"), '_', $result);
+        $result = str_replace([PHP_EOL, "\n"], '_', $result);
         $expected = "_{$label} _string(6) \"string\"__";
         $this->assertEquals($expected, $result);
     }
@@ -87,7 +87,7 @@ public function testXdebugEnabledAndNonCliSapiDoesNotEscapeSpecialChars()
         }
 
         Debug::setSapi('apache');
-        $a = array("a" => "b");
+        $a = ["a" => "b"];
 
         $result = Debug::dump($a, "LABEL", false);
         $this->assertContains("<pre>", $result);
@@ -101,7 +101,7 @@ public function testDebugHaveEscaper()
         $escaper = new Escaper;
         Debug::setEscaper($escaper);
 
-        $a = array("a" => "<script type=\"text/javascript\"");
+        $a = ["a" => "<script type=\"text/javascript\""];
         $result = Debug::dump($a, "LABEL", false);
         $this->assertContains("&lt;script type=&quot;text/javascript&quot;&quot;", $result);
     }