Permalink
Browse files

Merge branch 'hotfix/3300' into develop

Forward port #3300
  • Loading branch information...
2 parents 2418173 + e846394 commit 888876d0cb1f22b9cabb8ff959f1a63ce7d70c17 @weierophinney weierophinney committed Jan 3, 2013
Showing with 11 additions and 0 deletions.
  1. +2 −0 library/Zend/Config/Config.php
  2. +9 −0 tests/ZendTest/Config/ConfigTest.php
@@ -365,6 +365,8 @@ public function merge(self $merge)
} else {
$this->data[$key] = $value;
}
+
+ $this->count++;
}
}
@@ -181,6 +181,15 @@ public function testCount()
$this->assertEquals(3, count($data->button));
}
+ public function testCountAfterMerge()
+ {
+ $data = new Config($this->toCombineB);
+ $data->merge(
+ new Config($this->toCombineA)
+ );
+ $this->assertEquals(count($data->toArray()), $data->count());
+ }
+
public function testIterator()
{
// top level

0 comments on commit 888876d

Please sign in to comment.