Merge branch 'master' of git://github.com/zendframework/zf2 into cach…

…e_interfaces
zendframework · May 31, 2012 · 1128b0c · 1128b0c
commit 1128b0c
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 15 deletions.
diff --git a/.travis/run-tests.sh b/.travis/run-tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-travisdir=$(dirname $(readlink /proc/$$/fd/255))
+travisdir=$(dirname "$0")
 testdir="$travisdir/../tests"
 testedcomponents=(`cat "$travisdir/tested-components"`)
 result=0

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/.travis/tested-components b/.travis/tested-components
@@ -22,17 +22,19 @@ Zend/Form
 Zend/GData
 Zend/Http
 Zend/InfoCard
+Zend/InputFilter
 Zend/Json
 Zend/Ldap
 Zend/Loader
 Zend/Locale
 Zend/Log
 Zend/Mail
 Zend/Markup
+Zend/Math
 Zend/Measure
 Zend/Memory
 Zend/Mime
-Zend/Module
+Zend/ModuleManager
 Zend/Mvc
 Zend/Navigation
 Zend/OAuth

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/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Json
+ * @subpackage Exception
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace Zend\Json\Exception;
+
+/**
+ * @category   Zend
+ * @package    Zend_Json
+ * @subpackage Exception
+ * @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 BadMethodCallException extends \BadMethodCallException implements 
+    ExceptionInterface
+{}
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 Zend\Json\Exception;
 
 /**
  * Thrown by Zend\Json\Server\Client when an JSON-RPC fault response is returned.
@@ -33,7 +32,6 @@
  * @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 ErrorException
-    extends BadMethodCallException
-    implements Exception
+class ErrorException extends Exception\BadMethodCallException 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_);
+    }
+
 }
 
 /**