Merge branch 'develop'

Merging develop to master in preparation for 2.4.0rc1.
zendframework · Mar 19, 2015 · f415ff0 · f415ff0
commit f415ff0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Item.php b/src/Item.php
@@ -189,6 +189,6 @@ public function getParam($name)
         if (isset($this->params[$name])) {
             return $this->params[$name];
         }
-        return null;
+        return;
     }
 }
diff --git a/test/Cloud/CloudTest.php b/test/Cloud/CloudTest.php
@@ -166,11 +166,11 @@ public function testSetTagsAsItem()
         $list  = $cloud->getItemList();
 
         $cloud->setTags(array(
-            new Tag\Item( array(
+            new Tag\Item(array(
                 'title'  => 'foo',
                 'weight' => 1,
             )),
-            new Tag\Item( array(
+            new Tag\Item(array(
                 'title'  => 'bar',
                 'weight' => 2,
             )),
@@ -225,7 +225,7 @@ public function testConstructorWithArray()
 
     public function testConstructorWithConfig()
     {
-        $cloud = $this->_getCloud( new \Zend\Config\Config(array(
+        $cloud = $this->_getCloud(new \Zend\Config\Config(array(
             'tags' => array(
                 array(
                     'title'  => 'foo',