Thanks to visit codestin.com
Credit goes to github.com

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

Commit 87505b6

Browse files
weierophinneyweierophinney
committed
Merge branch 'hotfix/3713'
Close zendframework/zendframework#3713 Fixes zendframework/zendframework#3700
166 parents 83e8f34 + 8103f1f + 7ac5858 + c229265 + eb61c8f + efcb00e + 0a0842f + b6d0c88 + 7edee62 + 60ea64c + a08bcca + b40ec3e + 63172ed + 448f428 + 92a516a + 5ecbc99 + a2df21b + 4de87f2 + 7c259ec + a22bdcb + 084ad9f + 9414e5a + 489be93 + cb39e7e + 54a28dc + c9c769e + dda791d + 70d382a + 8bbad0e + 9321185 + 7ab35a6 + b93694e + 3ea7087 + 0fe3d3a + bd5e189 + d1cba17 + 8d75392 + 3fb5b55 + 6cb0ccb + 30aa565 + 8409977 + 8074ba0 + 8f92486 + 94860d1 + 05d33c4 + 425826b + f0e91f0 + e31468f + 7d2af87 + 2e4dc80 + 19d128f + 1b9e4b2 + 1c46483 + fdda3f2 + 595fcd1 + 213395c + 8e514a8 + 2f30186 + bb4ed65 + 132d5b6 + 030ff33 + f2f20f3 + a50e133 + 4c554ee + dbfb1b8 + ccab83f + 00b350f + 78945d0 + f0e5f4b + ceb7d8c + 9e124d1 + 3de5912 + b6a974a + 10a6438 + cb6c1e7 + 18afd6c + 3baf1bd + c800904 + f52dcb8 + 126ccb2 + e7d6206 + e2d24ab + ec1abfc + 290ea90 + 9f4ca1b + edaa760 + c4c0c95 + d21f055 + 5b18029 + e6b97af + 010fb36 + 64c7b8d + 636523e + 4cc2cd6 + e34098a + 16367cd + 943c77f + 8226e5b + 0b47726 + 3cd8a03 + cc4782c + 9c653a6 + 656dbe5 + 9bce1ba + 7dc18ca + 861130d + 2d2ffbd + 4f413a5 + 2e1067a + 1d082e4 + e8aeb79 + b562091 + ff2fdc3 + 4aa72c0 + 1bb67ac + cd015c8 + 5e89910 + 0c21258 + dd54faf + 57f9063 + b88ce2e + af68643 + 06cd3b4 + 2c71b71 + ee02c35 + 9456314 + 5a77a7b + e98a077 + 738f2e6 + cb1e63c + 736df07 + d0a0154 + 990523c + 78687de + a5b6e79 + 6e9dfe9 + e201a1c + d9b45ef + 76222ad + 16d67da + 1ab2258 + b81d711 + ed2e9bc + 61efe82 + f353ea5 + 1f02519 + 58c1fe8 + ed502d9 + 2defba6 + 4885013 + 06a8384 + 17d9eed + 3b21b5d + c62101c + 909ef34 + 13d376a + 8a75367 + 98a3cf5 + 270f2c4 + 3038cfa + 1112202 + c8fb359 + 8d37cd0 + 4d868a7 + 555cb91 + 9b0d171 commit 87505b6

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎src/compatibility/autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?php
2-
if (version_compare(PHP_VERSION, '5.3.3', 'le')) {
2+
if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
33
require_once __DIR__ . '/ArrayObject.php';
44
}

‎test/ArrayObjectTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function testStdPropList()
5353

5454
public function testStdPropListCannotAccessObjectVars()
5555
{
56-
if (version_compare(PHP_VERSION, '5.3.3') <= 0) {
56+
if (version_compare(PHP_VERSION, '5.3.4') < 0) {
5757
$this->markTestSkipped('Behavior is for overwritten ArrayObject in greater than 5.3.3');
5858
}
5959
$this->setExpectedException('InvalidArgumentException');
@@ -162,7 +162,7 @@ public function testIteratorClass()
162162

163163
public function testInvalidIteratorClassThrowsInvalidArgumentException()
164164
{
165-
if (version_compare(PHP_VERSION, '5.3.3') <= 0) {
165+
if (version_compare(PHP_VERSION, '5.3.4') < 0) {
166166
$this->markTestSkipped('Behavior is for overwritten ArrayObject in greater than 5.3.3');
167167
}
168168
$this->setExpectedException('InvalidArgumentException');
@@ -210,7 +210,7 @@ public function testOffsetExists()
210210

211211
public function testOffsetExistsThrowsExceptionOnProtectedProperty()
212212
{
213-
if (version_compare(PHP_VERSION, '5.3.3') <= 0) {
213+
if (version_compare(PHP_VERSION, '5.3.4') < 0) {
214214
$this->markTestSkipped('Behavior is for overwritten ArrayObject in greater than 5.3.3');
215215
}
216216
$this->setExpectedException('InvalidArgumentException');
@@ -232,7 +232,7 @@ public function testOffsetGetOffsetSet()
232232

233233
public function testOffsetGetThrowsExceptionOnProtectedProperty()
234234
{
235-
if (version_compare(PHP_VERSION, '5.3.3') <= 0) {
235+
if (version_compare(PHP_VERSION, '5.3.4') < 0) {
236236
$this->markTestSkipped('Behavior is for overwritten ArrayObject in greater than 5.3.3');
237237
}
238238
$this->setExpectedException('InvalidArgumentException');
@@ -242,7 +242,7 @@ public function testOffsetGetThrowsExceptionOnProtectedProperty()
242242

243243
public function testOffsetSetThrowsExceptionOnProtectedProperty()
244244
{
245-
if (version_compare(PHP_VERSION, '5.3.3') <= 0) {
245+
if (version_compare(PHP_VERSION, '5.3.4') < 0) {
246246
$this->markTestSkipped('Behavior is for overwritten ArrayObject in greater than 5.3.3');
247247
}
248248
$this->setExpectedException('InvalidArgumentException');
@@ -264,7 +264,7 @@ public function testOffsetUnset()
264264

265265
public function testOffsetUnsetMultidimensional()
266266
{
267-
if (version_compare(PHP_VERSION, '5.3.3') <= 0) {
267+
if (version_compare(PHP_VERSION, '5.3.4') < 0) {
268268
$this->markTestSkipped('Behavior is for overwritten ArrayObject in greater than 5.3.3');
269269
}
270270
$ar = new ArrayObject();
@@ -274,7 +274,7 @@ public function testOffsetUnsetMultidimensional()
274274

275275
public function testOffsetUnsetThrowsExceptionOnProtectedProperty()
276276
{
277-
if (version_compare(PHP_VERSION, '5.3.3') <= 0) {
277+
if (version_compare(PHP_VERSION, '5.3.4') < 0) {
278278
$this->markTestSkipped('Behavior is for overwritten ArrayObject in greater than 5.3.3');
279279
}
280280
$this->setExpectedException('InvalidArgumentException');

0 commit comments

Comments
 (0)