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

zendframework · Jun 26, 2011 · 6bda391 · 6bda391
commit 6bda391
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/Exception.php b/src/Exception.php
@@ -24,7 +24,6 @@
 namespace Zend\Config;
 
 /**
- * @uses       \Zend\Exception
  * @category   Zend
  * @package    Zend_Config
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)

diff --git a/test/ConfigTest.php b/test/ConfigTest.php
@@ -94,13 +94,11 @@ public function testLoadSingleSection()
 
     public function testIsset()
     {
-        if (version_compare(PHP_VERSION, '5.1', '>=')) {
-            $config = new Config($this->_all, false);
+        $config = new Config($this->_all, false);
 
-            $this->assertFalse(isset($config->notarealkey));
-            $this->assertTrue(isset($config->hostname)); // top level
-            $this->assertTrue(isset($config->db->name)); // one level down
-        }
+        $this->assertFalse(isset($config->notarealkey));
+        $this->assertTrue(isset($config->hostname)); // top level
+        $this->assertTrue(isset($config->db->name)); // one level down
     }
 
     public function testModification()