diff options
Diffstat (limited to 'ext/com_dotnet')
28 files changed, 56 insertions, 83 deletions
diff --git a/ext/com_dotnet/tests/27974.phpt b/ext/com_dotnet/tests/27974.phpt index c76dda9ed5..ca7735a829 100644 --- a/ext/com_dotnet/tests/27974.phpt +++ b/ext/com_dotnet/tests/27974.phpt @@ -1,8 +1,7 @@ --TEST-- COM: mapping a safearray ---SKIPIF-- -<?php -if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php error_reporting(E_ALL); diff --git a/ext/com_dotnet/tests/bug33386.phpt b/ext/com_dotnet/tests/bug33386.phpt index 7f305d2eb5..10e9021a0b 100644 --- a/ext/com_dotnet/tests/bug33386.phpt +++ b/ext/com_dotnet/tests/bug33386.phpt @@ -1,8 +1,9 @@ --TEST-- Bug #33386 (ScriptControl only sees last function of class) +--EXTENSIONS-- +com_dotnet --SKIPIF-- <?php -if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; if (4 != PHP_INT_SIZE) print "skip MSScriptControl isn't available under x64"; ?> --FILE-- diff --git a/ext/com_dotnet/tests/bug34272.phpt b/ext/com_dotnet/tests/bug34272.phpt index ce8a552dfd..27dc5142d3 100644 --- a/ext/com_dotnet/tests/bug34272.phpt +++ b/ext/com_dotnet/tests/bug34272.phpt @@ -1,8 +1,7 @@ --TEST-- Bug #34272 (empty array onto COM object blows up) ---SKIPIF-- -<?php -if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php error_reporting(E_ALL); diff --git a/ext/com_dotnet/tests/bug39596.phpt b/ext/com_dotnet/tests/bug39596.phpt index 1510db49cf..d6215f0596 100644 --- a/ext/com_dotnet/tests/bug39596.phpt +++ b/ext/com_dotnet/tests/bug39596.phpt @@ -1,8 +1,7 @@ --TEST-- Bug #39596 (Creating Variant of type VT_ARRAY) ---SKIPIF-- -<?php -if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php error_reporting(E_ALL); diff --git a/ext/com_dotnet/tests/bug39606.phpt b/ext/com_dotnet/tests/bug39606.phpt index f646c6a7c3..6f01acd471 100644 --- a/ext/com_dotnet/tests/bug39606.phpt +++ b/ext/com_dotnet/tests/bug39606.phpt @@ -1,8 +1,7 @@ --TEST-- COM: Loading typelib corrupts memory ---SKIPIF-- -<?php -if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php error_reporting(E_ALL); diff --git a/ext/com_dotnet/tests/bug45280.phpt b/ext/com_dotnet/tests/bug45280.phpt index 393799e374..a461871f2f 100644 --- a/ext/com_dotnet/tests/bug45280.phpt +++ b/ext/com_dotnet/tests/bug45280.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #45280 (Reflection of instantiated COM classes causes PHP to crash) ---SKIPIF-- -<?php -if (!extension_loaded("com_dotnet")){ echo "skip COM/.Net support not present"; } -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php $dict = new COM("Scripting.Dictionary"); diff --git a/ext/com_dotnet/tests/bug49192.phpt b/ext/com_dotnet/tests/bug49192.phpt index cd85a9a64c..519ac21180 100644 --- a/ext/com_dotnet/tests/bug49192.phpt +++ b/ext/com_dotnet/tests/bug49192.phpt @@ -1,8 +1,7 @@ --TEST-- Bug #49192 (PHP crashes when GC invoked on COM object) ---SKIPIF-- -<?php -if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php diff --git a/ext/com_dotnet/tests/bug62474.phpt b/ext/com_dotnet/tests/bug62474.phpt index cc8e252224..531ba9a640 100644 --- a/ext/com_dotnet/tests/bug62474.phpt +++ b/ext/com_dotnet/tests/bug62474.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #62474 (com_event_sink crashes on certain arguments) ---SKIPIF-- -<?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php var_dump(com_event_sink(new variant, function() {}, array())); diff --git a/ext/com_dotnet/tests/bug63208.phpt b/ext/com_dotnet/tests/bug63208.phpt index ae62dbba98..67ea9f50f9 100644 --- a/ext/com_dotnet/tests/bug63208.phpt +++ b/ext/com_dotnet/tests/bug63208.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #63208 (BSTR to PHP string conversion not binary safe) ---SKIPIF-- -<?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php $string = "\u{0905}b\0cd"; diff --git a/ext/com_dotnet/tests/bug64130.phpt b/ext/com_dotnet/tests/bug64130.phpt index 0f8e083295..ba47c85322 100644 --- a/ext/com_dotnet/tests/bug64130.phpt +++ b/ext/com_dotnet/tests/bug64130.phpt @@ -1,8 +1,9 @@ --TEST-- Bug #64130 (COM obj parameters passed by reference are not updated) +--EXTENSIONS-- +com_dotnet --SKIPIF-- <?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); if (PHP_INT_SIZE != 4) die('skip for 32bit platforms only'); try { $ie = new com('InternetExplorer.Application'); diff --git a/ext/com_dotnet/tests/bug66322.phpt b/ext/com_dotnet/tests/bug66322.phpt index de37e4fa75..56988a82cc 100644 --- a/ext/com_dotnet/tests/bug66322.phpt +++ b/ext/com_dotnet/tests/bug66322.phpt @@ -1,8 +1,9 @@ --TEST-- Bug #66322 (COMPersistHelper::SaveToFile can save to wrong location) +--EXTENSIONS-- +com_dotnet --SKIPIF-- <?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); try { new COM('Word.Application'); } catch (com_exception $ex) { diff --git a/ext/com_dotnet/tests/bug66431_0.phpt b/ext/com_dotnet/tests/bug66431_0.phpt index 5f9bc5c0b0..ef4d63f441 100644 --- a/ext/com_dotnet/tests/bug66431_0.phpt +++ b/ext/com_dotnet/tests/bug66431_0.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #66431 Special Character via COM Interface (CP_UTF8), Scripting.FileSystemObject ---SKIPIF-- -<?php -if (!extension_loaded("com_dotnet")){ echo "skip COM/.Net support not present"; } -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php diff --git a/ext/com_dotnet/tests/bug66431_1.phpt b/ext/com_dotnet/tests/bug66431_1.phpt index 7ebf16a10d..7f783dbf64 100644 --- a/ext/com_dotnet/tests/bug66431_1.phpt +++ b/ext/com_dotnet/tests/bug66431_1.phpt @@ -1,9 +1,9 @@ --TEST-- Bug #66431 Special Character via COM Interface (CP_UTF8), Application.Word +--EXTENSIONS-- +com_dotnet --SKIPIF-- <?php -if (!extension_loaded("com_dotnet")){ echo "skip COM/.Net support not present"; } - try { new COM("word.application", NULL, CP_UTF8); } catch (Exception $e) { diff --git a/ext/com_dotnet/tests/bug69939.phpt b/ext/com_dotnet/tests/bug69939.phpt index 49ad20787a..d650382d93 100644 --- a/ext/com_dotnet/tests/bug69939.phpt +++ b/ext/com_dotnet/tests/bug69939.phpt @@ -1,8 +1,7 @@ --TEST-- Bug #69939 (Casting object to bool returns false) ---SKIPIF-- -<?php -if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php var_dump((bool) new COM('WScript.Shell')); diff --git a/ext/com_dotnet/tests/bug72498.phpt b/ext/com_dotnet/tests/bug72498.phpt index b9bd498af3..67285e8523 100644 --- a/ext/com_dotnet/tests/bug72498.phpt +++ b/ext/com_dotnet/tests/bug72498.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #72498 variant_date_from_timestamp null dereference ---SKIPIF-- -<?php -if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php diff --git a/ext/com_dotnet/tests/bug73679.phpt b/ext/com_dotnet/tests/bug73679.phpt index 235fd3e33e..9815cdcaac 100644 --- a/ext/com_dotnet/tests/bug73679.phpt +++ b/ext/com_dotnet/tests/bug73679.phpt @@ -1,8 +1,9 @@ --TEST-- Bug #73679 DOTNET read access violation using invalid codepage +--EXTENSIONS-- +com_dotnet --SKIPIF-- <?php -if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only"); ?> --FILE-- diff --git a/ext/com_dotnet/tests/bug77177.phpt b/ext/com_dotnet/tests/bug77177.phpt index 8fcfd5a378..19e4c11995 100644 --- a/ext/com_dotnet/tests/bug77177.phpt +++ b/ext/com_dotnet/tests/bug77177.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #77177 (Serializing or unserializing COM objects crashes) ---SKIPIF-- -<?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php $com = new COM("WScript.Shell"); diff --git a/ext/com_dotnet/tests/bug77578.phpt b/ext/com_dotnet/tests/bug77578.phpt index 910f24909b..2bf2cbf2c0 100644 --- a/ext/com_dotnet/tests/bug77578.phpt +++ b/ext/com_dotnet/tests/bug77578.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #77578 (Crash when php unload) ---SKIPIF-- -<?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php // To actually be able to verify the crash during shutdown on Windows, we have diff --git a/ext/com_dotnet/tests/bug77621.phpt b/ext/com_dotnet/tests/bug77621.phpt index 32e879dcd0..74972749e5 100644 --- a/ext/com_dotnet/tests/bug77621.phpt +++ b/ext/com_dotnet/tests/bug77621.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #77621 (Already defined constants are not properly reported) ---SKIPIF-- -<?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); -?> +--EXTENSIONS-- +com_dotnet --INI-- com.autoregister_verbose=1 --FILE-- diff --git a/ext/com_dotnet/tests/bug78650.phpt b/ext/com_dotnet/tests/bug78650.phpt index c362de95bb..ca2a235af2 100644 --- a/ext/com_dotnet/tests/bug78650.phpt +++ b/ext/com_dotnet/tests/bug78650.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #78650 (new COM Crash) ---SKIPIF-- -<?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php $fname = __DIR__ . '/bug78650/foo/bar'; diff --git a/ext/com_dotnet/tests/bug78694.phpt b/ext/com_dotnet/tests/bug78694.phpt index adf0c828ca..f44b00a4f4 100644 --- a/ext/com_dotnet/tests/bug78694.phpt +++ b/ext/com_dotnet/tests/bug78694.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #78694 (Appending to a variant array causes segfault) ---SKIPIF-- -<?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php foreach ([new com('WScript.Shell'), new variant([])] as $var) { diff --git a/ext/com_dotnet/tests/bug79242.phpt b/ext/com_dotnet/tests/bug79242.phpt index 46c5d8af3b..cda4d58ff9 100644 --- a/ext/com_dotnet/tests/bug79242.phpt +++ b/ext/com_dotnet/tests/bug79242.phpt @@ -1,8 +1,9 @@ --TEST-- Bug #79242 (COM error constants don't match com_exception codes) +--EXTENSIONS-- +com_dotnet --SKIPIF-- <?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only"); ?> --FILE-- diff --git a/ext/com_dotnet/tests/bug79247.phpt b/ext/com_dotnet/tests/bug79247.phpt index 55e24b1796..2cda351d54 100644 --- a/ext/com_dotnet/tests/bug79247.phpt +++ b/ext/com_dotnet/tests/bug79247.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #79247 (Garbage collecting variant objects segfaults) ---SKIPIF-- -<?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php $keep = new variant(null); diff --git a/ext/com_dotnet/tests/bug79248.phpt b/ext/com_dotnet/tests/bug79248.phpt index fda67551a7..c43c1f5338 100644 --- a/ext/com_dotnet/tests/bug79248.phpt +++ b/ext/com_dotnet/tests/bug79248.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #79248 (Traversing empty VT_ARRAY throws com_exception) ---SKIPIF-- -<?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php $v = new variant([], VT_ARRAY); diff --git a/ext/com_dotnet/tests/bug79299.phpt b/ext/com_dotnet/tests/bug79299.phpt index 99c1a99742..ac4a94cd77 100644 --- a/ext/com_dotnet/tests/bug79299.phpt +++ b/ext/com_dotnet/tests/bug79299.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #79299 (com_print_typeinfo prints duplicate variables) ---SKIPIF-- -<?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php $dict = new COM("Scripting.Dictionary"); diff --git a/ext/com_dotnet/tests/bug79332.phpt b/ext/com_dotnet/tests/bug79332.phpt index 93add95d15..28443478d9 100644 --- a/ext/com_dotnet/tests/bug79332.phpt +++ b/ext/com_dotnet/tests/bug79332.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #79332 (php_istreams are never freed) ---SKIPIF-- -<?php -if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available'); -?> +--EXTENSIONS-- +com_dotnet --FILE-- <?php $ph = new COMPersistHelper(null); diff --git a/ext/com_dotnet/tests/variants.phpt b/ext/com_dotnet/tests/variants.phpt index e28823c3ad..8547e65efb 100644 --- a/ext/com_dotnet/tests/variants.phpt +++ b/ext/com_dotnet/tests/variants.phpt @@ -1,8 +1,9 @@ --TEST-- COM: General variant tests +--EXTENSIONS-- +com_dotnet --SKIPIF-- <?php -if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; if (4 != PHP_INT_SIZE) print "skip x86 only"; ?> --FILE-- <?php diff --git a/ext/com_dotnet/tests/variants_x64.phpt b/ext/com_dotnet/tests/variants_x64.phpt index 1ca93c5709..0017ec64fd 100644 --- a/ext/com_dotnet/tests/variants_x64.phpt +++ b/ext/com_dotnet/tests/variants_x64.phpt @@ -1,8 +1,9 @@ --TEST-- COM: General variant tests +--EXTENSIONS-- +com_dotnet --SKIPIF-- <?php -if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; if (8 != PHP_INT_SIZE) print "skip x64 only"; if ((string) variant_cat(new VARIANT(false), new VARIANT(0.5)) != 'False0.5') print "skip English locale only"; |