diff options
Diffstat (limited to 'ext/imap')
69 files changed, 204 insertions, 204 deletions
diff --git a/ext/imap/tests/bug31142_1.phpt b/ext/imap/tests/bug31142_1.phpt index efb92b7b45..9afedf1c41 100644 --- a/ext/imap/tests/bug31142_1.phpt +++ b/ext/imap/tests/bug31142_1.phpt @@ -1,9 +1,9 @@ ---TEST-- +--TEST-- Bug #31142 test #1 (imap_mail_compose() generates incorrect output) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- diff --git a/ext/imap/tests/bug31142_2.phpt b/ext/imap/tests/bug31142_2.phpt index 2a81760a7b..c9eed598b3 100644 --- a/ext/imap/tests/bug31142_2.phpt +++ b/ext/imap/tests/bug31142_2.phpt @@ -1,9 +1,9 @@ ---TEST-- +--TEST-- Bug #31142 test #2 (imap_mail_compose() generates incorrect output) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- diff --git a/ext/imap/tests/bug32589.phpt b/ext/imap/tests/bug32589.phpt index c5030e8970..52a73c6f23 100644 --- a/ext/imap/tests/bug32589.phpt +++ b/ext/imap/tests/bug32589.phpt @@ -1,9 +1,9 @@ ---TEST-- +--TEST-- Bug #32589 (crash inside imap_mail_compose() function) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- diff --git a/ext/imap/tests/bug35669.phpt b/ext/imap/tests/bug35669.phpt index 1cc4e702b9..1f8ca5d7c3 100644 --- a/ext/imap/tests/bug35669.phpt +++ b/ext/imap/tests/bug35669.phpt @@ -1,9 +1,9 @@ ---TEST-- +--TEST-- Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- @@ -11,15 +11,15 @@ Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email) $envelope["from"] = 'Santa <somewhere@northpole.gov>'; $envelope["to"] = 'The bad smurf <bad@smurf.com>'; $envelope['date'] = 'Wed, 04 Jan 2006 19:24:43 -0500'; - + $multipart["type"] = TYPEMULTIPART; $multipart["subtype"] = "MIXED"; $body[] = $multipart; //add multipart stuff - + $textpart["type"] = TYPEMULTIPART; $textpart["subtype"] = "ALTERNATIVE"; $body[] = $textpart; //add body part - + $plain["type"] = TYPETEXT; $plain["subtype"] = "PLAIN"; $plain["charset"] = "iso-8859-1"; @@ -27,9 +27,9 @@ Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email) $plain["description"] = "Plaintype part of message"; $plain['disposition'] = "inline"; $plain["contents.data"] = 'See mom, it will crash'; - + $body[] = $plain; //next add plain text part - + $html["type"] = TYPETEXT; $html["subtype"] = "HTML"; $html["charset"] = "iso-8859-1"; @@ -37,9 +37,9 @@ Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email) $html["description"] = "HTML part of message"; $html['disposition'] = "inline"; $html["contents.data"] = 'See mom, it will <b>crash</b>'; - + $body[] = $html; - + echo imap_mail_compose($envelope, $body); ?> --EXPECTF-- diff --git a/ext/imap/tests/bug40854.phpt b/ext/imap/tests/bug40854.phpt index 3df81ea29d..970542cf95 100644 --- a/ext/imap/tests/bug40854.phpt +++ b/ext/imap/tests/bug40854.phpt @@ -1,9 +1,9 @@ ---TEST-- +--TEST-- Bug #40854 (imap_mail_compose() creates an invalid terminator for multipart e-mails) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- diff --git a/ext/imap/tests/bug44098.phpt b/ext/imap/tests/bug44098.phpt index f758c117b6..c424f05f54 100644 --- a/ext/imap/tests/bug44098.phpt +++ b/ext/imap/tests/bug44098.phpt @@ -2,8 +2,8 @@ Bug #44098 (imap_utf8() returns only capital letters) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- diff --git a/ext/imap/tests/bug45705_1.phpt b/ext/imap/tests/bug45705_1.phpt index eedaed0817..f699451407 100644 --- a/ext/imap/tests/bug45705_1.phpt +++ b/ext/imap/tests/bug45705_1.phpt @@ -2,8 +2,8 @@ Bug #45705 test #1 (imap rfc822_parse_adrlist() modifies passed address parameter) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- diff --git a/ext/imap/tests/bug45705_2.phpt b/ext/imap/tests/bug45705_2.phpt index 797d473178..b8c1c295ae 100644 --- a/ext/imap/tests/bug45705_2.phpt +++ b/ext/imap/tests/bug45705_2.phpt @@ -2,8 +2,8 @@ Bug #45705 test #2 (imap rfc822_parse_adrlist() modifies passed address parameter) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- diff --git a/ext/imap/tests/bug46918.phpt b/ext/imap/tests/bug46918.phpt index 351becaf00..adb7fb307b 100644 --- a/ext/imap/tests/bug46918.phpt +++ b/ext/imap/tests/bug46918.phpt @@ -2,8 +2,8 @@ Bug #46918 (imap_rfc822_parse_adrlist host part not filled in correctly) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- diff --git a/ext/imap/tests/bug53377.phpt b/ext/imap/tests/bug53377.phpt index 1a2173a09b..dfe2d032ab 100644 --- a/ext/imap/tests/bug53377.phpt +++ b/ext/imap/tests/bug53377.phpt @@ -2,8 +2,8 @@ Bug #53377 (imap_mime_header_decode() doesn't ignore \t during long MIME header unfolding) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- diff --git a/ext/imap/tests/imap_8bit_basic.phpt b/ext/imap/tests/imap_8bit_basic.phpt index aaa0591722..799889bb3d 100644 --- a/ext/imap/tests/imap_8bit_basic.phpt +++ b/ext/imap/tests/imap_8bit_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_8bit() function : basic functionality +Test imap_8bit() function : basic functionality --SKIPIF-- <?php extension_loaded('imap') or die('skip imap extension not available in this build'); diff --git a/ext/imap/tests/imap_alerts_error.phpt b/ext/imap/tests/imap_alerts_error.phpt index ee13b13503..2baefc3da1 100644 --- a/ext/imap/tests/imap_alerts_error.phpt +++ b/ext/imap/tests/imap_alerts_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_alerts() function : error conditions +Test imap_alerts() function : error conditions --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); @@ -7,9 +7,9 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_alerts(void) - * Description: Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. + * Description: Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. * Source code: ext/imap/php_imap.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing imap_alerts() : error conditions ***\n"; diff --git a/ext/imap/tests/imap_append_basic.phpt b/ext/imap/tests/imap_append_basic.phpt index 60847ce716..e46268533d 100644 --- a/ext/imap/tests/imap_append_basic.phpt +++ b/ext/imap/tests/imap_append_basic.phpt @@ -1,7 +1,7 @@ --TEST-- -Test imap_append() function : basic functionality +Test imap_append() function : basic functionality --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- @@ -22,7 +22,7 @@ if (!is_resource($imap_stream)) { } $mb_details = imap_mailboxmsginfo($imap_stream); -echo "Add a couple of msgs to new mailbox " . $mb_details->Mailbox . "\n"; +echo "Add a couple of msgs to new mailbox " . $mb_details->Mailbox . "\n"; var_dump(imap_append($imap_stream, $mb_details->Mailbox , "From: webmaster@something.com\r\n" . "To: info@something.com\r\n" @@ -30,15 +30,15 @@ var_dump(imap_append($imap_stream, $mb_details->Mailbox . "\r\n" . "this is a test message, please ignore\r\n" )); - + var_dump(imap_append($imap_stream, $mb_details->Mailbox , "From: webmaster@something.com\r\n" . "To: info@something.com\r\n" . "Subject: Another test\r\n" . "\r\n" . "this is another test message, please ignore it too!!\r\n" - )); - + )); + $check = imap_check($imap_stream); echo "Msg Count after append : ". $check->Nmsgs . "\n"; @@ -49,7 +49,7 @@ imap_close($imap_stream); ?> ===Done=== --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_base64_basic.phpt b/ext/imap/tests/imap_base64_basic.phpt index f5cc6039f3..3557e9f87e 100644 --- a/ext/imap/tests/imap_base64_basic.phpt +++ b/ext/imap/tests/imap_base64_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_base64() function : basic functionality +Test imap_base64() function : basic functionality --SKIPIF-- <?php extension_loaded('imap') or die('skip imap extension not available in this build'); @@ -35,7 +35,7 @@ if (imap_base64($base64) == $hex) { echo "TEST PASSED\n"; } else { echo "TEST FAILED"; -} +} ?> ===Done=== diff --git a/ext/imap/tests/imap_binary_basic.phpt b/ext/imap/tests/imap_binary_basic.phpt index 3deb51a6a6..4d5e3c4352 100644 --- a/ext/imap/tests/imap_binary_basic.phpt +++ b/ext/imap/tests/imap_binary_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_binary() function : basic functionality +Test imap_binary() function : basic functionality --SKIPIF-- <?php extension_loaded('imap') or die('skip imap extension not available in this build'); @@ -18,7 +18,7 @@ $str = 'This is an example string to be base 64 encoded'; $base64 = imap_binary($str); var_dump(bin2hex($base64)); -echo "Encode a string which results in more than 60 charters of output\n"; +echo "Encode a string which results in more than 60 charters of output\n"; $str = 'This is a long string with results in more than 60 characters of output'; $base64 = imap_binary($str); var_dump(bin2hex($base64)); diff --git a/ext/imap/tests/imap_body.phpt b/ext/imap/tests/imap_body.phpt index 40f35f07aa..1c75a94426 100644 --- a/ext/imap/tests/imap_body.phpt +++ b/ext/imap/tests/imap_body.phpt @@ -16,7 +16,7 @@ echo "Checking with incorrect parameter type\n"; imap_body(''); imap_body(false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); imap_body($stream_id); imap_body($stream_id,-1); diff --git a/ext/imap/tests/imap_body_basic.phpt b/ext/imap/tests/imap_body_basic.phpt index 640738b250..3cfe3e3d6b 100644 --- a/ext/imap/tests/imap_body_basic.phpt +++ b/ext/imap/tests/imap_body_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_body() function : basic functionality +Test imap_body() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); @@ -22,8 +22,8 @@ if (!is_resource($imap_stream)) { } $check = imap_check($imap_stream); -echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; - +echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; + // show body for msg 1 var_dump(imap_body($imap_stream, 1)); @@ -34,7 +34,7 @@ imap_close($imap_stream); ?> ===Done=== --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_bodystruct_basic.phpt b/ext/imap/tests/imap_bodystruct_basic.phpt index cc643a6b51..a5db378c00 100644 --- a/ext/imap/tests/imap_bodystruct_basic.phpt +++ b/ext/imap/tests/imap_bodystruct_basic.phpt @@ -1,7 +1,7 @@ --TEST-- -Test imap_bodystruct() function : basic functionality +Test imap_bodystruct() function : basic functionality --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- @@ -20,10 +20,10 @@ if (!is_resource($imap_stream)) { exit("TEST FAILED: Unable to create test mailbox\n"); } -echo "\nGet and validate structure of body part 1\n"; +echo "\nGet and validate structure of body part 1\n"; + +$m = imap_bodystruct($imap_stream, 1, "1"); -$m = imap_bodystruct($imap_stream, 1, "1"); - $mandatoryFields = array( 'ifsubtype', 'ifdescription', @@ -33,9 +33,9 @@ $mandatoryFields = array( 'ifparameters', ); -foreach($mandatoryFields as $mf) +foreach($mandatoryFields as $mf) { - if(isValid($m->$mf)) + if(isValid($m->$mf)) { echo "$mf is 0 or 1\n"; } @@ -45,32 +45,32 @@ foreach($mandatoryFields as $mf) } } -if(is_array($m->parameters)) +if(is_array($m->parameters)) { echo "parameters is an array\n"; } echo "\nTry to get part 4!\n"; -var_dump(imap_bodystruct($imap_stream, 1, "4")); +var_dump(imap_bodystruct($imap_stream, 1, "4")); imap_close($imap_stream); -function isValid($param) +function isValid($param) { - if(($param == 0) || ($param == 1)) + if(($param == 0) || ($param == 1)) { $result=true; } else { $result=false; - } + } return $result; } ?> ===Done=== --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_clearflag_full_basic.phpt b/ext/imap/tests/imap_clearflag_full_basic.phpt index 4269688e14..359c3af28c 100644 --- a/ext/imap/tests/imap_clearflag_full_basic.phpt +++ b/ext/imap/tests/imap_clearflag_full_basic.phpt @@ -1,7 +1,7 @@ --TEST-- -Test imap_clearflag_full() function : basic functionality +Test imap_clearflag_full() function : basic functionality --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- @@ -24,7 +24,7 @@ if (!is_resource($imap_stream)) { $check = imap_check($imap_stream); echo "Initial msg count in new_mailbox : ". $check->Nmsgs . "\n"; -echo "Set some flags\n"; +echo "Set some flags\n"; var_dump(imap_setflag_full($imap_stream, "1,3", "\\Seen \\Answered")); var_dump(imap_setflag_full($imap_stream, "2,4", "\\Answered")); var_dump(imap_setflag_full($imap_stream, "5,7", "\\Flagged \\Deleted")); @@ -49,7 +49,7 @@ imap_close($imap_stream); ?> ===Done=== --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_close_basic.phpt b/ext/imap/tests/imap_close_basic.phpt index a99853071b..bbb78bfbf9 100644 --- a/ext/imap/tests/imap_close_basic.phpt +++ b/ext/imap/tests/imap_close_basic.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : bool imap_close(resource $stream_id [, int $options]) - * Description: Close an IMAP stream + * Description: Close an IMAP stream * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_close_error.phpt b/ext/imap/tests/imap_close_error.phpt index fd32f3edd8..89cafab3ba 100644 --- a/ext/imap/tests/imap_close_error.phpt +++ b/ext/imap/tests/imap_close_error.phpt @@ -7,7 +7,7 @@ require_once (dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : bool imap_close(resource $stream_id [, int $options]) - * Description: Close an IMAP stream + * Description: Close an IMAP stream * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_close_variation1.phpt b/ext/imap/tests/imap_close_variation1.phpt index 4de03ddc52..493b5bf012 100644 --- a/ext/imap/tests/imap_close_variation1.phpt +++ b/ext/imap/tests/imap_close_variation1.phpt @@ -7,7 +7,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build --FILE-- <?php /* Prototype : bool imap_close(resource $stream_id [, int $options]) - * Description: Close an IMAP stream + * Description: Close an IMAP stream * Source code: ext/imap/php_imap.c */ @@ -59,7 +59,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -69,7 +69,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/imap/tests/imap_close_variation2.phpt b/ext/imap/tests/imap_close_variation2.phpt index f1d36d0abe..14ccd62b98 100644 --- a/ext/imap/tests/imap_close_variation2.phpt +++ b/ext/imap/tests/imap_close_variation2.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : bool imap_close(resource $stream_id [, int $options]) - * Description: Close an IMAP stream + * Description: Close an IMAP stream * Source code: ext/imap/php_imap.c */ @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', diff --git a/ext/imap/tests/imap_close_variation3.phpt b/ext/imap/tests/imap_close_variation3.phpt index 6f6161aa23..777ca07124 100644 --- a/ext/imap/tests/imap_close_variation3.phpt +++ b/ext/imap/tests/imap_close_variation3.phpt @@ -7,7 +7,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build --FILE-- <?php /* Prototype : bool imap_close(resource $stream_id [, int $options]) - * Description: Close an IMAP stream + * Description: Close an IMAP stream * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_close_variation4.phpt b/ext/imap/tests/imap_close_variation4.phpt index ca82619d42..7a2d59b9b1 100644 --- a/ext/imap/tests/imap_close_variation4.phpt +++ b/ext/imap/tests/imap_close_variation4.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : bool imap_close(resource $stream_id [, int $options]) - * Description: Close an IMAP stream + * Description: Close an IMAP stream * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_createmailbox_basic.phpt b/ext/imap/tests/imap_createmailbox_basic.phpt index 431d59f97d..e827af5960 100644 --- a/ext/imap/tests/imap_createmailbox_basic.phpt +++ b/ext/imap/tests/imap_createmailbox_basic.phpt @@ -1,7 +1,7 @@ --TEST-- -Test imap_createmailbox() function : basic functionality +Test imap_createmailbox() function : basic functionality --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- @@ -15,7 +15,7 @@ echo "*** Testing imap_createmailbox() : basic functionality ***\n"; require_once(dirname(__FILE__).'/imap_include.inc'); -$imap_stream = imap_open($default_mailbox, $username, $password) or +$imap_stream = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); $newname = "phpnewbox"; @@ -25,8 +25,8 @@ echo "Newname will be '$newname'\n"; $newbox = imap_utf7_encode($server.$newname); if (imap_createmailbox($imap_stream, $newbox)) { - echo "Add a couple of msgs to '$newname' mailbox\n"; - populate_mailbox($imap_stream, $newbox, 2); + echo "Add a couple of msgs to '$newname' mailbox\n"; + populate_mailbox($imap_stream, $newbox, 2); $status = imap_status($imap_stream, $newbox, SA_ALL); if ($status) { @@ -36,7 +36,7 @@ if (imap_createmailbox($imap_stream, $newbox)) { echo "Unseen: " . $status->unseen . "\n"; echo "UIDnext: " . $status->uidnext . "\n"; echo "UIDvalidity: " . $status->uidvalidity . "\n"; - + } else { echo "imap_status on new mailbox failed: " . imap_last_error() . "\n"; } diff --git a/ext/imap/tests/imap_errors_basic.phpt b/ext/imap/tests/imap_errors_basic.phpt index 91be3286aa..e4c7721393 100644 --- a/ext/imap/tests/imap_errors_basic.phpt +++ b/ext/imap/tests/imap_errors_basic.phpt @@ -1,7 +1,7 @@ --TEST-- -Test imap_errors() function : basic functionality +Test imap_errors() function : basic functionality --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- @@ -13,19 +13,19 @@ require_once(dirname(__FILE__).'/skipif.inc'); echo "*** Testing imap_errors() : basic functionality ***\n"; require_once(dirname(__FILE__).'/imap_include.inc'); -$password = "bogus"; // invalid password to use in this test +$password = "bogus"; // invalid password to use in this test echo "Issue open with invalid password with normal default number of retries, i.e 3\n"; $mbox = imap_open($default_mailbox, $username, $password, OP_READONLY, 3); echo "List any errors\n"; -var_dump(imap_errors()); +var_dump(imap_errors()); echo "\n\nIssue open with invalid password with retries == 1\n"; $mbox = imap_open($default_mailbox, $username, $password, OP_READONLY, 1); echo "List any errors\n"; -var_dump(imap_errors()); +var_dump(imap_errors()); ?> ===Done=== --EXPECTF-- diff --git a/ext/imap/tests/imap_fetch_overview_basic.phpt b/ext/imap/tests/imap_fetch_overview_basic.phpt index 83fab12391..152eaae9da 100644 --- a/ext/imap/tests/imap_fetch_overview_basic.phpt +++ b/ext/imap/tests/imap_fetch_overview_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_fetch_overview() function : basic functionality +Test imap_fetch_overview() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); @@ -7,8 +7,8 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers - * of the given message sequence + * Description: Read an overview of the information in the headers + * of the given message sequence * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetch_overview_error.phpt b/ext/imap/tests/imap_fetch_overview_error.phpt index e300e62928..78510d6bd1 100644 --- a/ext/imap/tests/imap_fetch_overview_error.phpt +++ b/ext/imap/tests/imap_fetch_overview_error.phpt @@ -7,8 +7,8 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers - * of the given message sequence + * Description: Read an overview of the information in the headers + * of the given message sequence * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetch_overview_variation1.phpt b/ext/imap/tests/imap_fetch_overview_variation1.phpt index 437cdcfa8a..f4b696a34e 100644 --- a/ext/imap/tests/imap_fetch_overview_variation1.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation1.phpt @@ -7,8 +7,8 @@ extension_loaded('imap') or die('skip imap extension not available in this build --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers - * of the given message sequence + * Description: Read an overview of the information in the headers + * of the given message sequence * Source code: ext/imap/php_imap.c */ @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/imap/tests/imap_fetch_overview_variation2.phpt b/ext/imap/tests/imap_fetch_overview_variation2.phpt index fbc0319fe8..0751c40816 100644 --- a/ext/imap/tests/imap_fetch_overview_variation2.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation2.phpt @@ -7,8 +7,8 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers - * of the given message sequence + * Description: Read an overview of the information in the headers + * of the given message sequence * Source code: ext/imap/php_imap.c */ @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/imap/tests/imap_fetch_overview_variation3.phpt b/ext/imap/tests/imap_fetch_overview_variation3.phpt index 7bd78d899e..a3543078a3 100644 --- a/ext/imap/tests/imap_fetch_overview_variation3.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation3.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers of the given message sequence + * Description: Read an overview of the information in the headers of the given message sequence * Source code: ext/imap/php_imap.c */ @@ -28,13 +28,13 @@ $msg_uid = imap_uid($stream_id, $msg_no); $options = array ('1', true, - 1.000000000000001, - 0.00001e5, - PHP_INT_MAX, + 1.000000000000001, + 0.00001e5, + PHP_INT_MAX, -PHP_INT_MAX ); -// iterate over each element of $options array +// iterate over each element of $options array $iterator = 1; imap_check($stream_id); foreach($options as $option) { diff --git a/ext/imap/tests/imap_fetch_overview_variation4.phpt b/ext/imap/tests/imap_fetch_overview_variation4.phpt index a5c2666310..4798344830 100644 --- a/ext/imap/tests/imap_fetch_overview_variation4.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation4.phpt @@ -7,8 +7,8 @@ extension_loaded('imap') or die('skip imap extension not available in this build --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers - * of the given message sequence + * Description: Read an overview of the information in the headers + * of the given message sequence * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetch_overview_variation5.phpt b/ext/imap/tests/imap_fetch_overview_variation5.phpt index 5feeedb523..d713a33934 100644 --- a/ext/imap/tests/imap_fetch_overview_variation5.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_fetch_overview() function : usage variations - $msg_no argument +Test imap_fetch_overview() function : usage variations - $msg_no argument --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); @@ -7,8 +7,8 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers - * of the given message sequence + * Description: Read an overview of the information in the headers + * of the given message sequence * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetch_overview_variation6.phpt b/ext/imap/tests/imap_fetch_overview_variation6.phpt index bdf05579de..4c2d3234f7 100644 --- a/ext/imap/tests/imap_fetch_overview_variation6.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation6.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers of the given message sequence + * Description: Read an overview of the information in the headers of the given message sequence * Source code: ext/imap/php_imap.c */ @@ -47,17 +47,17 @@ function create_multipart_message($imap_stream, $mailbox) { $part1["type"] = TYPEMULTIPART; $part1["subtype"] = "mixed"; - + $part2["type"] = TYPETEXT; $part2["subtype"] = "plain"; $part2["description"] = "imap_mail_compose() function"; $part2["contents.data"] = "message 1:xxxxxxxxxxxxxxxxxxxxxxxxxx"; - + $part3["type"] = TYPETEXT; $part3["subtype"] = "plain"; $part3["description"] = "Example"; $part3["contents.data"] = "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"; - + $file_handle = fopen(__FILE__, 'r+'); $file_size = 1; @@ -69,12 +69,12 @@ function create_multipart_message($imap_stream, $mailbox) { $part4['disposition'] = array ('filename' => 'Test'); $part4['type.parameters'] = array('name' => 'Test'); $part4["contents.data"] = base64_encode(fread($file_handle, 1)); - + $body[1] = $part1; $body[2] = $part2; $body[3] = $part3; $body[4] = $part4; - + $msg = imap_mail_compose($envelope, $body); if (imap_append($imap_stream, $mailbox, $msg) === false) { diff --git a/ext/imap/tests/imap_fetchbody_basic.phpt b/ext/imap/tests/imap_fetchbody_basic.phpt index c821f2046e..2986f0e89e 100644 --- a/ext/imap/tests/imap_fetchbody_basic.phpt +++ b/ext/imap/tests/imap_fetchbody_basic.phpt @@ -6,9 +6,9 @@ require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- <?php -/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section +/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section * [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ @@ -34,14 +34,14 @@ foreach ($options as $key => $option) { $msg_uid = imap_uid($stream_id, $msg_no); var_dump( imap_fetchbody($stream_id, $msg_uid, $section, $option) ); break; - + case 'FT_PEEK'; var_dump( imap_fetchbody($stream_id, $msg_no, $section, $option) ); $overview = imap_fetch_overview($stream_id, 1); echo "Seen Flag: "; var_dump( $overview[0]->seen ); break; - + case 'FT_INTERNAL'; var_dump( imap_fetchbody($stream_id, $msg_no, $section, $option) ); break; diff --git a/ext/imap/tests/imap_fetchbody_error.phpt b/ext/imap/tests/imap_fetchbody_error.phpt index f496fbd769..a91599a305 100644 --- a/ext/imap/tests/imap_fetchbody_error.phpt +++ b/ext/imap/tests/imap_fetchbody_error.phpt @@ -6,9 +6,9 @@ require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- <?php -/* Prototype :string imap_fetchbody(resource $stream_id, int $msg_no, string $section +/* Prototype :string imap_fetchbody(resource $stream_id, int $msg_no, string $section * [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchbody_variation1.phpt b/ext/imap/tests/imap_fetchbody_variation1.phpt index ac9087c3a2..1e207843a6 100644 --- a/ext/imap/tests/imap_fetchbody_variation1.phpt +++ b/ext/imap/tests/imap_fetchbody_variation1.phpt @@ -6,9 +6,9 @@ extension_loaded('imap') or die('skip imap extension not available in this build ?> --FILE-- <?php -/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section +/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section * [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/imap/tests/imap_fetchbody_variation2.phpt b/ext/imap/tests/imap_fetchbody_variation2.phpt index 8565e233c9..9093b516c2 100644 --- a/ext/imap/tests/imap_fetchbody_variation2.phpt +++ b/ext/imap/tests/imap_fetchbody_variation2.phpt @@ -6,9 +6,9 @@ require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- <?php -/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section +/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section * [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/imap/tests/imap_fetchbody_variation3.phpt b/ext/imap/tests/imap_fetchbody_variation3.phpt index 19656a1df3..560f2b8242 100644 --- a/ext/imap/tests/imap_fetchbody_variation3.phpt +++ b/ext/imap/tests/imap_fetchbody_variation3.phpt @@ -6,9 +6,9 @@ require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- <?php -/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section +/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section * [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/imap/tests/imap_fetchbody_variation4.phpt b/ext/imap/tests/imap_fetchbody_variation4.phpt index d8126bce0e..de336e4d50 100644 --- a/ext/imap/tests/imap_fetchbody_variation4.phpt +++ b/ext/imap/tests/imap_fetchbody_variation4.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ @@ -27,8 +27,8 @@ $msg_uid = imap_uid($stream_id, $msg_no); $section = 1; //Note: the first four values are valid as they will all be cast to 1L. -$options = array ('1', true, - 1.000000000000001, 0.00001e5, +$options = array ('1', true, + 1.000000000000001, 0.00001e5, PHP_INT_MAX, -PHP_INT_MAX); // iterate over each element of $options array to test whether FT_UID is set diff --git a/ext/imap/tests/imap_fetchbody_variation5.phpt b/ext/imap/tests/imap_fetchbody_variation5.phpt index dfc5e9fa55..50589e4d0b 100644 --- a/ext/imap/tests/imap_fetchbody_variation5.phpt +++ b/ext/imap/tests/imap_fetchbody_variation5.phpt @@ -6,9 +6,9 @@ extension_loaded('imap') or die('skip imap extension not available in this build ?> --FILE-- <?php -/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section +/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section * [, int options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchbody_variation6.phpt b/ext/imap/tests/imap_fetchbody_variation6.phpt index 96f754b625..ba3f788935 100644 --- a/ext/imap/tests/imap_fetchbody_variation6.phpt +++ b/ext/imap/tests/imap_fetchbody_variation6.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchheader_basic.phpt b/ext/imap/tests/imap_fetchheader_basic.phpt index 5502c55fc4..70bb66b2bd 100644 --- a/ext/imap/tests/imap_fetchheader_basic.phpt +++ b/ext/imap/tests/imap_fetchheader_basic.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ @@ -17,7 +17,7 @@ require_once(dirname(__FILE__).'/imap_include.inc'); // Initialise all required variables $stream_id = setup_test_mailbox('', 1, $mailbox, 'multiPart'); // setup temp mailbox with 1 msg $msg_no = 1; -$options = array('FT_UID' => FT_UID, 'FT_INTERNAL' => FT_INTERNAL, +$options = array('FT_UID' => FT_UID, 'FT_INTERNAL' => FT_INTERNAL, 'FT_PREFETCHTEXT' => FT_PREFETCHTEXT); // Calling imap_fetchheader() with all possible arguments diff --git a/ext/imap/tests/imap_fetchheader_error.phpt b/ext/imap/tests/imap_fetchheader_error.phpt index e2f5b1260b..77f6002eb5 100644 --- a/ext/imap/tests/imap_fetchheader_error.phpt +++ b/ext/imap/tests/imap_fetchheader_error.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchheader_variation1.phpt b/ext/imap/tests/imap_fetchheader_variation1.phpt index 22d56b1bd3..68b9e6e6cc 100644 --- a/ext/imap/tests/imap_fetchheader_variation1.phpt +++ b/ext/imap/tests/imap_fetchheader_variation1.phpt @@ -7,7 +7,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,14 +78,14 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // array data /*21*/ array(), $index_array, $assoc_array, array('foo', $index_array, $assoc_array), - - + + // object data /*25*/ new classA(), diff --git a/ext/imap/tests/imap_fetchheader_variation2.phpt b/ext/imap/tests/imap_fetchheader_variation2.phpt index 64ed2be319..5f3abcf2d5 100644 --- a/ext/imap/tests/imap_fetchheader_variation2.phpt +++ b/ext/imap/tests/imap_fetchheader_variation2.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,14 +78,14 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // array data /*21*/ array(), $index_array, $assoc_array, array('foo', $index_array, $assoc_array), - - + + // object data /*25*/ new classA(), diff --git a/ext/imap/tests/imap_fetchheader_variation3.phpt b/ext/imap/tests/imap_fetchheader_variation3.phpt index feba766e68..728f8c3899 100644 --- a/ext/imap/tests/imap_fetchheader_variation3.phpt +++ b/ext/imap/tests/imap_fetchheader_variation3.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ @@ -26,8 +26,8 @@ $stream_id = setup_test_mailbox('', 1); // set up temporary mailbox with one sim $msg_no = 1; $msg_uid = imap_uid($stream_id, $msg_no); -$options = array ('1', true, - 1.000000000000001, 0.00001e5, +$options = array ('1', true, + 1.000000000000001, 0.00001e5, PHP_INT_MAX, -PHP_INT_MAX); // iterate over each element of $options array to test whether FT_UID is set diff --git a/ext/imap/tests/imap_fetchheader_variation4.phpt b/ext/imap/tests/imap_fetchheader_variation4.phpt index b4b19e3d37..ad45f4d39d 100644 --- a/ext/imap/tests/imap_fetchheader_variation4.phpt +++ b/ext/imap/tests/imap_fetchheader_variation4.phpt @@ -7,7 +7,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchheader_variation5.phpt b/ext/imap/tests/imap_fetchheader_variation5.phpt index 0554ef0102..bdd6f6de60 100644 --- a/ext/imap/tests/imap_fetchheader_variation5.phpt +++ b/ext/imap/tests/imap_fetchheader_variation5.phpt @@ -7,12 +7,12 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ /* - * Pass different integers and strings as $msg_no argument + * Pass different integers and strings as $msg_no argument * to test behaviour of imap_fetchheader() */ @@ -24,7 +24,7 @@ $stream_id = setup_test_mailbox('', 3, $mailbox, 'notSimple'); // set up temp ma $sequences = array (0, 4, // out of range '1,3', '1:3', // message sequences instead of numbers - ); + ); foreach($sequences as $msg_no) { echo "\n-- \$msg_no is $msg_no --\n"; diff --git a/ext/imap/tests/imap_gc_error.phpt b/ext/imap/tests/imap_gc_error.phpt index 8738b7dd82..1a14ec1fed 100644 --- a/ext/imap/tests/imap_gc_error.phpt +++ b/ext/imap/tests/imap_gc_error.phpt @@ -17,7 +17,7 @@ imap_gc('', false); imap_gc(false, false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); imap_gc($stream_id, -1); diff --git a/ext/imap/tests/imap_getsubscribed_basic.phpt b/ext/imap/tests/imap_getsubscribed_basic.phpt index ba8a42daa8..63617686b1 100644 --- a/ext/imap/tests/imap_getsubscribed_basic.phpt +++ b/ext/imap/tests/imap_getsubscribed_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_getsubscribed() function : basic functionality +imap_getsubscribed() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -16,7 +16,7 @@ imap_getsubscribed(''); imap_getsubscribed(false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); imap_getsubscribed($stream_id); @@ -39,7 +39,7 @@ var_dump($z[0]); imap_close($stream_id); ?> --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_headerinfo_basic.phpt b/ext/imap/tests/imap_headerinfo_basic.phpt index b772476afc..afee066f4a 100644 --- a/ext/imap/tests/imap_headerinfo_basic.phpt +++ b/ext/imap/tests/imap_headerinfo_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_headerinfo() function : basic functionality +imap_headerinfo() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -16,7 +16,7 @@ $z = imap_headerinfo($stream_id, 1); $fields = array ('toaddress','to','fromaddress','from', 'reply_toaddress','reply_to', - 'senderaddress', 'sender', + 'senderaddress', 'sender', 'subject','Subject', 'Recent','Unseen','Flagged','Answered','Deleted','Draft', 'Msgno','MailDate','Size','udate'); @@ -84,7 +84,7 @@ imap_close($stream_id); ?> --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_headerinfo_error.phpt b/ext/imap/tests/imap_headerinfo_error.phpt index b526096fe1..9869c3472e 100644 --- a/ext/imap/tests/imap_headerinfo_error.phpt +++ b/ext/imap/tests/imap_headerinfo_error.phpt @@ -16,9 +16,9 @@ imap_headerinfo(''); imap_headerinfo(false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); - + imap_headerinfo($stream_id); imap_close($stream_id); diff --git a/ext/imap/tests/imap_list_basic.phpt b/ext/imap/tests/imap_list_basic.phpt index 36f07f755a..436cd5c3a3 100644 --- a/ext/imap/tests/imap_list_basic.phpt +++ b/ext/imap/tests/imap_list_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_list() function : basic functionality +imap_list() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -16,7 +16,7 @@ imap_list(''); imap_list(false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); imap_list($stream_id); diff --git a/ext/imap/tests/imap_lsub_basic.phpt b/ext/imap/tests/imap_lsub_basic.phpt index 153ca2a1bf..7775ec0c3e 100644 --- a/ext/imap/tests/imap_lsub_basic.phpt +++ b/ext/imap/tests/imap_lsub_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_lsub() function : basic functionality +imap_lsub() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -16,7 +16,7 @@ imap_lsub(''); imap_lsub(false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); imap_lsub($stream_id); @@ -39,7 +39,7 @@ var_dump($z[0]); imap_close($stream_id); ?> --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_mail_copy.phpt b/ext/imap/tests/imap_mail_copy.phpt index 47c5e61bb0..fc6d7e56a2 100644 --- a/ext/imap/tests/imap_mail_copy.phpt +++ b/ext/imap/tests/imap_mail_copy.phpt @@ -22,9 +22,9 @@ require_once(dirname(__FILE__).'/imap_include.inc'); echo "Test with IMAP server\n"; -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); - + var_dump(imap_mail_copy($stream_id)); var_dump(imap_mail_copy($stream_id,-1)); var_dump(imap_mail_copy($stream_id, '')); diff --git a/ext/imap/tests/imap_mail_copy_basic.phpt b/ext/imap/tests/imap_mail_copy_basic.phpt index a7b9421e31..05cb128a61 100644 --- a/ext/imap/tests/imap_mail_copy_basic.phpt +++ b/ext/imap/tests/imap_mail_copy_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_mail_copy() function : basic functionality +Test imap_mail_copy() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -9,7 +9,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : bool imap_mail_copy ( resource $imap_stream , string $msglist , string $mailbox [, int $options = 0 ] ) - * Description: Copies mail messages specified by msglist to specified mailbox. + * Description: Copies mail messages specified by msglist to specified mailbox. * Source code: ext/imap/php_imap.c */ @@ -25,7 +25,7 @@ if (!is_resource($imap_stream)) { } $check = imap_check($imap_stream); -echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; +echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; var_dump(imap_mail_copy($imap_stream, '1', 'INBOX.'.$mailbox_prefix)); @@ -33,7 +33,7 @@ imap_close($imap_stream); ?> ===Done=== --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_mail_move.phpt b/ext/imap/tests/imap_mail_move.phpt index 67ddea713a..0456e23c08 100644 --- a/ext/imap/tests/imap_mail_move.phpt +++ b/ext/imap/tests/imap_mail_move.phpt @@ -22,9 +22,9 @@ require_once(dirname(__FILE__).'/imap_include.inc'); echo "Test with IMAP server\n"; -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); - + var_dump(imap_mail_move($stream_id)); var_dump(imap_mail_move($stream_id,-1)); var_dump(imap_mail_move($stream_id, '')); diff --git a/ext/imap/tests/imap_mail_move_basic.phpt b/ext/imap/tests/imap_mail_move_basic.phpt index a543582565..bd04308a44 100644 --- a/ext/imap/tests/imap_mail_move_basic.phpt +++ b/ext/imap/tests/imap_mail_move_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_mail_move() function : basic functionality +Test imap_mail_move() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -9,7 +9,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : bool imap_mail_move ( resource $imap_stream , string $msglist , string $mailbox [, int $options = 0 ] ) - * Description: Copies mail messages specified by msglist to specified mailbox. + * Description: Copies mail messages specified by msglist to specified mailbox. * Source code: ext/imap/php_imap.c */ @@ -25,7 +25,7 @@ if (!is_resource($imap_stream)) { } $check = imap_check($imap_stream); -echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; +echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; var_dump(imap_mail_move($imap_stream, '1', 'INBOX.'.$mailbox_prefix)); @@ -33,7 +33,7 @@ imap_close($imap_stream); ?> ===Done=== --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_mutf7_to_utf8.phpt b/ext/imap/tests/imap_mutf7_to_utf8.phpt index 7a1a54aec5..e2c745ecd0 100644 --- a/ext/imap/tests/imap_mutf7_to_utf8.phpt +++ b/ext/imap/tests/imap_mutf7_to_utf8.phpt @@ -13,7 +13,7 @@ var_dump(imap_mutf7_to_utf8("t&AOQ-st")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(0) "" string(1) "1" diff --git a/ext/imap/tests/imap_renamemailbox_basic.phpt b/ext/imap/tests/imap_renamemailbox_basic.phpt index b445f1d3e4..d8b3f485e5 100644 --- a/ext/imap/tests/imap_renamemailbox_basic.phpt +++ b/ext/imap/tests/imap_renamemailbox_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_renamemailbox() function : basic functionality +imap_renamemailbox() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -17,7 +17,7 @@ imap_renamemailbox(false); require_once(dirname(__FILE__).'/imap_include.inc'); - + $stream_id = setup_test_mailbox('', 1); if (!is_resource($stream_id)) { @@ -43,7 +43,7 @@ var_dump(imap_renamemailbox($stream_id, $newbox.'.test', $newbox.'.testd')); imap_close($stream_id); ?> --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt index e4253925d2..07eb69bf68 100644 --- a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt +++ b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_rfc822_parse_headers() function : basic functionality +imap_rfc822_parse_headers() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -16,7 +16,7 @@ $z = imap_headerinfo($stream_id, 1); $fields = array ('toaddress','to','fromaddress','from', 'reply_toaddress','reply_to', - 'senderaddress', 'sender', + 'senderaddress', 'sender', 'subject','Subject', 'MailDate','Size','udate'); @@ -84,7 +84,7 @@ imap_close($stream_id); ?> --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_savebody_basic.phpt b/ext/imap/tests/imap_savebody_basic.phpt index 91e6ce03e9..23c3573996 100644 --- a/ext/imap/tests/imap_savebody_basic.phpt +++ b/ext/imap/tests/imap_savebody_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_savebody() function : basic functionality +imap_savebody() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -37,7 +37,7 @@ echo "Size: ".filesize($file)."\n"; imap_close($stream_id); ?> --CLEAN-- -<?php +<?php @unlink(dirname(__FILE__).'/tmpsavebody.txt'); require_once('clean.inc'); ?> diff --git a/ext/imap/tests/imap_timeout_basic.phpt b/ext/imap/tests/imap_timeout_basic.phpt index 9e616df60e..da93ded510 100644 --- a/ext/imap/tests/imap_timeout_basic.phpt +++ b/ext/imap/tests/imap_timeout_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_timeout() function : basic functionality +imap_timeout() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- diff --git a/ext/imap/tests/imap_undelete_basic.phpt b/ext/imap/tests/imap_undelete_basic.phpt index 4b48b1b09a..60e30ae21b 100644 --- a/ext/imap/tests/imap_undelete_basic.phpt +++ b/ext/imap/tests/imap_undelete_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_undelete() function : basic functionality +imap_undelete() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -20,7 +20,7 @@ imap_close($stream_id); ?> --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_undelete_error.phpt b/ext/imap/tests/imap_undelete_error.phpt index c82801e15a..3366c04f05 100644 --- a/ext/imap/tests/imap_undelete_error.phpt +++ b/ext/imap/tests/imap_undelete_error.phpt @@ -16,9 +16,9 @@ imap_undelete(''); imap_undelete(false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); - + imap_undelete($stream_id); imap_close($stream_id); diff --git a/ext/imap/tests/imap_utf8.phpt b/ext/imap/tests/imap_utf8.phpt index f701f82f27..a8901555d5 100644 --- a/ext/imap/tests/imap_utf8.phpt +++ b/ext/imap/tests/imap_utf8.phpt @@ -12,7 +12,7 @@ var_dump(imap_utf8("test")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(0) "" string(1) "1" diff --git a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt index 54b43efaec..bea268a457 100644 --- a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt +++ b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt @@ -13,7 +13,7 @@ var_dump(imap_utf8_to_mutf7("täst")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(0) "" string(1) "1" |