Pulled in current master into this branch

zendframework · Dec 3, 2012 · 9327465 · 9327465
commit 9327465
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/test/JsonTest.php b/test/JsonTest.php
@@ -381,11 +381,11 @@ public function testOctalValuesAreNotSupportedInJsonNotation()
      */
     public function testZf461()
     {
-        $item1 = new Item() ;
-        $item2 = new Item() ;
-        $everything = array() ;
-        $everything['allItems'] = array($item1, $item2) ;
-        $everything['currentItem'] = $item1 ;
+        $item1 = new Item();
+        $item2 = new Item();
+        $everything = array();
+        $everything['allItems'] = array($item1, $item2);
+        $everything['currentItem'] = $item1;
 
         // should not fail
         $encoded = Json\Encoder::encode($everything);
@@ -403,11 +403,11 @@ public function testZf461()
      */
     public function testZf4053()
     {
-        $item1 = new Item() ;
-        $item2 = new Item() ;
-        $everything = array() ;
-        $everything['allItems'] = array($item1, $item2) ;
-        $everything['currentItem'] = $item1 ;
+        $item1 = new Item();
+        $item2 = new Item();
+        $everything = array();
+        $everything['allItems'] = array($item1, $item2);
+        $everything['currentItem'] = $item1;
 
         $options = array('silenceCyclicalExceptions'=>true);