diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-04-05 12:51:59 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-04-05 12:51:59 +0000 |
| commit | 343e40efb539159bff58339cae63279e2a7cf9c2 (patch) | |
| tree | 114140210c76d51c9946300ec02fa676aebf6ad5 /user/php7/fix-tests-devserver.patch | |
| parent | 0b10cc74d61cd3b81c5f3b54d44bc6c3e1723a03 (diff) | |
| parent | af409aaaaf71ee25115f59e64bf8ea566d278176 (diff) | |
| download | packages-343e40efb539159bff58339cae63279e2a7cf9c2.tar.gz packages-343e40efb539159bff58339cae63279e2a7cf9c2.tar.bz2 packages-343e40efb539159bff58339cae63279e2a7cf9c2.tar.xz packages-343e40efb539159bff58339cae63279e2a7cf9c2.zip | |
Merge branch 'bump/php744' into 'master'
Bump PHP to 7.4.4
See merge request adelie/packages!423
Diffstat (limited to 'user/php7/fix-tests-devserver.patch')
| -rw-r--r-- | user/php7/fix-tests-devserver.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/user/php7/fix-tests-devserver.patch b/user/php7/fix-tests-devserver.patch deleted file mode 100644 index 80a72f0f1..000000000 --- a/user/php7/fix-tests-devserver.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Mon, 01 May 2017 01:33:00 +0200 -Subject: [PATCH] Fix tests failing due to extra message from built-in web server - -Remove messages like: - - PHP 7.1.4 Development Server started at Mon May 1 00:42:39 2017 - -from test outputs, because tests do not expect them. I have no clue what -happens here... - ---- a/run-tests.php -+++ b/run-tests.php -@@ -2005,6 +2005,9 @@ - // Does the output match what is expected? - $output = preg_replace("/\r\n/", "\n", trim($out)); - -+ // Remove message from built-in development server. -+ $output = preg_replace("/^PHP [0-9.]+ Development Server started at .*\n\n?/m", "", $output); -+ - /* when using CGI, strip the headers from the output */ - $headers = array(); - |