From 2c14fda22c47b046f675c000fd30fd9442b8651f Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 18 Dec 2019 09:54:16 +0530 Subject: [PATCH 1/2] PHP 7.4 Compatibility: Update `implode()` calls. Signed-off-by: Riddhesh Sanghvi --- php/EE/DocParser.php | 2 +- php/commands/help.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php/EE/DocParser.php b/php/EE/DocParser.php index 6910b45a8..7fcfd3ba9 100644 --- a/php/EE/DocParser.php +++ b/php/EE/DocParser.php @@ -72,7 +72,7 @@ public function get_longdesc() { $lines[] = $line; } - $longdesc = trim( implode( $lines, "\n" ) ); + $longdesc = trim( implode( "\n", $lines ) ); return $longdesc; } diff --git a/php/commands/help.php b/php/commands/help.php index 2fef01e25..ea72d9b2f 100644 --- a/php/commands/help.php +++ b/php/commands/help.php @@ -104,7 +104,7 @@ private static function indent( $whitespace, $text ) { foreach ( $lines as &$line ) { $line = $whitespace . $line; } - return implode( $lines, "\n" ); + return implode( "\n", $lines ); } private static function pass_through_pager( $out ) { From 1d41cebb7f715f33e1a974716c10aaefcc9b4121 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 18 Dec 2019 09:55:10 +0530 Subject: [PATCH 2/2] Remove notices, warnings and deprecation msgs from phar Signed-off-by: Riddhesh Sanghvi --- utils/make-phar.php | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/make-phar.php b/utils/make-phar.php index e65c5e6ca..e802118a6 100644 --- a/utils/make-phar.php +++ b/utils/make-phar.php @@ -323,6 +323,7 @@ function get_composer_versions( $current_version ) { $phar->setStub( <<