Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
@weierophinney
weierophinney committed Sep 13, 2012
100 parents 6a43cc1 + ad11b96 + 86db540 + efbb513 + 24c143c + 307427e + 4c7a822 + 25d3bd7 + 40bfe7f + 70ca2ff + 76fd684 + 82cff31 + 186a39c + 39a35fe + b0c8193 + 1a7e426 + 09ea754 + 8317963 + 950705c + bd78289 + 25f3e05 + 1c0577b + 6bcfccb + 0b2a1a9 + 7974490 + f3ba45e + 4357e80 + 7d43d02 + 421a0f4 + e7aa329 + 6d05bfe + f27c5e2 + 6cb3b21 + 1ecb5ed + b66b0e2 + 0b91e40 + 6bda391 + b932fa5 + a431b75 + 9ce83ec + a35dff6 + 60e4965 + 0f071e9 + 3fe17b4 + 196ca18 + 17cbc64 + 8f4a51f + 88ec12d + 31ab35e + 59c83c4 + d50da4c + 01af50b + 6a46af5 + 4308adc + 1c3d629 + 18a268d + 1987408 + abc72db + 175f7ab + 8a85704 + 7706019 + cc5d38c + fbaa5aa + 0555415 + 20ae04b + 0680687 + e65301c + 424e30a + d36a7f1 + 64bb794 + c74649b + b14bb6b + 4e73e4e + 0ee93d0 + e887bfd + f66ad20 + 66c5ff2 + f5b2841 + 717175b + 52c5e49 + 8f39d69 + 2003fce + 1ccb3fd + 315a9ac + 2b82c0f + 1565409 + fd7399e + cb27129 + 62ca6c9 + 7b73995 + 18f93e0 + 72fe59b + 9f5b116 + 28a04a3 + b56ee4d + 98ac67f + 0a2d51c + 9287e61 + 1a420ec + 19e17a6 commit cd54577
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
44 changes: 22 additions & 22 deletions test/ConfigTest.php
View file
Expand Up @@ -330,42 +330,42 @@ public function testMerge()
$this->assertEquals('bar', $configA->text);

// config->numerical-> ...
$this->assertInstanceOf('\Zend\Config\Config',$configA->numerical);
$this->assertEquals('first',$configA->numerical->{0});
$this->assertEquals('second',$configA->numerical->{1});
$this->assertInstanceOf('\Zend\Config\Config', $configA->numerical);
$this->assertEquals('first', $configA->numerical->{0});
$this->assertEquals('second', $configA->numerical->{1});

// config->numerical->{2}-> ...
$this->assertInstanceOf('\Zend\Config\Config',$configA->numerical->{2});
$this->assertEquals('third',$configA->numerical->{2}->{0});
$this->assertEquals(null,$configA->numerical->{2}->{1});
$this->assertInstanceOf('\Zend\Config\Config', $configA->numerical->{2});
$this->assertEquals('third', $configA->numerical->{2}->{0});
$this->assertEquals(null, $configA->numerical->{2}->{1});

// config->numerical-> ...
$this->assertEquals('fourth',$configA->numerical->{3});
$this->assertEquals('fifth',$configA->numerical->{4});
$this->assertEquals('fourth', $configA->numerical->{3});
$this->assertEquals('fifth', $configA->numerical->{4});

// config->numerical->{5}
$this->assertInstanceOf('\Zend\Config\Config',$configA->numerical->{5});
$this->assertEquals('sixth',$configA->numerical->{5}->{0});
$this->assertEquals(null,$configA->numerical->{5}->{1});
$this->assertInstanceOf('\Zend\Config\Config', $configA->numerical->{5});
$this->assertEquals('sixth', $configA->numerical->{5}->{0});
$this->assertEquals(null, $configA->numerical->{5}->{1});

// config->misaligned
$this->assertInstanceOf('\Zend\Config\Config',$configA->misaligned);
$this->assertEquals('foo',$configA->misaligned->{2});
$this->assertEquals('bar',$configA->misaligned->{3});
$this->assertEquals('baz',$configA->misaligned->{4});
$this->assertEquals(null,$configA->misaligned->{0});
$this->assertInstanceOf('\Zend\Config\Config', $configA->misaligned);
$this->assertEquals('foo', $configA->misaligned->{2});
$this->assertEquals('bar', $configA->misaligned->{3});
$this->assertEquals('baz', $configA->misaligned->{4});
$this->assertEquals(null, $configA->misaligned->{0});

// config->mixed
$this->assertInstanceOf('\Zend\Config\Config',$configA->mixed);
$this->assertEquals('bar',$configA->mixed->foo);
$this->assertSame(false,$configA->mixed->{0});
$this->assertSame(null,$configA->mixed->{1});
$this->assertInstanceOf('\Zend\Config\Config', $configA->mixed);
$this->assertEquals('bar', $configA->mixed->foo);
$this->assertSame(false, $configA->mixed->{0});
$this->assertSame(null, $configA->mixed->{1});

// config->replaceAssoc
$this->assertSame(null,$configA->replaceAssoc);
$this->assertSame(null, $configA->replaceAssoc);

// config->replaceNumerical
$this->assertSame(true,$configA->replaceNumerical);
$this->assertSame(true, $configA->replaceNumerical);

}

Expand Down
2 changes: 1 addition & 1 deletion test/FactoryTest.php
View file
Expand Up @@ -128,7 +128,7 @@ public function testFactoryCanRegisterCustomReaderInstance()
public function testFactoryCanRegisterCustomReaderPlugn()
{
$dummyReader = new Reader\TestAssets\DummyReader();
Factory::getReaderPluginManager()->setService('DummyReader',$dummyReader);
Factory::getReaderPluginManager()->setService('DummyReader', $dummyReader);

Factory::registerReader('dum', 'DummyReader');

Expand Down

0 comments on commit cd54577

Please sign in to comment.