com php-src: Remove zend_version() checks from test s: Zend/tests/bug19859.phpt Zend/tests/bug2 0240.phpt Zend/tests/bug21478.phpt Ze
nd/tests/bug21888.phpt Zend/tests/bug2272 5.phpt Zend/tests/bug22836.phpt Zend/tests/ bug24436.phpt Zend/tests/bug24635.php t Zend/tests/bug24699.phpt
Zend/tests/bug24 884.phpt Zend/tests/bug39304.phpt Zend/ tests/bug39304_2_4.phpt Zend/tests/dtor _scope.phpt Zend/tests/isset_003_2_4.ph pt
ext/reflection/tests/ReflectionClas

Commit: a8d901a80c307d788abdffac8768d5cd51b6105e Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 30 Jan 2017 22:33:17 +0100 Parents: df404eccb57b58fdcfada0a2424904fac38a2ec4 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a8d901a80c307d788abdffac8768d5cd51b6105e Log: Remove zend_version() checks from tests Changed paths: M Zend/tests/bug19859.phpt M Zend/tests/bug20240.phpt M Zend/tests/bug21478.phpt M Zend/tests/bug21888.phpt M Zend/tests/bug22725.phpt M Zend/tests/bug22836.phpt M Zend/tests/bug24436.phpt M Zend/tests/bug24635.phpt M Zend/tests/bug24699.phpt M Zend/tests/bug24884.phpt M Zend/tests/bug39304.phpt D Zend/tests/bug39304_2_4.phpt M Zend/tests/dtor_scope.phpt D Zend/tests/isset_003_2_4.phpt M ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt D ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt M ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt D ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt M ext/standard/tests/array/array_fill_object.phpt D ext/standard/tests/array/array_fill_object_2_4.phpt M ext/standard/tests/class_object/is_a.phpt M ext/standard/tests/serialize/bug26762.phpt M ext/standard/tests/strings/bug24281.phpt M tests/classes/__call_001.phpt M tests/classes/__call_002..phpt M tests/classes/__set__get_001.phpt M tests/classes/__set__get_002.phpt M tests/classes/__set__get_003.phpt M tests/classes/__set__get_004.phpt M tests/classes/__set__get_005.phpt M tests/classes/__set_data_corrupt.phpt M tests/classes/abstract.phpt M tests/classes/abstract_class.phpt M tests/classes/abstract_derived.phpt M tests/classes/abstract_final.phpt M tests/classes/abstract_inherit.phpt M tests/classes/abstract_not_declared.phpt M tests/classes/abstract_redeclare.phpt M tests/classes/autoload_001.phpt M tests/classes/autoload_002.phpt M tests/classes/autoload_003.phpt M tests/classes/autoload_004.phpt M tests/classes/autoload_005.phpt M tests/classes/autoload_006.phpt M tests/classes/class_abstract.phpt M tests/classes/class_final.phpt M tests/classes/clone_001.phpt M tests/classes/clone_002.phpt M tests/classes/clone_003.phpt M tests/classes/clone_006.phpt M tests/classes/constants_scope_001.phpt M tests/classes/ctor_dtor.phpt M tests/classes/ctor_dtor_inheritance.phpt M tests/classes/dereferencing_001.phpt M tests/classes/destructor_inheritance.phpt M tests/classes/destructor_visibility_001.phpt M tests/classes/destructor_visibility_002.phpt M tests/classes/destructor_visibility_003.phpt M tests/classes/factory_001.phpt M tests/classes/factory_and_singleton_001.phpt M tests/classes/factory_and_singleton_002.phpt M tests/classes/factory_and_singleton_003.phpt M tests/classes/factory_and_singleton_004.phpt M tests/classes/factory_and_singleton_005.phpt M tests/classes/factory_and_singleton_006.phpt M tests/classes/factory_and_singleton_007.phpt M tests/classes/factory_and_singleton_008.phpt M tests/classes/factory_and_singleton_009.phpt M tests/classes/factory_and_singleton_010.phpt M tests/classes/final.phpt M tests/classes/final_abstract.phpt M tests/classes/final_redeclare.phpt M tests/classes/inheritance_002.phpt M tests/classes/interface_and_extends.phpt M tests/classes/interface_class.phpt M tests/classes/interface_doubled.phpt M tests/classes/interface_implemented.phpt M tests/classes/interface_instantiate.phpt M tests/classes/interface_member.phpt M tests/classes/interface_method.phpt M tests/classes/interface_method_final.phpt M tests/classes/interface_method_private.phpt M tests/classes/interface_must_be_implemented.phpt M tests/classes/interface_optional_arg.phpt M tests/classes/interface_optional_arg_002.phpt M tests/classes/interfaces_001.phpt M tests/classes/interfaces_002.phpt M tests/classes/iterators_001.phpt M tests/classes/iterators_002.phpt M tests/classes/iterators_003.phpt M tests/classes/iterators_004.phpt M tests/classes/iterators_005.phpt M tests/classes/iterators_006.phpt M tests/classes/method_override_optional_arg_001.phpt M tests/classes/object_reference_001.phpt M tests/classes/private_001.phpt M tests/classes/private_002.phpt M tests/classes/private_003.phpt M tests/classes/private_003b.phpt M tests/classes/private_004.phpt M tests/classes/private_004b.phpt M tests/classes/private_005..phpt M tests/classes/private_005b.phpt M tests/classes/private_006.phpt M tests/classes/private_006b.phpt M tests/classes/private_007.phpt M tests/classes/private_007b.phpt M tests/classes/private_members.phpt M tests/classes/protected_001.phpt M tests/classes/protected_001b.phpt M tests/classes/protected_002.phpt M tests/classes/singleton_001.phpt M tests/classes/static_mix_1.phpt M tests/classes/static_mix_2.phpt M tests/classes/static_properties_001.phpt M tests/classes/this.phpt M tests/classes/tostring_002.phpt M tests/classes/type_hinting_001.phpt M tests/classes/type_hinting_002.phpt M tests/classes/visibility_000a.phpt M tests/classes/visibility_000b.phpt M tests/classes/visibility_000c.phpt M tests/classes/visibility_001a.phpt M tests/classes/visibility_001b.phpt M tests/classes/visibility_001c.phpt M tests/classes/visibility_002a.phpt M tests/classes/visibility_002b.phpt M tests/classes/visibility_002c.phpt M tests/classes/visibility_003a.phpt M tests/classes/visibility_003b.phpt M tests/classes/visibility_003c.phpt M tests/classes/visibility_004a.phpt M tests/classes/visibility_004b.phpt M tests/classes/visibility_004c.phpt M tests/lang/035.phpt M tests/lang/bug21961.phpt M tests/lang/bug7515.phpt M tests/lang/error_2_exception_001.phpt M tests/lang/type_hints_001.phpt M tests/lang/type_hints_002.phpt M tests/lang/type_hints_003.phpt

diff --git a/Zend/tests/bug19859.phpt b/Zend/tests/bug19859.phpt index d961b75..6eb1701 100644 --- a/Zend/tests/bug19859.phpt +++ b/Zend/tests/bug19859.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #19859 (__call() does not catch call_user_func_array() calls) ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?> --FILE-- <?php class test diff --git a/Zend/tests/bug20240.phpt b/Zend/tests/bug20240.phpt index 53bb050..9e2f23b 100644 --- a/Zend/tests/bug20240.phpt +++ b/Zend/tests/bug20240.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #20240 (order of destructor calls) ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?> --FILE-- <?php diff --git a/Zend/tests/bug21478.phpt b/Zend/tests/bug21478.phpt index 5955c4c..6e07a37 100644 --- a/Zend/tests/bug21478.phpt +++ b/Zend/tests/bug21478.phpt @@ -2,7 +2,6 @@ Bug #21478 (Zend/zend_alloc.c :: shutdown_memory_manager produces segfault) --SKIPIF-- <?php - if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); if (!function_exists('stream_filter_register')) die('skip stream_filter_register() not available'); ?> --FILE-- diff --git a/Zend/tests/bug21888.phpt b/Zend/tests/bug21888.phpt index a13da19..b32bd35 100644 --- a/Zend/tests/bug21888.phpt +++ b/Zend/tests/bug21888.phpt @@ -1,9 +1,5 @@ --TEST-- Bug #21888 (protected property and protected method of the same name) ---SKIPIF-- -<?php - if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); -?> --FILE-- <?php class mom { diff --git a/Zend/tests/bug22725.phpt b/Zend/tests/bug22725.phpt index 5f3c258..e5dc49d 100644 --- a/Zend/tests/bug22725.phpt +++ b/Zend/tests/bug22725.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #22725 (A derived class can call a parent's protected method that calls a private method) ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class Foo { diff --git a/Zend/tests/bug22836.phpt b/Zend/tests/bug22836.phpt index 06a5c32..205fd1c 100644 --- a/Zend/tests/bug22836.phpt +++ b/Zend/tests/bug22836.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #22836 (returning references to NULL) ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?> --FILE-- <?php function &f() diff --git a/Zend/tests/bug24436.phpt b/Zend/tests/bug24436.phpt index 0c261b6..11b8702 100644 --- a/Zend/tests/bug24436.phpt +++ b/Zend/tests/bug24436.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #24436 (isset()/empty() produce errors with non-existent variables in classes) ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?> --INI-- error_reporting=2047 --FILE-- diff --git a/Zend/tests/bug24635.phpt b/Zend/tests/bug24635.phpt index d9466d9..758a803 100644 --- a/Zend/tests/bug24635.phpt +++ b/Zend/tests/bug24635.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #24635 (crash on dtor calling other functions) ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?> --FILE-- <?php class SiteClass { diff --git a/Zend/tests/bug24699.phpt b/Zend/tests/bug24699.phpt index 81ca4f5..0958a6e 100644 --- a/Zend/tests/bug24699.phpt +++ b/Zend/tests/bug24699.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #24699 (Memory Leak with per-class constants) ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?> --FILE-- <?php class TEST { const FOO = SEEK_CUR; }; diff --git a/Zend/tests/bug24884.phpt b/Zend/tests/bug24884.phpt index 457acd0..3788479 100644 --- a/Zend/tests/bug24884.phpt +++ b/Zend/tests/bug24884.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #24884 (calling $this->__clone(); crashes php) ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class Test { diff --git a/Zend/tests/bug39304.phpt b/Zend/tests/bug39304.phpt index 2e9ebcd..77da1a8 100644 --- a/Zend/tests/bug39304.phpt +++ b/Zend/tests/bug39304.phpt @@ -4,9 +4,9 @@ Bug #39304 (Segmentation fault with list unpacking of string offset) <?php $s = ""; list($a, $b) = $s[0]; -echo "I am alive"; + var_dump($a,$b); ?> --EXPECTF-- Notice: Uninitialized string offset: 0 in %sbug39304.php on line %d -I am alive - +NULL +NULL diff --git a/Zend/tests/bug39304_2_4.phpt b/Zend/tests/bug39304_2_4.phpt deleted file mode 100644 index 917c64e..0000000 --- a/Zend/tests/bug39304_2_4.phpt +++ /dev/null @@ -1,14 +0,0 @@ ---TEST-- -Bug #39304 (Segmentation fault with list unpacking of string offset) ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.4.0', '<')) die('skip ZendEngine 2.4 needed'); ?> ---FILE-- -<?php - $s = ""; - list($a, $b) = $s[0]; - var_dump($a,$b); -?> ---EXPECTF-- -Notice: Uninitialized string offset: 0 in %sbug39304_2_4.php on line %d -NULL -NULL diff --git a/Zend/tests/dtor_scope.phpt b/Zend/tests/dtor_scope.phpt index ab991cf..80f42ca 100644 --- a/Zend/tests/dtor_scope.phpt +++ b/Zend/tests/dtor_scope.phpt @@ -1,7 +1,5 @@ --TEST-- Scoping in destructor call ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class T diff --git a/Zend/tests/isset_003_2_4.phpt b/Zend/tests/isset_003_2_4.phpt deleted file mode 100644 index 42d8cc6..0000000 --- a/Zend/tests/isset_003_2_4.phpt +++ /dev/null @@ -1,42 +0,0 @@ ---TEST-- -Testing isset accessing undefined array itens and properties ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.4.0', '<')) die('skip ZendEngine 2.4 needed'); ?> ---FILE-- -<?php - -$a = 'foo'; -$b =& $a; - -var_dump(isset($b)); - -var_dump(isset($a[0], $b[1])); - -var_dump(isset($a[0]->a)); - -var_dump(isset($c[0][1][2]->a->b->c->d)); - -var_dump(isset(${$a}->{$b->{$c[$d]}})); - -var_dump(isset($GLOBALS)); - -var_dump(isset($GLOBALS[1])); - -var_dump(isset($GLOBALS[1]->$GLOBALS)); - -?> ---EXPECTF-- -bool(true) -bool(true) -bool(false) -bool(false) - -Notice: Undefined variable: c in %s on line %d - -Notice: Undefined variable: d in %s on line %d - -Notice: Trying to get property of non-object in %s on line %d -bool(false) -bool(true) -bool(false) -bool(false) diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt index ffd81ff..ab8afb8 100644 --- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt @@ -3,8 +3,6 @@ ReflectionClass::getStaticPropertyValue() --CREDITS-- Robin Fernandes <robinf@php.net> Steve Seear <stevseea@php.net> ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.4.0', '>=')) die('skip ZendEngine 2.3 or below needed'); ?> --FILE-- <?php class A { @@ -53,17 +51,9 @@ try { --EXPECTF-- Retrieving static values from A: string(13) "default value" -string(16) "original private" -string(13) "default value" -string(18) "original protected" -string(15) "original public" - -Retrieving static values from B: -string(16) "original private" -string(15) "changed private" -string(17) "changed protected" -string(14) "changed public" -Retrieving non-existent values from A with no default value: -Class A does not have a property named protectedOverridden -Class A does not have a property named privateOverridden +Fatal error: Uncaught ReflectionException: Class A does not have a property named in %s:%d +Stack trace: +#0 %s(%d): ReflectionClass->getStaticPropertyValue('\x00A\x00privateOverr...') +#1 {main} + thrown in %s on line %d diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt deleted file mode 100644 index 02f7595..0000000 --- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt +++ /dev/null @@ -1,61 +0,0 @@ ---TEST-- -ReflectionClass::getStaticPropertyValue() ---CREDITS-- -Robin Fernandes <robinf@php.net> -Steve Seear <stevseea@php.net> ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.4.0', '<')) die('skip ZendEngine 2.4 needed'); ?> ---FILE-- -<?php -class A { - static private $privateOverridden = "original private"; - static protected $protectedOverridden = "original protected"; - static public $publicOverridden = "original public"; -} - -class B extends A { - static private $privateOverridden = "changed private"; - static protected $protectedOverridden = "changed protected"; - static public $publicOverridden = "changed public"; -} - -echo "Retrieving static values from A:\n"; -$rcA = new ReflectionClass('A'); -var_dump($rcA->getStaticPropertyValue("privateOverridden", "default value")); -var_dump($rcA->getStaticPropertyValue("\0A\0privateOverridden")); -var_dump($rcA->getStaticPropertyValue("protectedOverridden", "default value")); -var_dump($rcA->getStaticPropertyValue("\0*\0protectedOverridden")); -var_dump($rcA->getStaticPropertyValue("publicOverridden")); - -echo "\nRetrieving static values from B:\n"; -$rcB = new ReflectionClass('B'); -var_dump($rcB->getStaticPropertyValue("\0A\0privateOverridden")); -var_dump($rcB->getStaticPropertyValue("\0B\0privateOverridden")); -var_dump($rcB->getStaticPropertyValue("\0*\0protectedOverridden")); -var_dump($rcB->getStaticPropertyValue("publicOverridden")); - -echo "\nRetrieving non-existent values from A with no default value:\n"; -try { - var_dump($rcA->getStaticPropertyValue("protectedOverridden")); - echo "you should not see this"; -} catch (Exception $e) { - echo $e->getMessage() . "\n"; -} - -try { - var_dump($rcA->getStaticPropertyValue("privateOverridden")); - echo "you should not see this"; -} catch (Exception $e) { - echo $e->getMessage() . "\n"; -} - -?> ---EXPECTF-- -Retrieving static values from A: -string(13) "default value" - -Fatal error: Uncaught ReflectionException: Class A does not have a property named in %sReflectionClass_getStaticPropertyValue_001_2_4.php:%d -Stack trace: -#0 %sReflectionClass_getStaticPropertyValue_001_2_4.php(%d): ReflectionClass->getStaticPropertyValue('\x00A\x00privateOverr...') -#1 {main} - thrown in %sReflectionClass_getStaticPropertyValue_001_2_4.php on line %d diff --git a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt index 9e8f01e..0004f3f 100644 --- a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt +++ b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt @@ -3,8 +3,6 @@ ReflectionClass::setStaticPropertyValue() --CREDITS-- Robin Fernandes <robinf@php.net> Steve Seear <stevseea@php.net> ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.4.0', '>=')) die('skip ZendEngine 2.3 or below needed'); ?> --FILE-- <?php class A { @@ -53,27 +51,9 @@ try { ?> --EXPECTF-- Set static values in A: -Array -( - [privateOverridden] => new value 1 - [protectedOverridden] => new value 2 - [publicOverridden] => new value 3 -) -Set static values in B: -Array -( - [privateOverridden] => new value 4 - [protectedOverridden] => new value 2 - [publicOverridden] => new value 3 -) -Array -( - [privateOverridden] => new value 5 - [protectedOverridden] => new value 6 - [publicOverridden] => new value 7 -) - -Set non-existent values from A with no default value: -Class A does not have a property named protectedOverridden -Class A does not have a property named privateOverridden +Fatal error: Uncaught ReflectionException: Class A does not have a property named in %s:%d +Stack trace: +#0 %s(%d): ReflectionClass->setStaticPropertyValue('\x00A\x00privateOverr...', 'new value 1') +#1 {main} + thrown in %s on line %d diff --git a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt deleted file mode 100644 index 6720d2d..0000000 --- a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt +++ /dev/null @@ -1,61 +0,0 @@ ---TEST-- -ReflectionClass::setStaticPropertyValue() ---CREDITS-- -Robin Fernandes <robinf@php.net> -Steve Seear <stevseea@php.net> ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.4.0', '<')) die('skip ZendEngine 2.4 needed'); ?> ---FILE-- -<?php -class A { - static private $privateOverridden = "original private"; - static protected $protectedOverridden = "original protected"; - static public $publicOverridden = "original public"; -} - -class B extends A { - static private $privateOverridden = "changed private"; - static protected $protectedOverridden = "changed protected"; - static public $publicOverridden = "changed public"; -} - -echo "Set static values in A:\n"; -$rcA = new ReflectionClass('A'); -$rcA->setStaticPropertyValue("\0A\0privateOverridden", "new value 1"); -$rcA->setStaticPropertyValue("\0*\0protectedOverridden", "new value 2"); -$rcA->setStaticPropertyValue("publicOverridden", "new value 3"); -print_r($rcA->getStaticProperties()); - -echo "\nSet static values in B:\n"; -$rcB = new ReflectionClass('B'); -$rcB->setStaticPropertyValue("\0A\0privateOverridden", "new value 4"); -$rcB->setStaticPropertyValue("\0B\0privateOverridden", "new value 5"); -$rcB->setStaticPropertyValue("\0*\0protectedOverridden", "new value 6"); -$rcB->setStaticPropertyValue("publicOverridden", "new value 7"); -print_r($rcA->getStaticProperties()); -print_r($rcB->getStaticProperties()); - -echo "\nSet non-existent values from A with no default value:\n"; -try { - var_dump($rcA->setStaticPropertyValue("protectedOverridden", "new value 8")); - echo "you should not see this"; -} catch (Exception $e) { - echo $e->getMessage() . "\n"; -} - -try { - var_dump($rcA->setStaticPropertyValue("privateOverridden", "new value 9")); - echo "you should not see this"; -} catch (Exception $e) { - echo $e->getMessage() . "\n"; -} - -?> ---EXPECTF-- -Set static values in A: - -Fatal error: Uncaught ReflectionException: Class A does not have a property named in %sReflectionClass_setStaticPropertyValue_001_2_4.php:%d -Stack trace: -#0 %sReflectionClass_setStaticPropertyValue_001_2_4.php(%d): ReflectionClass->setStaticPropertyValue('\x00A\x00privateOverr...', 'new value 1') -#1 {main} - thrown in %sReflectionClass_setStaticPropertyValue_001_2_4.php on line %d diff --git a/ext/standard/tests/array/array_fill_object.phpt b/ext/standard/tests/array/array_fill_object.phpt index 86773b1..aa1db04 100644 --- a/ext/standard/tests/array/array_fill_object.phpt +++ b/ext/standard/tests/array/array_fill_object.phpt @@ -1,7 +1,5 @@ --TEST-- Test array_fill() function : usage variations - various object values for 'val' argument ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.4.0', '>=')) die('skip ZendEngine 2.3 or below needed'); ?> --FILE-- <?php /* Prototype : array array_fill(int $start_key, int $num, mixed $val) @@ -290,23 +288,23 @@ array(2) { object(Child_test2)#%d (4) { ["member1":"Child_test2":private]=> int(102) - ["member1":"Test2":private]=> - int(100) ["var1"]=> int(30) ["var2"]=> int(101) + ["member1":"Test2":private]=> + int(100) } [1]=> object(Child_test2)#%d (4) { ["member1":"Child_test2":private]=> int(102) - ["member1":"Test2":private]=> - int(100) ["var1"]=> int(30) ["var2"]=> int(101) + ["member1":"Test2":private]=> + int(100) } } -- Iteration 6 -- diff --git a/ext/standard/tests/array/array_fill_object_2_4.phpt b/ext/standard/tests/array/array_fill_object_2_4.phpt deleted file mode 100644 index fb81797..0000000 --- a/ext/standard/tests/array/array_fill_object_2_4.phpt +++ /dev/null @@ -1,434 +0,0 @@ ---TEST-- -Test array_fill() function : usage variations - various object values for 'val' argument ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.4.0', '<')) die('skip ZendEngine 2.4 needed'); ?> ---FILE-- -<?php -/* Prototype : array array_fill(int $start_key, int $num, mixed $val) - * Description: Create an array containing num elements starting with index start_key each initialized to val - * Source code: ext/standard/array.c - */ - -/* - * testing array_fill() by passing various object values for 'val' argument - */ - -echo "*** Testing array_fill() : usage variations ***\n"; - -// Initialise function arguments not being substituted -$start_key = 0; -$num = 2; - -// class without a member -class Test -{ -} - -//class with public member, static member , constant and consturctor to initialize the public member -class Test1 -{ - const test1_constant = "test1"; - public static $test1_static = 0; - public $member1; - var $var1 = 30; - var $var2; - - function __construct($value1 , $value2) - { - $this->member1 = $value1; - $this->var2 = $value2; - } -} - -// child class which inherits parent class test1 -class Child_test1 extends Test1 -{ - public $member2; - - function __construct($value1 , $value2 , $value3) - { - parent::__construct($value1 , $value2); - $this->member2 = $value3; - } -} - -//class with private member, static member, constant and constructor to initialize the private member -class Test2 -{ - const test2_constant = "test2"; - public static $test2_static = 0; - private $member1; - var $var1 = 30; - var $var2; - - function __construct($value1 , $value2) - { - $this->member1 = $value1; - $this->var2 = $value2; - } -} - -// child class which inherits parent class test2 -class Child_test2 extends Test2 -{ - private $member1; - - function __construct($value1 , $value2 , $value3) - { - parent::__construct($value1 , $value2); - $this->member1 = $value3; - } -} - -// class with protected member, static member, constant and consturctor to initialize the protected member -class Test3 -{ - const test3_constant = "test3"; - public static $test3_static = 0; - protected $member1; - var $var1 = 30; - var $var2; - - function __construct($value1 , $value2) - { - $this->member1 = $value1; - $this->var2 = $value2; - } -} - -// child class which inherits parent class test3 -class Child_test3 extends Test3 -{ - protected $member1; - - function __construct($value1 , $value2 , $value3) - { - parent::__construct($value1 , $value2); - $this->member1 = $value3; - } -} - -// class with public, private, protected members, static, constant members and constructor to initialize all the members -class Test4 -{ - const test4_constant = "test4"; - public static $test4_static = 0; - public $member1; - private $member2; - protected $member3; - - function __construct($value1 , $value2 , $value3) - { - $this->member1 = $value1; - $this->member2 = $value2; - $this->member3 = $value3; - } -} - -// child class which inherits parent class test4 -class Child_test4 extends Test4 -{ - var $var1; - - function __construct($value1 , $value2 , $value3 , $value4) - { - parent::__construct($value1 , $value2 , $value3); - $this->var1 = $value4; - } -} - -// abstract class with public, private, protected members -abstract class AbstractClass -{ - public $member1; - private $member2; - protected $member3; - var $var1 = 30; - - abstract protected function display(); -} - -// implement abstract 'AbstractClass' class -class ConcreteClass1 extends AbstractClass -{ - protected function display() - { - echo "class name is ConcreteClass1 \n"; - } -} - - -// declarationn of the interface 'iTemplate' -interface iTemplate -{ - public function display(); -} - -// implement the interface 'iTemplate' -class Template1 implements iTemplate -{ - public function display() - { - echo "class name is Template1\n"; - } -} - -//array of object values for 'val' argument -$objects = array( - - /* 1 */ new Test(), - new Test1(100 , 101), - new Child_test1(100 , 101 , 102), - new Test2(100 , 101), - /* 5 */ new Child_test2(100 , 101 , 102), - new Test3(100 , 101), - new Child_test3(100 , 101 , 102), - new Test4( 100 , 101 , 102), - new Child_test4(100 , 101 , 102 , 103), - new ConcreteClass1(), - /* 11 */ new Template1() -); - -// loop through each element of the array for 'val' argument -// check the working of array_fill() -echo "--- Testing array_fill() with different object values for 'val' argument ---\n"; -$counter = 1; -for($index = 0; $index < count($objects); $index ++) -{ - echo "-- Iteration $counter --\n"; - $val = $objects[$index]; - - var_dump( array_fill($start_key,$num,$val) ); - - $counter++; -} - -echo "Done"; -?> ---EXPECTF-- -*** Testing array_fill() : usage variations *** ---- Testing array_fill() with different object values for 'val' argument --- --- Iteration 1 -- -array(2) { - [0]=> - object(Test)#%d (0) { - } - [1]=> - object(Test)#%d (0) { - } -} --- Iteration 2 -- -array(2) { - [0]=> - object(Test1)#%d (3) { - ["member1"]=> - int(100) - ["var1"]=> - int(30) - ["var2"]=> - int(101) - } - [1]=> - object(Test1)#%d (3) { - ["member1"]=> - int(100) - ["var1"]=> - int(30) - ["var2"]=> - int(101) - } -} --- Iteration 3 -- -array(2) { - [0]=> - object(Child_test1)#%d (4) { - ["member2"]=> - int(102) - ["member1"]=> - int(100) - ["var1"]=> - int(30) - ["var2"]=> - int(101) - } - [1]=> - object(Child_test1)#%d (4) { - ["member2"]=> - int(102) - ["member1"]=> - int(100) - ["var1"]=> - int(30) - ["var2"]=> - int(101) - } -} --- Iteration 4 -- -array(2) { - [0]=> - object(Test2)#%d (3) { - ["member1":"Test2":private]=> - int(100) - ["var1"]=> - int(30) - ["var2"]=> - int(101) - } - [1]=> - object(Test2)#%d (3) { - ["member1":"Test2":private]=> - int(100) - ["var1"]=> - int(30) - ["var2"]=> - int(101) - } -} --- Iteration 5 -- -array(2) { - [0]=> - object(Child_test2)#%d (4) { - ["member1":"Child_test2":private]=> - int(102) - ["var1"]=> - int(30) - ["var2"]=> - int(101) - ["member1":"Test2":private]=> - int(100) - } - [1]=> - object(Child_test2)#%d (4) { - ["member1":"Child_test2":private]=> - int(102) - ["var1"]=> - int(30) - ["var2"]=> - int(101) - ["member1":"Test2":private]=> - int(100) - } -} --- Iteration 6 -- -array(2) { - [0]=> - object(Test3)#%d (3) { - ["member1":protected]=> - int(100) - ["var1"]=> - int(30) - ["var2"]=> - int(101) - } - [1]=> - object(Test3)#%d (3) { - ["member1":protected]=> - int(100) - ["var1"]=> - int(30) - ["var2"]=> - int(101) - } -} --- Iteration 7 -- -array(2) { - [0]=> - object(Child_test3)#%d (3) { - ["member1":protected]=> - int(102) - ["var1"]=> - int(30) - ["var2"]=> - int(101) - } - [1]=> - object(Child_test3)#%d (3) { - ["member1":protected]=> - int(102) - ["var1"]=> - int(30) - ["var2"]=> - int(101) - } -} --- Iteration 8 -- -array(2) { - [0]=> - object(Test4)#%d (3) { - ["member1"]=> - int(100) - ["member2":"Test4":private]=> - int(101) - ["member3":protected]=> - int(102) - } - [1]=> - object(Test4)#%d (3) { - ["member1"]=> - int(100) - ["member2":"Test4":private]=> - int(101) - ["member3":protected]=> - int(102) - } -} --- Iteration 9 -- -array(2) { - [0]=> - object(Child_test4)#%d (4) { - ["var1"]=> - int(103) - ["member1"]=> - int(100) - ["member2":"Test4":private]=> - int(101) - ["member3":protected]=> - int(102) - } - [1]=> - object(Child_test4)#%d (4) { - ["var1"]=> - int(103) - ["member1"]=> - int(100) - ["member2":"Test4":private]=> - int(101) - ["member3":protected]=> - int(102) - } -} --- Iteration 10 -- -array(2) { - [0]=> - object(ConcreteClass1)#%d (4) { - ["member1"]=> - NULL - ["member2":"AbstractClass":private]=> - NULL - ["member3":protected]=> - NULL - ["var1"]=> - int(30) - } - [1]=> - object(ConcreteClass1)#%d (4) { - ["member1"]=> - NULL - ["member2":"AbstractClass":private]=> - NULL - ["member3":protected]=> - NULL - ["var1"]=> - int(30) - } -} --- Iteration 11 -- -array(2) { - [0]=> - object(Template1)#%d (0) { - } - [1]=> - object(Template1)#%d (0) { - } -} -Done diff --git a/ext/standard/tests/class_object/is_a.phpt b/ext/standard/tests/class_object/is_a.phpt index 832d555..db74cdc 100644 --- a/ext/standard/tests/class_object/is_a.phpt +++ b/ext/standard/tests/class_object/is_a.phpt @@ -1,7 +1,5 @@ --TEST-- is_a and is_subclass_of behaviour (with and without autoload) ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/ext/standard/tests/serialize/bug26762.phpt b/ext/standard/tests/serialize/bug26762.phpt index 3011bb6..dd77978 100644 --- a/ext/standard/tests/serialize/bug26762.phpt +++ b/ext/standard/tests/serialize/bug26762.phpt @@ -2,7 +2,6 @@ Bug #26762 (unserialize() produces lowercase classnames) --SKIPIF-- <?php - if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); if (class_exists('autoload_root')) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/ext/standard/tests/strings/bug24281.phpt b/ext/standard/tests/strings/bug24281.phpt index 3c041d6..66a3091 100644 --- a/ext/standard/tests/strings/bug24281.phpt +++ b/ext/standard/tests/strings/bug24281.phpt @@ -1,9 +1,5 @@ --TEST-- Bug #24281 (str_replace count not returned if variable wasn't initialized) ---SKIPIF-- -<?php - if (version_compare(zend_version(), '2.0.0-dev', '<')) die('SKIP PHP5 functionality'); -?> --FILE-- <?php $string = "He had had to have had it"; diff --git a/tests/classes/__call_001.phpt b/tests/classes/__call_001.phpt index f9708e0..be2d024 100644 --- a/tests/classes/__call_001.phpt +++ b/tests/classes/__call_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 __call() ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/__call_002.phpt b/tests/classes/__call_002.phpt index 53a179f..f58ec47 100644 --- a/tests/classes/__call_002.phpt +++ b/tests/classes/__call_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 __call() signature check ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/__set__get_001.phpt b/tests/classes/__set__get_001.phpt index beb688c..3c9cb09 100644 --- a/tests/classes/__set__get_001.phpt +++ b/tests/classes/__set__get_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 __set() and __get() ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class setter { diff --git a/tests/classes/__set__get_002.phpt b/tests/classes/__set__get_002.phpt index 71111cc..5d3b5db 100644 --- a/tests/classes/__set__get_002.phpt +++ b/tests/classes/__set__get_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 __get() signature check ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class Test { diff --git a/tests/classes/__set__get_003.phpt b/tests/classes/__set__get_003.phpt index 390d303..16b09b7 100644 --- a/tests/classes/__set__get_003.phpt +++ b/tests/classes/__set__get_003.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 __set() signature check ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class Test { diff --git a/tests/classes/__set__get_004.phpt b/tests/classes/__set__get_004.phpt index e3061da..523ccce 100644 --- a/tests/classes/__set__get_004.phpt +++ b/tests/classes/__set__get_004.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 __set() and __get() ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class Test { diff --git a/tests/classes/__set__get_005.phpt b/tests/classes/__set__get_005.phpt index d8bbad3..fd23cf6 100644 --- a/tests/classes/__set__get_005.phpt +++ b/tests/classes/__set__get_005.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 __set() and __get() ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class Test diff --git a/tests/classes/__set_data_corrupt.phpt b/tests/classes/__set_data_corrupt.phpt index 6a52bd4..8b51302 100644 --- a/tests/classes/__set_data_corrupt.phpt +++ b/tests/classes/__set_data_corrupt.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 Data corruption in __set ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?> --FILE-- <?php $f = 'c="foo"'; diff --git a/tests/classes/abstract.phpt b/tests/classes/abstract.phpt index 5852005..f46e513 100644 --- a/tests/classes/abstract.phpt +++ b/tests/classes/abstract.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An abstract method may not be called ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/abstract_class.phpt b/tests/classes/abstract_class.phpt index 2085bff..fabe890 100644 --- a/tests/classes/abstract_class.phpt +++ b/tests/classes/abstract_class.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An abstract class cannot be instantiated ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/abstract_derived.phpt b/tests/classes/abstract_derived.phpt index 0feceac..21f8fd8 100644 --- a/tests/classes/abstract_derived.phpt +++ b/tests/classes/abstract_derived.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A derived class with an abstract method must be abstract ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/abstract_final.phpt b/tests/classes/abstract_final.phpt index 20c7ae3..cdf61d1 100644 --- a/tests/classes/abstract_final.phpt +++ b/tests/classes/abstract_final.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A final method cannot be abstract ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/abstract_inherit.phpt b/tests/classes/abstract_inherit.phpt index 583043d..1acf19d 100644 --- a/tests/classes/abstract_inherit.phpt +++ b/tests/classes/abstract_inherit.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A class that inherits an abstract method is abstract ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/abstract_not_declared.phpt b/tests/classes/abstract_not_declared.phpt index 3b81cd4..8c2d880 100644 --- a/tests/classes/abstract_not_declared.phpt +++ b/tests/classes/abstract_not_declared.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An abstract class must be declared abstract ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/abstract_redeclare.phpt b/tests/classes/abstract_redeclare.phpt index 9a0a1ed..8e09a3a 100644 --- a/tests/classes/abstract_redeclare.phpt +++ b/tests/classes/abstract_redeclare.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A method cannot be redeclared abstract ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt index 6f325f4..6b520b7 100644 --- a/tests/classes/autoload_001.phpt +++ b/tests/classes/autoload_001.phpt @@ -2,7 +2,6 @@ ZE2 Autoload and class_exists --SKIPIF-- <?php - if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt index 27dea0f..582cb46 100644 --- a/tests/classes/autoload_002.phpt +++ b/tests/classes/autoload_002.phpt @@ -2,7 +2,6 @@ ZE2 Autoload and get_class_methods --SKIPIF-- <?php - if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_003.phpt b/tests/classes/autoload_003.phpt index 7bdb5da..41e877c 100644 --- a/tests/classes/autoload_003.phpt +++ b/tests/classes/autoload_003.phpt @@ -2,7 +2,6 @@ ZE2 Autoload and derived classes --SKIPIF-- <?php - if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_004.phpt b/tests/classes/autoload_004.phpt index 23aea5d..88b10b5 100644 --- a/tests/classes/autoload_004.phpt +++ b/tests/classes/autoload_004.phpt @@ -2,7 +2,6 @@ ZE2 Autoload and recursion --SKIPIF-- <?php - if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt index 36a4e18..c574139 100644 --- a/tests/classes/autoload_005.phpt +++ b/tests/classes/autoload_005.phpt @@ -2,7 +2,6 @@ ZE2 Autoload from destructor --SKIPIF-- <?php - if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_006.phpt b/tests/classes/autoload_006.phpt index 9af6fc9..173b87d 100644 --- a/tests/classes/autoload_006.phpt +++ b/tests/classes/autoload_006.phpt @@ -2,7 +2,6 @@ ZE2 Autoload from destructor --SKIPIF-- <?php - if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/class_abstract.phpt b/tests/classes/class_abstract.phpt index 10fcdba..fe95d9b 100644 --- a/tests/classes/class_abstract.phpt +++ b/tests/classes/class_abstract.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An abstract class cannot be instanciated ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/class_final.phpt b/tests/classes/class_final.phpt index 5c73cb2..45cbc72 100644 --- a/tests/classes/class_final.phpt +++ b/tests/classes/class_final.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A final class cannot be inherited ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/clone_001.phpt b/tests/classes/clone_001.phpt index eb06c1f..e1d200b 100644 --- a/tests/classes/clone_001.phpt +++ b/tests/classes/clone_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 object cloning, 1 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class test { diff --git a/tests/classes/clone_002.phpt b/tests/classes/clone_002.phpt index 4430a2c..b2f73b4 100644 --- a/tests/classes/clone_002.phpt +++ b/tests/classes/clone_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 object cloning, 2 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class test { diff --git a/tests/classes/clone_003.phpt b/tests/classes/clone_003.phpt index 9a251c5..e595a59 100644 --- a/tests/classes/clone_003.phpt +++ b/tests/classes/clone_003.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 object cloning, 3 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class base { diff --git a/tests/classes/clone_006.phpt b/tests/classes/clone_006.phpt index 713670a..d8a6140 100644 --- a/tests/classes/clone_006.phpt +++ b/tests/classes/clone_006.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 object cloning, 6 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --INI-- error_reporting=2047 --FILE-- diff --git a/tests/classes/constants_scope_001.phpt b/tests/classes/constants_scope_001.phpt index 5006628..c2585b2 100644 --- a/tests/classes/constants_scope_001.phpt +++ b/tests/classes/constants_scope_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 class constants and scope ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/ctor_dtor.phpt b/tests/classes/ctor_dtor.phpt index 6af863e..3f57a31 100644 --- a/tests/classes/ctor_dtor.phpt +++ b/tests/classes/ctor_dtor.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 The new constructor/destructor is called ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/ctor_dtor_inheritance.phpt b/tests/classes/ctor_dtor_inheritance.phpt index 8ae2a5d..fc43727 100644 --- a/tests/classes/ctor_dtor_inheritance.phpt +++ b/tests/classes/ctor_dtor_inheritance.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A derived class can use the inherited constructor/destructor ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/dereferencing_001.phpt b/tests/classes/dereferencing_001.phpt index 886baeb..e7e90cf 100644 --- a/tests/classes/dereferencing_001.phpt +++ b/tests/classes/dereferencing_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 dereferencing of objects from methods ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/destructor_inheritance.phpt b/tests/classes/destructor_inheritance.phpt index 868c896..f267a74 100644 --- a/tests/classes/destructor_inheritance.phpt +++ b/tests/classes/destructor_inheritance.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 The inherited destructor is called ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class base { diff --git a/tests/classes/destructor_visibility_001.phpt b/tests/classes/destructor_visibility_001.phpt index b99c0b2..b48d000 100644 --- a/tests/classes/destructor_visibility_001.phpt +++ b/tests/classes/destructor_visibility_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 Ensuring destructor visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/destructor_visibility_002.phpt b/tests/classes/destructor_visibility_002.phpt index 2cc8333..96cf275 100644 --- a/tests/classes/destructor_visibility_002.phpt +++ b/tests/classes/destructor_visibility_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 Ensuring destructor visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/destructor_visibility_003.phpt b/tests/classes/destructor_visibility_003.phpt index 83e3efe..4f75166 100644 --- a/tests/classes/destructor_visibility_003.phpt +++ b/tests/classes/destructor_visibility_003.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 Ensuring destructor visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/factory_001.phpt b/tests/classes/factory_001.phpt index 97b69c1..45f9733 100644 --- a/tests/classes/factory_001.phpt +++ b/tests/classes/factory_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 factory objects ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/factory_and_singleton_001.phpt b/tests/classes/factory_and_singleton_001.phpt index 70fa020..970c017 100644 --- a/tests/classes/factory_and_singleton_001.phpt +++ b/tests/classes/factory_and_singleton_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 factory and singleton, test 1 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class test { diff --git a/tests/classes/factory_and_singleton_002.phpt b/tests/classes/factory_and_singleton_002.phpt index 3308a56..4812571 100644 --- a/tests/classes/factory_and_singleton_002.phpt +++ b/tests/classes/factory_and_singleton_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 factory and singleton, test 2 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class test { diff --git a/tests/classes/factory_and_singleton_003.phpt b/tests/classes/factory_and_singleton_003.phpt index e312f55..cf08fdb 100644 --- a/tests/classes/factory_and_singleton_003.phpt +++ b/tests/classes/factory_and_singleton_003.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 factory and singleton, test 3 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class test { diff --git a/tests/classes/factory_and_singleton_004.phpt b/tests/classes/factory_and_singleton_004.phpt index a8a2f1d..41e278b 100644 --- a/tests/classes/factory_and_singleton_004.phpt +++ b/tests/classes/factory_and_singleton_004.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 factory and singleton, test 4 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class test { diff --git a/tests/classes/factory_and_singleton_005.phpt b/tests/classes/factory_and_singleton_005.phpt index 2bb328d..78d7e05 100644 --- a/tests/classes/factory_and_singleton_005.phpt +++ b/tests/classes/factory_and_singleton_005.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 factory and singleton, test 5 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class test { diff --git a/tests/classes/factory_and_singleton_006.phpt b/tests/classes/factory_and_singleton_006.phpt index 5e1c709..5bc9433 100644 --- a/tests/classes/factory_and_singleton_006.phpt +++ b/tests/classes/factory_and_singleton_006.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 factory and singleton, test 6 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class test { diff --git a/tests/classes/factory_and_singleton_007.phpt b/tests/classes/factory_and_singleton_007.phpt index b55168e..4c15c38 100644 --- a/tests/classes/factory_and_singleton_007.phpt +++ b/tests/classes/factory_and_singleton_007.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 factory and singleton, test 7 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class test { diff --git a/tests/classes/factory_and_singleton_008.phpt b/tests/classes/factory_and_singleton_008.phpt index 49d4f0a..1a87833 100644 --- a/tests/classes/factory_and_singleton_008.phpt +++ b/tests/classes/factory_and_singleton_008.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 factory and singleton, test 8 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class test { diff --git a/tests/classes/factory_and_singleton_009.phpt b/tests/classes/factory_and_singleton_009.phpt index acf792c..9134245 100644 --- a/tests/classes/factory_and_singleton_009.phpt +++ b/tests/classes/factory_and_singleton_009.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 factory and singleton, test 9 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class test { diff --git a/tests/classes/factory_and_singleton_010.phpt b/tests/classes/factory_and_singleton_010.phpt index 0f5fb2d..bd7e7e3 100644 --- a/tests/classes/factory_and_singleton_010.phpt +++ b/tests/classes/factory_and_singleton_010.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 factory and singleton, test 10 ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class test { diff --git a/tests/classes/final.phpt b/tests/classes/final.phpt index bf3a0cb..f820877 100644 --- a/tests/classes/final.phpt +++ b/tests/classes/final.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A method may be redeclared final ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/final_abstract.phpt b/tests/classes/final_abstract.phpt index 426c852..25c2cfc 100644 --- a/tests/classes/final_abstract.phpt +++ b/tests/classes/final_abstract.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A final method cannot be abstract ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/final_redeclare.phpt b/tests/classes/final_redeclare.phpt index e8f2e6f..bdcbf3c 100644 --- a/tests/classes/final_redeclare.phpt +++ b/tests/classes/final_redeclare.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A final method may not be overwritten ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/inheritance_002.phpt b/tests/classes/inheritance_002.phpt index 7669f73..f88c099 100644 --- a/tests/classes/inheritance_002.phpt +++ b/tests/classes/inheritance_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 Constructor precedence ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class Base_php4 { diff --git a/tests/classes/interface_and_extends.phpt b/tests/classes/interface_and_extends.phpt index f9040ae..1c23d31 100644 --- a/tests/classes/interface_and_extends.phpt +++ b/tests/classes/interface_and_extends.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 a class cannot extend an interface ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/interface_class.phpt b/tests/classes/interface_class.phpt index 22520de..46deb49 100644 --- a/tests/classes/interface_class.phpt +++ b/tests/classes/interface_class.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A class can only implement interfaces ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class base { diff --git a/tests/classes/interface_doubled.phpt b/tests/classes/interface_doubled.phpt index e1dd31f..bcf2fbd 100644 --- a/tests/classes/interface_doubled.phpt +++ b/tests/classes/interface_doubled.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An interface extends base interfaces ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/interface_implemented.phpt b/tests/classes/interface_implemented.phpt index e33a4da..f0507de 100644 --- a/tests/classes/interface_implemented.phpt +++ b/tests/classes/interface_implemented.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An interface is inherited ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/interface_instantiate.phpt b/tests/classes/interface_instantiate.phpt index 70e2e3e..dffd6b1 100644 --- a/tests/classes/interface_instantiate.phpt +++ b/tests/classes/interface_instantiate.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An interface cannot be instantiated ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/interface_member.phpt b/tests/classes/interface_member.phpt index 329c072..3b50b30 100644 --- a/tests/classes/interface_member.phpt +++ b/tests/classes/interface_member.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An interface cannot have properties ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/interface_method.phpt b/tests/classes/interface_method.phpt index f80bd75..f3e465b 100644 --- a/tests/classes/interface_method.phpt +++ b/tests/classes/interface_method.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An interface method must be abstract ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/interface_method_final.phpt b/tests/classes/interface_method_final.phpt index 01e599c..74c86f1 100644 --- a/tests/classes/interface_method_final.phpt +++ b/tests/classes/interface_method_final.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An interface method cannot be final ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/interface_method_private.phpt b/tests/classes/interface_method_private.phpt index aa46a03..000b33f 100644 --- a/tests/classes/interface_method_private.phpt +++ b/tests/classes/interface_method_private.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An interface method cannot be private ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/interface_must_be_implemented.phpt b/tests/classes/interface_must_be_implemented.phpt index a4d7970..cd7c815 100644 --- a/tests/classes/interface_must_be_implemented.phpt +++ b/tests/classes/interface_must_be_implemented.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An interface must be implemented ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/interface_optional_arg.phpt b/tests/classes/interface_optional_arg.phpt index 05f2fc4..9c0de6c 100644 --- a/tests/classes/interface_optional_arg.phpt +++ b/tests/classes/interface_optional_arg.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 An interface method allows additional default arguments ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/interface_optional_arg_002.phpt b/tests/classes/interface_optional_arg_002.phpt index 9987e92..67e6785 100644 --- a/tests/classes/interface_optional_arg_002.phpt +++ b/tests/classes/interface_optional_arg_002.phpt @@ -1,7 +1,5 @@ --TEST-- default argument value in interface implementation ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/interfaces_001.phpt b/tests/classes/interfaces_001.phpt index 68f8551..d8d8011 100644 --- a/tests/classes/interfaces_001.phpt +++ b/tests/classes/interfaces_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 interfaces ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/interfaces_002.phpt b/tests/classes/interfaces_002.phpt index 803598b..fad961b 100644 --- a/tests/classes/interfaces_002.phpt +++ b/tests/classes/interfaces_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 interface with an unimplemented method ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/iterators_001.phpt b/tests/classes/iterators_001.phpt index 02e3610..548bed5 100644 --- a/tests/classes/iterators_001.phpt +++ b/tests/classes/iterators_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 iterators and foreach ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class c_iter implements Iterator { diff --git a/tests/classes/iterators_002.phpt b/tests/classes/iterators_002.phpt index 4a58be0..6f93d1e 100644 --- a/tests/classes/iterators_002.phpt +++ b/tests/classes/iterators_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 iterators and break ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class c_iter implements Iterator { diff --git a/tests/classes/iterators_003.phpt b/tests/classes/iterators_003.phpt index 42695db..71009e0 100644 --- a/tests/classes/iterators_003.phpt +++ b/tests/classes/iterators_003.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 iterators and break ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class c_iter implements Iterator { diff --git a/tests/classes/iterators_004.phpt b/tests/classes/iterators_004.phpt index 3fe0527..df76c7f 100644 --- a/tests/classes/iterators_004.phpt +++ b/tests/classes/iterators_004.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 iterators must be implemented ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/iterators_005.phpt b/tests/classes/iterators_005.phpt index 005deb9..9c330ce 100644 --- a/tests/classes/iterators_005.phpt +++ b/tests/classes/iterators_005.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 iterators cannot implement Traversable alone ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/iterators_006.phpt b/tests/classes/iterators_006.phpt index e00a00a..8017a8a 100644 --- a/tests/classes/iterators_006.phpt +++ b/tests/classes/iterators_006.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 iterators and array wrapping ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?> --FILE-- <?php diff --git a/tests/classes/method_override_optional_arg_001.phpt b/tests/classes/method_override_optional_arg_001.phpt index bea9575..897a2c2 100644 --- a/tests/classes/method_override_optional_arg_001.phpt +++ b/tests/classes/method_override_optional_arg_001.phpt @@ -1,7 +1,5 @@ --TEST-- Method override allows optional default argument ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/object_reference_001.phpt b/tests/classes/object_reference_001.phpt index f114d1a..ca5bbc5 100644 --- a/tests/classes/object_reference_001.phpt +++ b/tests/classes/object_reference_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 object references ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/private_001.phpt b/tests/classes/private_001.phpt index 9dba49e..79b94c4 100644 --- a/tests/classes/private_001.phpt +++ b/tests/classes/private_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A private method can only be called inside the class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/private_002.phpt b/tests/classes/private_002.phpt index 2e8d26b..892580f 100644 --- a/tests/classes/private_002.phpt +++ b/tests/classes/private_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A private method cannot be called in another class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/private_003.phpt b/tests/classes/private_003.phpt index 397da5d..0843c5e 100644 --- a/tests/classes/private_003.phpt +++ b/tests/classes/private_003.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A private method cannot be called in a derived class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php ini_set("error_reporting",2039); diff --git a/tests/classes/private_003b.phpt b/tests/classes/private_003b.phpt index f14de8e..fe2f464 100644 --- a/tests/classes/private_003b.phpt +++ b/tests/classes/private_003b.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A private method cannot be called in a derived class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/private_004.phpt b/tests/classes/private_004.phpt index 749d6ee..13a4e90 100644 --- a/tests/classes/private_004.phpt +++ b/tests/classes/private_004.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A private method cannot be called in a derived class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/private_004b.phpt b/tests/classes/private_004b.phpt index 8d5cd7c..db139f6 100644 --- a/tests/classes/private_004b.phpt +++ b/tests/classes/private_004b.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A private method cannot be called in a derived class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/private_005.phpt b/tests/classes/private_005.phpt index c09c428..0c6d978 100644 --- a/tests/classes/private_005.phpt +++ b/tests/classes/private_005.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A private method cannot be called in a derived class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/private_005b.phpt b/tests/classes/private_005b.phpt index 8d5cd7c..db139f6 100644 --- a/tests/classes/private_005b.phpt +++ b/tests/classes/private_005b.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A private method cannot be called in a derived class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/private_006.phpt b/tests/classes/private_006.phpt index 0bb2b3f..a51c9e7 100644 --- a/tests/classes/private_006.phpt +++ b/tests/classes/private_006.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A private method can be overwritten in a second derived class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class first { diff --git a/tests/classes/private_006b.phpt b/tests/classes/private_006b.phpt index 4084124..22c3cfd 100644 --- a/tests/classes/private_006b.phpt +++ b/tests/classes/private_006b.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A private method can be overwritten in a second derived class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/private_007.phpt b/tests/classes/private_007.phpt index 73a38c4..f773cc8 100644 --- a/tests/classes/private_007.phpt +++ b/tests/classes/private_007.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A derived class does not know about privates of ancestors ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/private_007b.phpt b/tests/classes/private_007b.phpt index 02ddc25..cbd0e75 100644 --- a/tests/classes/private_007b.phpt +++ b/tests/classes/private_007b.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A derived class does not know about privates of ancestors ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/private_members.phpt b/tests/classes/private_members.phpt index a8ef9ab..7ee6d69 100644 --- a/tests/classes/private_members.phpt +++ b/tests/classes/private_members.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A private member is ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/protected_001.phpt b/tests/classes/protected_001.phpt index aabcd1b..44099b1 100644 --- a/tests/classes/protected_001.phpt +++ b/tests/classes/protected_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A protected method can only be called inside the class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/protected_001b.phpt b/tests/classes/protected_001b.phpt index d79c173..6f00ffc 100644 --- a/tests/classes/protected_001b.phpt +++ b/tests/classes/protected_001b.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A protected method can only be called inside the class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/protected_002.phpt b/tests/classes/protected_002.phpt index 89872fa..da87200 100644 --- a/tests/classes/protected_002.phpt +++ b/tests/classes/protected_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A protected method cannot be called in another class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/singleton_001.phpt b/tests/classes/singleton_001.phpt index ee729b9..4517415 100644 --- a/tests/classes/singleton_001.phpt +++ b/tests/classes/singleton_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 singleton ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/static_mix_1.phpt b/tests/classes/static_mix_1.phpt index 5146e70..71db596 100644 --- a/tests/classes/static_mix_1.phpt +++ b/tests/classes/static_mix_1.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 You cannot overload a static method with a non static method ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/static_mix_2.phpt b/tests/classes/static_mix_2.phpt index cecb37b..ec657c0d 100644 --- a/tests/classes/static_mix_2.phpt +++ b/tests/classes/static_mix_2.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 You cannot overload a non static method with a static method ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/static_properties_001.phpt b/tests/classes/static_properties_001.phpt index 1c34f68..e14d87d 100644 --- a/tests/classes/static_properties_001.phpt +++ b/tests/classes/static_properties_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 Initializing static properties to arrays ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/this.phpt b/tests/classes/this.phpt index 1d9c623..5551e8a 100644 --- a/tests/classes/this.phpt +++ b/tests/classes/this.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 $this cannot be exchanged ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/tostring_002.phpt b/tests/classes/tostring_002.phpt index 8a4a7af..eb1bea5 100644 --- a/tests/classes/tostring_002.phpt +++ b/tests/classes/tostring_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 __toString() in __destruct ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt index 28d1280..318dcbe 100644 --- a/tests/classes/type_hinting_001.phpt +++ b/tests/classes/type_hinting_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 class type hinting ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/type_hinting_002.phpt b/tests/classes/type_hinting_002.phpt index 6fefcc8..b65bc85 100644 --- a/tests/classes/type_hinting_002.phpt +++ b/tests/classes/type_hinting_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 class type hinting non existing class ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_000a.phpt b/tests/classes/visibility_000a.phpt index 2524494..0dd86aa 100644 --- a/tests/classes/visibility_000a.phpt +++ b/tests/classes/visibility_000a.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_000b.phpt b/tests/classes/visibility_000b.phpt index 9305467..f6ac466 100644 --- a/tests/classes/visibility_000b.phpt +++ b/tests/classes/visibility_000b.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_000c.phpt b/tests/classes/visibility_000c.phpt index 064106e..c651b05 100644 --- a/tests/classes/visibility_000c.phpt +++ b/tests/classes/visibility_000c.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_001a.phpt b/tests/classes/visibility_001a.phpt index ebd1cc3..d749b52 100644 --- a/tests/classes/visibility_001a.phpt +++ b/tests/classes/visibility_001a.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_001b.phpt b/tests/classes/visibility_001b.phpt index e61078e..27c39cf 100644 --- a/tests/classes/visibility_001b.phpt +++ b/tests/classes/visibility_001b.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_001c.phpt b/tests/classes/visibility_001c.phpt index bb1075a..a9a5896 100644 --- a/tests/classes/visibility_001c.phpt +++ b/tests/classes/visibility_001c.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_002a.phpt b/tests/classes/visibility_002a.phpt index 6c88d20..ea86412 100644 --- a/tests/classes/visibility_002a.phpt +++ b/tests/classes/visibility_002a.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_002b.phpt b/tests/classes/visibility_002b.phpt index 71f47c3..8116a32 100644 --- a/tests/classes/visibility_002b.phpt +++ b/tests/classes/visibility_002b.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_002c.phpt b/tests/classes/visibility_002c.phpt index 5edae1d..308c905 100644 --- a/tests/classes/visibility_002c.phpt +++ b/tests/classes/visibility_002c.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_003a.phpt b/tests/classes/visibility_003a.phpt index 1693386..176cc4a 100644 --- a/tests/classes/visibility_003a.phpt +++ b/tests/classes/visibility_003a.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_003b.phpt b/tests/classes/visibility_003b.phpt index fcfdbe3..9b45aa3 100644 --- a/tests/classes/visibility_003b.phpt +++ b/tests/classes/visibility_003b.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_003c.phpt b/tests/classes/visibility_003c.phpt index d94a9c1..27e2bc2b 100644 --- a/tests/classes/visibility_003c.phpt +++ b/tests/classes/visibility_003c.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_004a.phpt b/tests/classes/visibility_004a.phpt index 6f16a09..717f971 100644 --- a/tests/classes/visibility_004a.phpt +++ b/tests/classes/visibility_004a.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_004b.phpt b/tests/classes/visibility_004b.phpt index 74a8318..1ede334 100644 --- a/tests/classes/visibility_004b.phpt +++ b/tests/classes/visibility_004b.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/classes/visibility_004c.phpt b/tests/classes/visibility_004c.phpt index 92a7703..e4f94a3 100644 --- a/tests/classes/visibility_004c.phpt +++ b/tests/classes/visibility_004c.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 A redeclared method must have the same or higher visibility ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/lang/035.phpt b/tests/lang/035.phpt index a5e3a7f..63f0385 100644 --- a/tests/lang/035.phpt +++ b/tests/lang/035.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2: set_exception_handler() ---SKIPIF-- -<?php if (version_compare(zend_version(), "2.0.0-dev", "<")) print "skip Zend engine 2 required"; ?> --FILE-- <?php class MyException extends Exception { diff --git a/tests/lang/bug21961.phpt b/tests/lang/bug21961.phpt index 9b71992..93e4374 100644 --- a/tests/lang/bug21961.phpt +++ b/tests/lang/bug21961.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #21961 (get_parent_class() segfault) ---SKIPIF-- -<?php if (version_compare(zend_version(),'2.0.0-dev','<')) die('skip prepared for ZE2'); ?> --FILE-- <?php diff --git a/tests/lang/bug7515.phpt b/tests/lang/bug7515.phpt index ea58061..5c7756c 100644 --- a/tests/lang/bug7515.phpt +++ b/tests/lang/bug7515.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #7515 (weird & invisible referencing of objects) ---SKIPIF-- -<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?> --INI-- error_reporting=2039 --FILE-- diff --git a/tests/lang/error_2_exception_001.phpt b/tests/lang/error_2_exception_001.phpt index 9596ba2..e084b92 100644 --- a/tests/lang/error_2_exception_001.phpt +++ b/tests/lang/error_2_exception_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 errors caught as exceptions ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt index e8a2ffa..65f1dc3 100644 --- a/tests/lang/type_hints_001.phpt +++ b/tests/lang/type_hints_001.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 type hinting ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php diff --git a/tests/lang/type_hints_002.phpt b/tests/lang/type_hints_002.phpt index b21240a..bdd5b4e 100644 --- a/tests/lang/type_hints_002.phpt +++ b/tests/lang/type_hints_002.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 type hinting ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class P { } diff --git a/tests/lang/type_hints_003.phpt b/tests/lang/type_hints_003.phpt index 2b536d0..d2c48a3 100644 --- a/tests/lang/type_hints_003.phpt +++ b/tests/lang/type_hints_003.phpt @@ -1,7 +1,5 @@ --TEST-- ZE2 type ---SKIPIF-- -<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?> --FILE-- <?php class T {