Skip to content

Commit a8d901a

Browse files
nikicnikic
committed
Remove zend_version() checks from tests
1 parent df404ec commit a8d901a

File tree

141 files changed

+17
-921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+17
-921
lines changed

‎Zend/tests/bug19859.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
Bug #19859 (__call() does not catch call_user_func_array() calls)
3-
--SKIPIF--
4-
<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
53
--FILE--
64
<?php
75
class test

‎Zend/tests/bug20240.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
Bug #20240 (order of destructor calls)
3-
--SKIPIF--
4-
<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
53
--FILE--
64
<?php
75

‎Zend/tests/bug21478.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
Bug #21478 (Zend/zend_alloc.c :: shutdown_memory_manager produces segfault)
33
--SKIPIF--
44
<?php
5-
if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed');
65
if (!function_exists('stream_filter_register')) die('skip stream_filter_register() not available');
76
?>
87
--FILE--

‎Zend/tests/bug21888.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
--TEST--
22
Bug #21888 (protected property and protected method of the same name)
3-
--SKIPIF--
4-
<?php
5-
if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed');
6-
?>
73
--FILE--
84
<?php
95
class mom {

‎Zend/tests/bug22725.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
Bug #22725 (A derived class can call a parent's protected method that calls a private method)
3-
--SKIPIF--
4-
<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
53
--FILE--
64
<?php
75
class Foo {

‎Zend/tests/bug22836.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
Bug #22836 (returning references to NULL)
3-
--SKIPIF--
4-
<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
53
--FILE--
64
<?php
75
function &f()

‎Zend/tests/bug24436.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
Bug #24436 (isset()/empty() produce errors with non-existent variables in classes)
3-
--SKIPIF--
4-
<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
53
--INI--
64
error_reporting=2047
75
--FILE--

‎Zend/tests/bug24635.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
Bug #24635 (crash on dtor calling other functions)
3-
--SKIPIF--
4-
<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
53
--FILE--
64
<?php
75
class SiteClass {

‎Zend/tests/bug24699.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
Bug #24699 (Memory Leak with per-class constants)
3-
--SKIPIF--
4-
<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
53
--FILE--
64
<?php
75
class TEST { const FOO = SEEK_CUR; };

‎Zend/tests/bug24884.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
Bug #24884 (calling $this->__clone(); crashes php)
3-
--SKIPIF--
4-
<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
53
--FILE--
64
<?php
75
class Test {

‎Zend/tests/bug39304.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Bug #39304 (Segmentation fault with list unpacking of string offset)
44
<?php
55
$s = "";
66
list($a, $b) = $s[0];
7-
echo "I am alive";
7+
var_dump($a,$b);
88
?>
99
--EXPECTF--
1010
Notice: Uninitialized string offset: 0 in %sbug39304.php on line %d
11-
I am alive
12-
11+
NULL
12+
NULL

‎Zend/tests/bug39304_2_4.phpt

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎Zend/tests/dtor_scope.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
Scoping in destructor call
3-
--SKIPIF--
4-
<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
53
--FILE--
64
<?php
75
class T

‎Zend/tests/isset_003_2_4.phpt

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ ReflectionClass::getStaticPropertyValue()
33
--CREDITS--
44
Robin Fernandes <robinf@php.net>
55
Steve Seear <stevseea@php.net>
6-
--SKIPIF--
7-
<?php if (version_compare(zend_version(), '2.4.0', '>=')) die('skip ZendEngine 2.3 or below needed'); ?>
86
--FILE--
97
<?php
108
class A {
@@ -53,17 +51,9 @@ try {
5351
--EXPECTF--
5452
Retrieving static values from A:
5553
string(13) "default value"
56-
string(16) "original private"
57-
string(13) "default value"
58-
string(18) "original protected"
59-
string(15) "original public"
60-
61-
Retrieving static values from B:
62-
string(16) "original private"
63-
string(15) "changed private"
64-
string(17) "changed protected"
65-
string(14) "changed public"
6654

67-
Retrieving non-existent values from A with no default value:
68-
Class A does not have a property named protectedOverridden
69-
Class A does not have a property named privateOverridden
55+
Fatal error: Uncaught ReflectionException: Class A does not have a property named in %s:%d
56+
Stack trace:
57+
#0 %s(%d): ReflectionClass->getStaticPropertyValue('\x00A\x00privateOverr...')
58+
#1 {main}
59+
thrown in %s on line %d

‎ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ ReflectionClass::setStaticPropertyValue()
33
--CREDITS--
44
Robin Fernandes <robinf@php.net>
55
Steve Seear <stevseea@php.net>
6-
--SKIPIF--
7-
<?php if (version_compare(zend_version(), '2.4.0', '>=')) die('skip ZendEngine 2.3 or below needed'); ?>
86
--FILE--
97
<?php
108
class A {
@@ -53,27 +51,9 @@ try {
5351
?>
5452
--EXPECTF--
5553
Set static values in A:
56-
Array
57-
(
58-
[privateOverridden] => new value 1
59-
[protectedOverridden] => new value 2
60-
[publicOverridden] => new value 3
61-
)
6254

63-
Set static values in B:
64-
Array
65-
(
66-
[privateOverridden] => new value 4
67-
[protectedOverridden] => new value 2
68-
[publicOverridden] => new value 3
69-
)
70-
Array
71-
(
72-
[privateOverridden] => new value 5
73-
[protectedOverridden] => new value 6
74-
[publicOverridden] => new value 7
75-
)
76-
77-
Set non-existent values from A with no default value:
78-
Class A does not have a property named protectedOverridden
79-
Class A does not have a property named privateOverridden
55+
Fatal error: Uncaught ReflectionException: Class A does not have a property named in %s:%d
56+
Stack trace:
57+
#0 %s(%d): ReflectionClass->setStaticPropertyValue('\x00A\x00privateOverr...', 'new value 1')
58+
#1 {main}
59+
thrown in %s on line %d

‎ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎ext/standard/tests/array/array_fill_object.phpt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
Test array_fill() function : usage variations - various object values for 'val' argument
3-
--SKIPIF--
4-
<?php if (version_compare(zend_version(), '2.4.0', '>=')) die('skip ZendEngine 2.3 or below needed'); ?>
53
--FILE--
64
<?php
75
/* Prototype : array array_fill(int $start_key, int $num, mixed $val)
@@ -290,23 +288,23 @@ array(2) {
290288
object(Child_test2)#%d (4) {
291289
["member1":"Child_test2":private]=>
292290
int(102)
293-
["member1":"Test2":private]=>
294-
int(100)
295291
["var1"]=>
296292
int(30)
297293
["var2"]=>
298294
int(101)
295+
["member1":"Test2":private]=>
296+
int(100)
299297
}
300298
[1]=>
301299
object(Child_test2)#%d (4) {
302300
["member1":"Child_test2":private]=>
303301
int(102)
304-
["member1":"Test2":private]=>
305-
int(100)
306302
["var1"]=>
307303
int(30)
308304
["var2"]=>
309305
int(101)
306+
["member1":"Test2":private]=>
307+
int(100)
310308
}
311309
}
312310
-- Iteration 6 --

0 commit comments

Comments
 (0)