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

Commit

Permalink
Merge branch 'hotfix/3713' into develop
Browse files Browse the repository at this point in the history 
Forward port zendframework/zendframework#3713
  • Loading branch information
@weierophinney
weierophinney committed Feb 7, 2013
135 parents 1551da3 + b5a9043 + 9533639 + 300993b + 3fa60b1 + 56e7a3b + f66fb69 + 65e3dc5 + 893db4e + 1f95227 + 37eba61 + a8a134d + 2a58e81 + c687156 + ff43991 + bad6a8b + aba47b0 + 955d97a + 2b78fdc + 0094c19 + 4985e6d + d904244 + 52367d8 + dce778a + 2305c94 + 052b9a4 + ef11064 + 4efb47c + b3dcf28 + 778fbea + cdde9b4 + 6ade9b9 + 435888b + 2ad89a8 + e232251 + 5932189 + d0360d2 + 52242e5 + 3804b57 + 1cecc58 + 4a4065c + f9b61b5 + 0a07b63 + 0e321e0 + 95ceb90 + 4380d08 + ec9c36c + 4de92b2 + b6eb950 + fca746d + ff69119 + 5351804 + 3617ea6 + 24c8a1f + 0aa6c03 + b24267c + beadb3c + 51c4ced + d92ccc9 + eb1f131 + f383de1 + abc631a + 666ec86 + e22a167 + bb8b8f6 + b55f760 + f23a913 + 9ba9f17 + d01f94f + 9c4e0cc + 63c4a7e + 9eedf95 + 980bffb + 03cf7b3 + 8bbf35d + aff3454 + 1c6567c + a102513 + 90b7795 + 286539e + 7f08291 + 417d368 + ae0f13d + 7894420 + 8ff1b30 + 55ca16f + 0c6cb6c + 7010e32 + 745a36a + f021693 + cd91ba2 + 5586879 + 1cd9259 + b611b41 + e07e054 + 7657d67 + 52b6014 + 00211c2 + 0d594de + f919c63 + 7e217f4 + 3e0da00 + 3723e41 + facd3ee + 4d8294f + 3cdb12a + f09df31 + 34e6a86 + 4e1b451 + 2d3566a + ef9466a + 3c172af + 2260c5e + dd964bc + f325c01 + 3cd4478 + dc3a58e + cf0af6f + 6e93d7b + 6b3eedb + ce63e39 + 1bd656e + cc16778 + 720b563 + 039e86a + b27a1fe + 88022d1 + b4847de + 1b48124 + 6a22f1e + b63de1e + 770056f + 9e9a6cb + f6a6b75 + 578bedd commit 6cd974a
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/AbstractContainer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ protected function verifyNamespace($createContainer = true)
}
$storage[$name] = $this->createContainer();
}
if (!is_array($storage[$name]) && !$storage[$name] instanceof ArrayObject) {
if (!is_array($storage[$name]) && !$storage[$name] instanceof Traversable) {
throw new Exception\RuntimeException('Container cannot write to storage due to type mismatch');
}

Expand Down
2 changes: 1 addition & 1 deletion src/compatibility/autoload.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
if (version_compare(PHP_VERSION, '5.3.3', 'le')) {
if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
require_once __DIR__ . '/Container.php';
require_once __DIR__ . '/Storage/SessionArrayStorage.php';
}
16 changes: 14 additions & 2 deletions test/ContainerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ protected function forceAutoloader()
public function run(\PHPUnit_Framework_TestResult $result = NULL)
{
$this->setPreserveGlobalState(false);

return parent::run($result);
}

Expand Down Expand Up @@ -529,11 +530,22 @@ public function testExchangeArray()

public function testMultiDimensionalUnset()
{
if (version_compare(PHP_VERSION, '5.3.3') <= 0) {
$this->markTestSkipped('Known issue on versions of PHP 5.3.3 or less');
if (version_compare(PHP_VERSION, '5.3.4') < 0) {
$this->markTestSkipped('Known issue on versions of PHP less than 5.3.4');
}
$this->container->foo = array('bar' => 'baz');
unset($this->container['foo']['bar']);
$this->assertSame(array(), $this->container->foo);
}

public function testUpgradeBehaviors()
{
$storage = $this->manager->getStorage();
$storage['foo'] = new \ArrayObject(array('bar' => 'baz'));

$container = new Container('foo', $this->manager);
$this->assertEquals('baz', $container->bar);
$container->baz = 'boo';
$this->assertEquals('boo', $storage['foo']['baz']);
}
}
4 changes: 2 additions & 2 deletions test/SessionArrayStorageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ public function testUnset()

public function testMultiDimensionalUnset()
{
if (version_compare(PHP_VERSION, '5.3.3') <= 0) {
$this->markTestSkipped('Known issue on versions of PHP 5.3.3 or less');
if (version_compare(PHP_VERSION, '5.3.4') < 0) {
$this->markTestSkipped('Known issue on versions of PHP less than 5.3.4');
}
$this->storage['foo'] = array('bar' => array('baz' => 'boo'));
unset($this->storage['foo']['bar']['baz']);
Expand Down
4 changes: 2 additions & 2 deletions test/SessionStorageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ public function testMarkingOneSessionObjectImmutableShouldMarkOtherInstancesImmu

public function testMultiDimensionalUnset()
{
if (version_compare(PHP_VERSION, '5.3.3') <= 0) {
$this->markTestSkipped('Known issue on versions of PHP 5.3.3 or less');
if (version_compare(PHP_VERSION, '5.3.4') < 0) {
$this->markTestSkipped('Known issue on versions of PHP less than 5.3.4');
}
$this->storage['foo'] = array('bar' => array('baz' => 'boo'));
unset($this->storage['foo']['bar']['baz']);
Expand Down
4 changes: 2 additions & 2 deletions test/StorageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ public function testToArrayWithMetaData()

public function testUnsetMultidimensional()
{
if (version_compare(PHP_VERSION, '5.3.3') <= 0) {
$this->markTestSkipped('Known issue on versions of PHP 5.3.3 or less');
if (version_compare(PHP_VERSION, '5.3.4') < 0) {
$this->markTestSkipped('Known issue on versions of PHP less than 5.3.4');
}
$this->storage['foo'] = array('bar' => array('baz' => 'boo'));
unset($this->storage['foo']['bar']['baz']);
Expand Down

0 comments on commit 6cd974a

Please sign in to comment.