Merge branch 'master' of github.com:zendframework/zf2 into feature/ro…

…uter-http-method
zendframework · May 16, 2012 · a8ab5b0 · a8ab5b0
2 parents 491f302 + 3ddf1a3
commit a8ab5b0
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 11 deletions.
diff --git a/.travis/skipped-components b/.travis/skipped-components
@@ -1,5 +1,6 @@
 Zend/Amf
 Zend/Date
+Zend/Dojo
 Zend/Queue
 Zend/Service
 Zend/Test

diff --git a/src/Decoder.php b/src/Decoder.php
@@ -223,6 +223,9 @@ protected function _decodeObject()
                 // Create new StdClass and populate with $members
                 $result = new \stdClass();
                 foreach ($members as $key => $value) {
+                    if ($key === '') {
+                        $key = '_empty_';
+                    }
                     $result->$key = $value;
                 }
                 break;

diff --git a/src/Exception.php → src/Exception/ExceptionInterface.php b/src/Exception.php → src/Exception/ExceptionInterface.php
@@ -18,13 +18,13 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Json;
+namespace Zend\Json\Exception;
 
 /**
  * @category   Zend
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Exception
+interface ExceptionInterface
 {}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -26,5 +26,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class InvalidArgumentException extends \InvalidArgumentException implements \Zend\Json\Exception
+class InvalidArgumentException
+    extends \InvalidArgumentException
+    implements ExceptionInterface
 {}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -26,5 +26,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class RuntimeException extends \RuntimeException implements \Zend\Json\Exception
+class RuntimeException
+    extends \RuntimeException
+    implements ExceptionInterface
 {}
diff --git a/src/Server/Exception/ErrorException.php b/src/Server/Exception/ErrorException.php
@@ -21,8 +21,7 @@
 
 namespace Zend\Json\Server\Exception;
 
-use BadMethodCallException,
-    Zend\Json\Server\Exception;
+use BadMethodCallException;
 
 /**
  * Thrown by Zend\Json\Server\Client when an JSON-RPC fault response is returned.
@@ -35,5 +34,5 @@
  */
 class ErrorException
     extends BadMethodCallException
-    implements Exception
+    implements ExceptionInterface
 {}
diff --git a/src/Server/Exception.php → src/Server/Exception/ExceptionInterface.php b/src/Server/Exception.php → src/Server/Exception/ExceptionInterface.php
@@ -18,7 +18,9 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Json\Server;
+namespace Zend\Json\Server\Exception;
+
+use Zend\Json\Exception\ExceptionInterface as Exception;
 
 /**
  * @category   Zend
@@ -27,5 +29,5 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Exception extends \Zend\Json\Exception
+interface ExceptionInterface extends Exception
 {}
diff --git a/src/Server/Exception/InvalidArgumentException.php b/src/Server/Exception/InvalidArgumentException.php
@@ -20,12 +20,16 @@
 
 namespace Zend\Json\Server\Exception;
 
+use Zend\Json\Exception;
+
 /**
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class InvalidArgumentException extends \InvalidArgumentException implements \Zend\Json\Server\Exception
+class InvalidArgumentException
+    extends Exception\InvalidArgumentException
+    implements ExceptionInterface
 {}
diff --git a/src/Server/Exception/RuntimeException.php b/src/Server/Exception/RuntimeException.php
@@ -20,12 +20,16 @@
 
 namespace Zend\Json\Server\Exception;
 
+use Zend\Json\Exception;
+
 /**
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class RuntimeException extends \RuntimeException implements \Zend\Json\Server\Exception
+class RuntimeException
+    extends Exception\RuntimeException
+    implements ExceptionInterface
 {}
diff --git a/test/JsonTest.php b/test/JsonTest.php
@@ -847,6 +847,19 @@ public function testWillEncodeArrayOfObjectsEachWithToJsonMethod()
         $this->assertEquals($expected, $json);
     }
 
+    /**
+     * @group ZF-7586
+     */
+    public function testWillDecodeStructureWithEmptyKeyToObjectProperly()
+    {
+        Json\Json::$useBuiltinEncoderDecoder = true;
+
+        $json = '{"":"test"}';
+        $object = Json\Json::decode($json, Json\Json::TYPE_OBJECT);
+        $this->assertTrue(isset($object->_empty_));
+        $this->assertEquals('test', $object->_empty_);
+    }
+
 }
 
 /**