com php-src: Use 'user@example.com' rather than 'user@company.com' in tests: ext/standard/tests/mail/bug51604.phpt ext/standard/tests
/mail/mail_basic.phpt ext/standard/tests/mail/mail_basi c2.phpt ext/standard/tests/mail/mail_basic3.phpt ext/standard/tests/mail/mail_basic4.phpt
ext/standard/t ests/mail/mail_basic5.phpt ext/standard/tests/mail/mail _basic_alt1-win32.phpt ext/standard/tests/mail/ma il_basic_alt2-win32.phpt
ext/standard/tests/mail/ mail_
| From: | Sara Golemon | Date: | Wed, 04 Dec 2013 15:51:43 +0000 |
| Subject: | com php-src: Use 'user@example.com' rather than 'user@company.com' in tests: ext/standard/tests/mail/bug51604.phpt ext/standard/tests /mail/mail_basic.phpt ext/standard/tests/mail/mail_basi c2.phpt ext/standard/tests/mail/mail_basic3.phpt ext/standard/tests/mail/mail_basic4.phpt ext/standard/t ests/mail/mail_basic5.phpt ext/standard/tests/mail/mail _basic_alt1-win32.phpt ext/standard/tests/mail/ma il_basic_alt2-win32.phpt ext/standard/tests/mail/ mail_ |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74259@lists.php.net to get a copy of this message | ||
Commit: 9adfcea2412b74692bfc7c1ad5174bd3ac655470
Author: Sara Golemon <pollita@php.net> Wed, 4 Dec 2013 07:49:16 -0800
Parents: ecf95a4cc5ef0168b0669cc659cad83eb7807efd
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9adfcea2412b74692bfc7c1ad5174bd3ac655470
Log:
Use 'user@example.com' rather than 'user@company.com' in tests
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
Changed paths:
M ext/standard/tests/mail/bug51604.phpt
M ext/standard/tests/mail/mail_basic.phpt
M ext/standard/tests/mail/mail_basic2.phpt
M ext/standard/tests/mail/mail_basic3.phpt
M ext/standard/tests/mail/mail_basic4.phpt
M ext/standard/tests/mail/mail_basic5.phpt
M ext/standard/tests/mail/mail_basic_alt1-win32.phpt
M ext/standard/tests/mail/mail_basic_alt2-win32.phpt
M ext/standard/tests/mail/mail_basic_alt3-win32.phpt
M ext/standard/tests/mail/mail_basic_alt4-win32.phpt
M ext/standard/tests/mail/mail_variation1.phpt
M ext/standard/tests/mail/mail_variation2.phpt
M ext/standard/tests/mail/mail_variation_alt1-win32.phpt
M ext/standard/tests/mail/mail_variation_alt2-win32.phpt
diff --git a/ext/standard/tests/mail/bug51604.phpt b/ext/standard/tests/mail/bug51604.phpt index a657021..988849c 100644 --- a/ext/standard/tests/mail/bug51604.phpt +++ b/ext/standard/tests/mail/bug51604.phpt @@ -11,7 +11,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; $additional_headers = "KHeaders\n\n\n\n\n"; @@ -27,7 +27,7 @@ unlink($outFile); ===DONE=== --EXPECT-- bool(true) -To: user@company.com +To: user@example.com Subject: Test Subject KHeaders diff --git a/ext/standard/tests/mail/mail_basic.phpt b/ext/standard/tests/mail/mail_basic.phpt index fecb50f..70f32df 100644 --- a/ext/standard/tests/mail/mail_basic.phpt +++ b/ext/standard/tests/mail/mail_basic.phpt @@ -20,7 +20,7 @@ echo "*** Testing mail() : basic functionality ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; $additional_headers = 'KHeaders'; @@ -45,7 +45,7 @@ unlink($outFile); *** Testing mail() : basic functionality *** -- All Mail Content Parameters -- bool(true) -To: user@company.com +To: user@example.com Subject: Test Subject KHeaders @@ -53,7 +53,7 @@ A Message -- Mandatory Parameters -- bool(true) -To: user@company.com +To: user@example.com Subject: Test Subject A Message diff --git a/ext/standard/tests/mail/mail_basic2.phpt b/ext/standard/tests/mail/mail_basic2.phpt index 8967d18..60ad009 100644 --- a/ext/standard/tests/mail/mail_basic2.phpt +++ b/ext/standard/tests/mail/mail_basic2.phpt @@ -20,7 +20,7 @@ echo "*** Testing mail() : basic functionality ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; $additional_headers = 'KHeaders'; @@ -40,7 +40,7 @@ unlink($outFile); *** Testing mail() : basic functionality *** -- extra parameters -- bool(true) -%w1%wTo: user@company.com +%w1%wTo: user@example.com %w2%wSubject: Test Subject %w3%wKHeaders %w4%w diff --git a/ext/standard/tests/mail/mail_basic3.phpt b/ext/standard/tests/mail/mail_basic3.phpt index 58eae03..3e648e5 100644 --- a/ext/standard/tests/mail/mail_basic3.phpt +++ b/ext/standard/tests/mail/mail_basic3.phpt @@ -19,7 +19,7 @@ echo "*** Testing mail() : basic functionality ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; diff --git a/ext/standard/tests/mail/mail_basic4.phpt b/ext/standard/tests/mail/mail_basic4.phpt index 9ecc886..de2407a 100644 --- a/ext/standard/tests/mail/mail_basic4.phpt +++ b/ext/standard/tests/mail/mail_basic4.phpt @@ -19,7 +19,7 @@ echo "*** Testing mail() : basic functionality ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; diff --git a/ext/standard/tests/mail/mail_basic5.phpt b/ext/standard/tests/mail/mail_basic5.phpt index 7e42ccb..8d755eb 100644 --- a/ext/standard/tests/mail/mail_basic5.phpt +++ b/ext/standard/tests/mail/mail_basic5.phpt @@ -19,7 +19,7 @@ echo "*** Testing mail() : basic functionality ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; diff --git a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt index 3c4dd88..fc50498 100644 --- a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt @@ -22,7 +22,7 @@ max_execution_time = 120 error_reporting(E_ALL & ~E_STRICT); ini_set("SMTP", "localhost"); ini_set("smtp_port", 25); -ini_set("sendmail_from", "user@company.com"); +ini_set("sendmail_from", "user@example.com"); echo "*** Testing mail() : basic functionality ***\n"; require_once(dirname(__FILE__).'/mail_include.inc'); diff --git a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt index d7bae62..892d923 100644 --- a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt @@ -32,7 +32,7 @@ bool mail ( string \$to , string \$subject , string \$message [, string \$additi Send an email message HERE; -$extra_headers = "from: user@company.com"; +$extra_headers = "from: user@example.com"; $res = mail($to, $subject, $message, $extra_headers); diff --git a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt index 86b57eb..1caa68c 100644 --- a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt @@ -32,7 +32,7 @@ bool mail ( string \$to , string \$subject , string \$message [, string \$additi Send an email message HERE; -$extra_headers = "FRom: user@company.com"; +$extra_headers = "FRom: user@example.com"; $res = mail($to, $subject, $message, $extra_headers); diff --git a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt index f4a9d46..c8e4524 100644 --- a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt @@ -32,7 +32,7 @@ bool mail ( string \$to , string \$subject , string \$message [, string \$additi Send an email message HERE; -$extra_headers = "from: user@company.com"; +$extra_headers = "from: user@example.com"; $extra_parameters = "addons"; // should be ignored $res = mail($to, $subject, $message, $extra_headers, $extra_parameters); diff --git a/ext/standard/tests/mail/mail_variation1.phpt b/ext/standard/tests/mail/mail_variation1.phpt index bf37bf4..a8eb6be 100644 --- a/ext/standard/tests/mail/mail_variation1.phpt +++ b/ext/standard/tests/mail/mail_variation1.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") echo "*** Testing mail() : variation ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; var_dump( mail($to, $subject, $message) ); diff --git a/ext/standard/tests/mail/mail_variation2.phpt b/ext/standard/tests/mail/mail_variation2.phpt index c16c270..f0e4424 100644 --- a/ext/standard/tests/mail/mail_variation2.phpt +++ b/ext/standard/tests/mail/mail_variation2.phpt @@ -21,7 +21,7 @@ echo "*** Testing mail() : basic functionality ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; $outFile = "/tmp/php_test_mailVariation2.out"; @@ -36,7 +36,7 @@ unlink($outFile); --EXPECTF-- *** Testing mail() : basic functionality *** bool(true) -%w1%wTo: user@company.com +%w1%wTo: user@example.com %w2%wSubject: Test Subject %w3%w %w4%wA Message diff --git a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt index b81f3af..dd7fd93 100644 --- a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt @@ -21,7 +21,7 @@ max_execution_time = 120 error_reporting(E_ALL & ~E_STRICT); ini_set("SMTP", "localhost"); ini_set("smtp_port", 2525); -ini_set("sendmail_from", "user@company.com"); +ini_set("sendmail_from", "user@example.com"); echo "*** Testing mail() : basic functionality ***\n"; require_once(dirname(__FILE__).'/mail_include.inc'); diff --git a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt index 6ae06bb..817cc36 100644 --- a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt @@ -21,7 +21,7 @@ max_execution_time = 120 error_reporting(E_ALL & ~E_STRICT); ini_set("SMTP", "localplace"); ini_set("smtp_port", 25); -ini_set("sendmail_from", "user@company.com"); +ini_set("sendmail_from", "user@example.com"); echo "*** Testing mail() : basic functionality ***\n"; require_once(dirname(__FILE__).'/mail_include.inc');
diff --git a/ext/standard/tests/mail/bug51604.phpt b/ext/standard/tests/mail/bug51604.phpt index a657021..988849c 100644 --- a/ext/standard/tests/mail/bug51604.phpt +++ b/ext/standard/tests/mail/bug51604.phpt @@ -11,7 +11,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; $additional_headers = "KHeaders\n\n\n\n\n"; @@ -27,7 +27,7 @@ unlink($outFile); ===DONE=== --EXPECT-- bool(true) -To: user@company.com +To: user@example.com Subject: Test Subject KHeaders diff --git a/ext/standard/tests/mail/mail_basic.phpt b/ext/standard/tests/mail/mail_basic.phpt index fecb50f..70f32df 100644 --- a/ext/standard/tests/mail/mail_basic.phpt +++ b/ext/standard/tests/mail/mail_basic.phpt @@ -20,7 +20,7 @@ echo "*** Testing mail() : basic functionality ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; $additional_headers = 'KHeaders'; @@ -45,7 +45,7 @@ unlink($outFile); *** Testing mail() : basic functionality *** -- All Mail Content Parameters -- bool(true) -To: user@company.com +To: user@example.com Subject: Test Subject KHeaders @@ -53,7 +53,7 @@ A Message -- Mandatory Parameters -- bool(true) -To: user@company.com +To: user@example.com Subject: Test Subject A Message diff --git a/ext/standard/tests/mail/mail_basic2.phpt b/ext/standard/tests/mail/mail_basic2.phpt index 8967d18..60ad009 100644 --- a/ext/standard/tests/mail/mail_basic2.phpt +++ b/ext/standard/tests/mail/mail_basic2.phpt @@ -20,7 +20,7 @@ echo "*** Testing mail() : basic functionality ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; $additional_headers = 'KHeaders'; @@ -40,7 +40,7 @@ unlink($outFile); *** Testing mail() : basic functionality *** -- extra parameters -- bool(true) -%w1%wTo: user@company.com +%w1%wTo: user@example.com %w2%wSubject: Test Subject %w3%wKHeaders %w4%w diff --git a/ext/standard/tests/mail/mail_basic3.phpt b/ext/standard/tests/mail/mail_basic3.phpt index 58eae03..3e648e5 100644 --- a/ext/standard/tests/mail/mail_basic3.phpt +++ b/ext/standard/tests/mail/mail_basic3.phpt @@ -19,7 +19,7 @@ echo "*** Testing mail() : basic functionality ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; diff --git a/ext/standard/tests/mail/mail_basic4.phpt b/ext/standard/tests/mail/mail_basic4.phpt index 9ecc886..de2407a 100644 --- a/ext/standard/tests/mail/mail_basic4.phpt +++ b/ext/standard/tests/mail/mail_basic4.phpt @@ -19,7 +19,7 @@ echo "*** Testing mail() : basic functionality ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; diff --git a/ext/standard/tests/mail/mail_basic5.phpt b/ext/standard/tests/mail/mail_basic5.phpt index 7e42ccb..8d755eb 100644 --- a/ext/standard/tests/mail/mail_basic5.phpt +++ b/ext/standard/tests/mail/mail_basic5.phpt @@ -19,7 +19,7 @@ echo "*** Testing mail() : basic functionality ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; diff --git a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt index 3c4dd88..fc50498 100644 --- a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt @@ -22,7 +22,7 @@ max_execution_time = 120 error_reporting(E_ALL & ~E_STRICT); ini_set("SMTP", "localhost"); ini_set("smtp_port", 25); -ini_set("sendmail_from", "user@company.com"); +ini_set("sendmail_from", "user@example.com"); echo "*** Testing mail() : basic functionality ***\n"; require_once(dirname(__FILE__).'/mail_include.inc'); diff --git a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt index d7bae62..892d923 100644 --- a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt @@ -32,7 +32,7 @@ bool mail ( string \$to , string \$subject , string \$message [, string \$additi Send an email message HERE; -$extra_headers = "from: user@company.com"; +$extra_headers = "from: user@example.com"; $res = mail($to, $subject, $message, $extra_headers); diff --git a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt index 86b57eb..1caa68c 100644 --- a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt @@ -32,7 +32,7 @@ bool mail ( string \$to , string \$subject , string \$message [, string \$additi Send an email message HERE; -$extra_headers = "FRom: user@company.com"; +$extra_headers = "FRom: user@example.com"; $res = mail($to, $subject, $message, $extra_headers); diff --git a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt index f4a9d46..c8e4524 100644 --- a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt @@ -32,7 +32,7 @@ bool mail ( string \$to , string \$subject , string \$message [, string \$additi Send an email message HERE; -$extra_headers = "from: user@company.com"; +$extra_headers = "from: user@example.com"; $extra_parameters = "addons"; // should be ignored $res = mail($to, $subject, $message, $extra_headers, $extra_parameters); diff --git a/ext/standard/tests/mail/mail_variation1.phpt b/ext/standard/tests/mail/mail_variation1.phpt index bf37bf4..a8eb6be 100644 --- a/ext/standard/tests/mail/mail_variation1.phpt +++ b/ext/standard/tests/mail/mail_variation1.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") echo "*** Testing mail() : variation ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; var_dump( mail($to, $subject, $message) ); diff --git a/ext/standard/tests/mail/mail_variation2.phpt b/ext/standard/tests/mail/mail_variation2.phpt index c16c270..f0e4424 100644 --- a/ext/standard/tests/mail/mail_variation2.phpt +++ b/ext/standard/tests/mail/mail_variation2.phpt @@ -21,7 +21,7 @@ echo "*** Testing mail() : basic functionality ***\n"; // Initialise all required variables -$to = 'user@company.com'; +$to = 'user@example.com'; $subject = 'Test Subject'; $message = 'A Message'; $outFile = "/tmp/php_test_mailVariation2.out"; @@ -36,7 +36,7 @@ unlink($outFile); --EXPECTF-- *** Testing mail() : basic functionality *** bool(true) -%w1%wTo: user@company.com +%w1%wTo: user@example.com %w2%wSubject: Test Subject %w3%w %w4%wA Message diff --git a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt index b81f3af..dd7fd93 100644 --- a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt @@ -21,7 +21,7 @@ max_execution_time = 120 error_reporting(E_ALL & ~E_STRICT); ini_set("SMTP", "localhost"); ini_set("smtp_port", 2525); -ini_set("sendmail_from", "user@company.com"); +ini_set("sendmail_from", "user@example.com"); echo "*** Testing mail() : basic functionality ***\n"; require_once(dirname(__FILE__).'/mail_include.inc'); diff --git a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt index 6ae06bb..817cc36 100644 --- a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt @@ -21,7 +21,7 @@ max_execution_time = 120 error_reporting(E_ALL & ~E_STRICT); ini_set("SMTP", "localplace"); ini_set("smtp_port", 25); -ini_set("sendmail_from", "user@company.com"); +ini_set("sendmail_from", "user@example.com"); echo "*** Testing mail() : basic functionality ***\n"; require_once(dirname(__FILE__).'/mail_include.inc');