Merge remote-tracking branch 'zf2/master' into feature/doc

zendframework · Jul 11, 2012 · 18f93e0 · 18f93e0
commit 18f93e0
Show file tree

Hide file tree

Showing 25 changed files with 111 additions and 293 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-config",
-    "description": "Zend\\Config component",
+    "description": "provides a nested object property based user interface for accessing this configuration data within application code",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
@@ -9,11 +9,11 @@
     "homepage": "https://github.com/zendframework/zend-config",
     "autoload": {
         "psr-4": {
-            "Zend\\Config\\": "src/"
+            "Zend\\Config": "src/"
         }
     },
     "require": {
-        "php": ">=5.3.23",
+        "php": ">=5.3.3",
         "zendframework/zend-stdlib": "self.version"
     },
     "require-dev": {

diff --git a/src/Config.php b/src/Config.php
@@ -10,9 +10,9 @@
 
 namespace Zend\Config;
 
+use ArrayAccess;
 use Countable;
 use Iterator;
-use ArrayAccess;
 use Zend\Stdlib\ArrayUtils;
 
 /**

diff --git a/src/Processor/Queue.php b/src/Processor/Queue.php
@@ -11,8 +11,8 @@
 namespace Zend\Config\Processor;
 
 use Zend\Config\Config;
-use Zend\Stdlib\PriorityQueue;
 use Zend\Config\Exception;
+use Zend\Stdlib\PriorityQueue;
 
 /**
  * @category   Zend

diff --git a/src/Processor/Token.php b/src/Processor/Token.php
@@ -10,9 +10,9 @@
 
 namespace Zend\Config\Processor;
 
+use Traversable;
 use Zend\Config\Config;
 use Zend\Config\Exception;
-use Traversable;
 
 /**
  * @category   Zend

diff --git a/src/Reader/Json.php b/src/Reader/Json.php
@@ -11,8 +11,8 @@
 namespace Zend\Config\Reader;
 
 use Zend\Config\Exception;
-use Zend\Json\Json as JsonFormat;
 use Zend\Json\Exception as JsonException;
+use Zend\Json\Json as JsonFormat;
 
 /**
  * JSON config reader.

diff --git a/src/ReaderPluginManager.php b/src/ReaderPluginManager.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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 license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace Zend\Config;
@@ -25,8 +15,6 @@
 /**
  * @category   Zend
  * @package    Zend_Config
- * @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 ReaderPluginManager extends AbstractPluginManager
 {

diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php
@@ -11,8 +11,8 @@
 namespace Zend\Config\Writer;
 
 use Traversable;
-use Zend\Config\Exception;
 use Zend\Config\Config;
+use Zend\Config\Exception;
 use Zend\Stdlib\ArrayUtils;
 
 /**

diff --git a/src/Writer/Xml.php b/src/Writer/Xml.php
@@ -10,8 +10,8 @@
 
 namespace Zend\Config\Writer;
 
-use Zend\Config\Exception;
 use XMLWriter;
+use Zend\Config\Exception;
 
 /**
  * @category   Zend

diff --git a/test/ConfigTest.php b/test/ConfigTest.php
@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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 license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config;
@@ -27,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class ConfigTest extends \PHPUnit_Framework_TestCase
@@ -473,20 +460,14 @@ public function testMergeHonoursAllowModificationsFlagAtAllLevels()
         $config2 = new Config(array(), true);
 
         $config2->merge($config);
-        try {
-            $config2->key2 = 'no';
-        }  catch (\Zend\Config\Exception\RuntimeException $e) {
-            $this->fail('Unexpected exception at top level has been raised: ' . $e->getMessage());
-        }
+
+        $config2->key2 = 'no';
+
         $this->assertEquals('no', $config2->key2);
 
-        try {
-            $config2->key->nested = 'no';
-        }  catch (\Zend\Config\Exception\RuntimeException $e) {
-            $this->fail('Unexpected exception on nested object has been raised: ' . $e->getMessage());
-        }
-        $this->assertEquals('no', $config2->key->nested);
+        $config2->key->nested = 'no';
 
+        $this->assertEquals('no', $config2->key->nested);
     }
 
     /**

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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 license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config;
@@ -27,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class FactoryTest extends \PHPUnit_Framework_TestCase

diff --git a/test/ProcessorTest.php b/test/ProcessorTest.php
@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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 license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config;
@@ -37,8 +26,6 @@
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class ProcessorTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Reader/AbstractReaderTestCase.php b/test/Reader/AbstractReaderTestCase.php
@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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 license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Reader;
@@ -29,8 +18,6 @@
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 abstract class AbstractReaderTestCase extends TestCase

diff --git a/test/Reader/IniTest.php b/test/Reader/IniTest.php
@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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 license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Reader;
@@ -27,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class IniTest extends AbstractReaderTestCase

diff --git a/test/Reader/JsonTest.php b/test/Reader/JsonTest.php
@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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 license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
  */
 
 namespace ZendTest\Config\Reader;
@@ -27,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Config
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Config
  */
 class JsonTest extends AbstractReaderTestCase

diff --git a/test/Reader/TestAssets/DummyReader.php b/test/Reader/TestAssets/DummyReader.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Config
+ */
 
 namespace ZendTest\Config\Reader\TestAssets;