mirror/PHPMailer
0
0
Fork 0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 10:02:14 +02:00
Code

Revert to old code for POP tests, ignore exit errors

Browse Source 
Update deps
This commit is contained in:
Synchro 2015-12-01 10:20:44 +01:00
parent 0d0213af5b
commit bd4bb1024a
2 changed files with 160 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

237
composer.lock generated
View File

@ -1553,16 +1553,16 @@
},
{
"name": "phpunit/phpunit",
"version": "4.8.18",
"version": "4.8.19",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "fa33d4ad96481b91df343d83e8c8aabed6b1dfd3"
"reference": "b2caaf8947aba5e002d42126723e9d69795f32b4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fa33d4ad96481b91df343d83e8c8aabed6b1dfd3",
"reference": "fa33d4ad96481b91df343d83e8c8aabed6b1dfd3",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b2caaf8947aba5e002d42126723e9d69795f32b4",
"reference": "b2caaf8947aba5e002d42126723e9d69795f32b4",
"shasum": ""
},
"require": {
@ -1621,7 +1621,7 @@
"testing",
"xunit"
],
"time": "2015-11-11 11:32:49"
"time": "2015-11-30 08:18:59"
},
{
"name": "phpunit/phpunit-mock-objects",
@ -2184,26 +2184,26 @@
},
{
"name": "symfony/config",
"version": "v2.7.7",
"version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
"reference": "61973327bfb054f6f470de7be033a28b76c1dc20"
"reference": "f21c97aec1b5302d2dc0d17047ea8f4e4ff93aae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/61973327bfb054f6f470de7be033a28b76c1dc20",
"reference": "61973327bfb054f6f470de7be033a28b76c1dc20",
"url": "https://api.github.com/repos/symfony/config/zipball/f21c97aec1b5302d2dc0d17047ea8f4e4ff93aae",
"reference": "f21c97aec1b5302d2dc0d17047ea8f4e4ff93aae",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/filesystem": "~2.3"
"symfony/filesystem": "~2.3|~3.0.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "2.8-dev"
}
},
"autoload": {
@ -2230,29 +2230,30 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
"time": "2015-11-02 20:20:53"
"time": "2015-11-23 20:38:01"
},
{
"name": "symfony/console",
"version": "v2.7.7",
"version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "16bb1cb86df43c90931df65f529e7ebd79636750"
"reference": "d232bfc100dfd32b18ccbcab4bcc8f28697b7e41"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/16bb1cb86df43c90931df65f529e7ebd79636750",
"reference": "16bb1cb86df43c90931df65f529e7ebd79636750",
"url": "https://api.github.com/repos/symfony/console/zipball/d232bfc100dfd32b18ccbcab4bcc8f28697b7e41",
"reference": "d232bfc100dfd32b18ccbcab4bcc8f28697b7e41",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
"php": ">=5.3.9",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/event-dispatcher": "~2.1",
"symfony/process": "~2.1"
"symfony/event-dispatcher": "~2.1|~3.0.0",
"symfony/process": "~2.1|~3.0.0"
},
"suggest": {
"psr/log": "For using the console logger",
@ -2262,7 +2263,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "2.8-dev"
}
},
"autoload": {
@ -2289,20 +2290,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2015-11-18 09:54:26"
"time": "2015-11-30 12:35:10"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.7.7",
"version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "7e2f9c31645680026c2372edf66f863fc7757af5"
"reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7e2f9c31645680026c2372edf66f863fc7757af5",
"reference": "7e2f9c31645680026c2372edf66f863fc7757af5",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc",
"reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc",
"shasum": ""
},
"require": {
@ -2310,10 +2311,10 @@
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.0,>=2.0.5",
"symfony/dependency-injection": "~2.6",
"symfony/expression-language": "~2.6",
"symfony/stopwatch": "~2.3"
"symfony/config": "~2.0,>=2.0.5|~3.0.0",
"symfony/dependency-injection": "~2.6|~3.0.0",
"symfony/expression-language": "~2.6|~3.0.0",
"symfony/stopwatch": "~2.3|~3.0.0"
},
"suggest": {
"symfony/dependency-injection": "",
@ -2322,7 +2323,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "2.8-dev"
}
},
"autoload": {
@ -2349,29 +2350,29 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2015-10-30 20:10:21"
"time": "2015-10-30 20:15:42"
},
{
"name": "symfony/filesystem",
"version": "v2.7.7",
"version": "v3.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "8e173509d7fdbbba3cf34d6d072f2073c0210c1d"
"reference": "692d98d813e4ef314b9c22775c86ddbeb0f44884"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/8e173509d7fdbbba3cf34d6d072f2073c0210c1d",
"reference": "8e173509d7fdbbba3cf34d6d072f2073c0210c1d",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/692d98d813e4ef314b9c22775c86ddbeb0f44884",
"reference": "692d98d813e4ef314b9c22775c86ddbeb0f44884",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
"php": ">=5.5.9"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "3.0-dev"
}
},
"autoload": {
@ -2398,20 +2399,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"time": "2015-11-18 13:41:01"
"time": "2015-11-23 10:41:47"
},
{
"name": "symfony/finder",
"version": "v2.7.7",
"version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "a06a0c0ff7db3736a50d530c908cca547bf13da9"
"reference": "ead9b07af4ba77b6507bee697396a5c79e633f08"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/a06a0c0ff7db3736a50d530c908cca547bf13da9",
"reference": "a06a0c0ff7db3736a50d530c908cca547bf13da9",
"url": "https://api.github.com/repos/symfony/finder/zipball/ead9b07af4ba77b6507bee697396a5c79e633f08",
"reference": "ead9b07af4ba77b6507bee697396a5c79e633f08",
"shasum": ""
},
"require": {
@ -2420,7 +2421,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "2.8-dev"
}
},
"autoload": {
@ -2447,20 +2448,76 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2015-10-30 20:10:21"
"time": "2015-10-30 20:15:42"
},
{
"name": "symfony/process",
"version": "v2.7.7",
"name": "symfony/polyfill-mbstring",
"version": "v1.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "f6290983c8725d0afa29bdc3e5295879de3e58f5"
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "0b6a8940385311a24e060ec1fe35680e17c74497"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/f6290983c8725d0afa29bdc3e5295879de3e58f5",
"reference": "f6290983c8725d0afa29bdc3e5295879de3e58f5",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497",
"reference": "0b6a8940385311a24e060ec1fe35680e17c74497",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Mbstring\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill for the Mbstring extension",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"mbstring",
"polyfill",
"portable",
"shim"
],
"time": "2015-11-04 20:28:58"
},
{
"name": "symfony/process",
"version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "1b988a88e3551102f3c2d9e1d47a18c3a78d6312"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/1b988a88e3551102f3c2d9e1d47a18c3a78d6312",
"reference": "1b988a88e3551102f3c2d9e1d47a18c3a78d6312",
"shasum": ""
},
"require": {
@ -2469,7 +2526,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "2.8-dev"
}
},
"autoload": {
@ -2496,20 +2553,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2015-11-19 16:11:24"
"time": "2015-11-30 12:35:10"
},
{
"name": "symfony/stopwatch",
"version": "v2.7.7",
"version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
"reference": "9fa59908b0c5575980a1623723a5b5cb38e0a04a"
"reference": "5f1e2ebd1044da542d2b9510527836e8be92b1cb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/9fa59908b0c5575980a1623723a5b5cb38e0a04a",
"reference": "9fa59908b0c5575980a1623723a5b5cb38e0a04a",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/5f1e2ebd1044da542d2b9510527836e8be92b1cb",
"reference": "5f1e2ebd1044da542d2b9510527836e8be92b1cb",
"shasum": ""
},
"require": {
@ -2518,7 +2575,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "2.8-dev"
}
},
"autoload": {
@ -2545,33 +2602,34 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
"time": "2015-10-30 20:10:21"
"time": "2015-10-30 20:15:42"
},
{
"name": "symfony/translation",
"version": "v2.7.7",
"version": "v3.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "e4ecb9c3ba1304eaf24de15c2d7a428101c1982f"
"reference": "7f14717150a7445f8475864d1235875dd04061fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/e4ecb9c3ba1304eaf24de15c2d7a428101c1982f",
"reference": "e4ecb9c3ba1304eaf24de15c2d7a428101c1982f",
"url": "https://api.github.com/repos/symfony/translation/zipball/7f14717150a7445f8475864d1235875dd04061fb",
"reference": "7f14717150a7445f8475864d1235875dd04061fb",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
"php": ">=5.5.9",
"symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
"symfony/config": "<2.7"
"symfony/config": "<2.8"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.7",
"symfony/intl": "~2.4",
"symfony/yaml": "~2.2"
"symfony/config": "~2.8|~3.0",
"symfony/intl": "~2.8|~3.0",
"symfony/yaml": "~2.8|~3.0"
},
"suggest": {
"psr/log": "To use logging capability in translator",
@ -2581,7 +2639,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "3.0-dev"
}
},
"autoload": {
@ -2608,37 +2666,36 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"time": "2015-11-18 13:41:01"
"time": "2015-11-18 13:48:51"
},
{
"name": "symfony/validator",
"version": "v2.7.7",
"version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
"reference": "8b78ce4c296a2fc453f9a32ece71940011b8b44b"
"reference": "8c42b96f5b23f0642c1a518addafcef8077154a2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/validator/zipball/8b78ce4c296a2fc453f9a32ece71940011b8b44b",
"reference": "8b78ce4c296a2fc453f9a32ece71940011b8b44b",
"url": "https://api.github.com/repos/symfony/validator/zipball/8c42b96f5b23f0642c1a518addafcef8077154a2",
"reference": "8c42b96f5b23f0642c1a518addafcef8077154a2",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/translation": "~2.4"
"symfony/translation": "~2.4|~3.0.0"
},
"require-dev": {
"doctrine/annotations": "~1.0",
"doctrine/cache": "~1.0",
"doctrine/common": "~2.3",
"egulias/email-validator": "~1.2,>=1.2.1",
"symfony/config": "~2.2",
"symfony/expression-language": "~2.4",
"symfony/http-foundation": "~2.1",
"symfony/intl": "~2.4",
"symfony/property-access": "~2.3",
"symfony/yaml": "~2.0,>=2.0.5"
"symfony/config": "~2.2|~3.0.0",
"symfony/expression-language": "~2.4|~3.0.0",
"symfony/http-foundation": "~2.1|~3.0.0",
"symfony/intl": "~2.4|~3.0.0",
"symfony/property-access": "~2.3|~3.0.0",
"symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
},
"suggest": {
"doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
@ -2654,7 +2711,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "2.8-dev"
}
},
"autoload": {
@ -2681,29 +2738,29 @@
],
"description": "Symfony Validator Component",
"homepage": "https://symfony.com",
"time": "2015-11-18 13:41:01"
"time": "2015-11-20 14:39:26"
},
{
"name": "symfony/yaml",
"version": "v2.7.7",
"version": "v3.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "4cfcd7a9fceba662b3c036b7d9a91f6197af046c"
"reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/4cfcd7a9fceba662b3c036b7d9a91f6197af046c",
"reference": "4cfcd7a9fceba662b3c036b7d9a91f6197af046c",
"url": "https://api.github.com/repos/symfony/yaml/zipball/177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002",
"reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
"php": ">=5.5.9"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "3.0-dev"
}
},
"autoload": {
@ -2730,7 +2787,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2015-11-18 13:41:01"
"time": "2015-11-30 12:36:17"
},
{
"name": "twig/twig",

34
test/phpmailerTest.php
View File

@ -1961,24 +1961,20 @@ EOT;
public function testPopBeforeSmtpGood()
{
//Start a fake POP server
// $cmd = 'nohup ' .
// escapeshellcmd($this->INCLUDE_DIR . '/test/runfakepopserver.sh') .
// ' >/dev/null 2>/dev/null & printf "%u" $!';
$cmd = 'nohup ' .
escapeshellcmd($this->INCLUDE_DIR . '/test/runfakepopserver.sh') .
' & printf "%u" $!';
$pid = shell_exec($cmd);
echo "Running POP3 server $cmd\nPID = $pid\n";
$pid = shell_exec(
'nohup ' . $this->INCLUDE_DIR .
'/runfakepopserver.sh 1100 >/dev/null 2>/dev/null & printf "%u" $!'
);
$this->pids[] = $pid;
sleep(2);
sleep(1);
//Test a known-good login
$this->assertTrue(
POP3::popBeforeSmtp('localhost', 1100, 10, 'user', 'test', $this->Mail->SMTPDebug),
'POP before SMTP failed'
);
//Kill the fake server
shell_exec('kill -TERM ' . escapeshellarg($pid));
//Kill the fake server, don't care if it fails
@shell_exec('kill -TERM ' . escapeshellarg($pid));
sleep(2);
}
@ -1990,16 +1986,11 @@ EOT;
{
//Start a fake POP server on a different port
//so we don't inadvertently connect to the previous instance
// $cmd = 'nohup ' .
// escapeshellcmd($this->INCLUDE_DIR . '/test/runfakepopserver.sh') .
// ' 1101 >/dev/null 2>/dev/null & printf "%u" $!';
$cmd = 'nohup ' .
escapeshellcmd($this->INCLUDE_DIR . '/test/runfakepopserver.sh') .
' 1101 & printf "%u" $!';
$pid = shell_exec($cmd);
echo "Running POP3 server $cmd\nPID = $pid\n";
$pid = shell_exec(
'nohup '. $this->INCLUDE_DIR .
'/runfakepopserver.sh 1101 >/dev/null 2>/dev/null & printf "%u" $!'
);
$this->pids[] = $pid;
shell_exec('ps -f -p ' . escapeshellarg($pid));
sleep(2);
//Test a known-bad login
@ -2007,7 +1998,8 @@ EOT;
POP3::popBeforeSmtp('localhost', 1101, 10, 'user', 'xxx', $this->Mail->SMTPDebug),
'POP before SMTP should have failed'
);
shell_exec('kill -TERM ' . escapeshellarg($pid));
//Kill the fake server, don't care if it fails
@shell_exec('kill -TERM ' . escapeshellarg($pid));
sleep(2);
}