Skip to content

Commit 0b872e5

Browse files
authored
Merge pull request #1442 from EasyEngine/php/7.4-compatibility
PHP 7.4 compatibility update implode calls
2 parents ff5082f + 1d41ceb commit 0b872e5

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

php/EE/DocParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function get_longdesc() {
7272

7373
$lines[] = $line;
7474
}
75-
$longdesc = trim( implode( $lines, "\n" ) );
75+
$longdesc = trim( implode( "\n", $lines ) );
7676

7777
return $longdesc;
7878
}

php/commands/help.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private static function indent( $whitespace, $text ) {
104104
foreach ( $lines as &$line ) {
105105
$line = $whitespace . $line;
106106
}
107-
return implode( $lines, "\n" );
107+
return implode( "\n", $lines );
108108
}
109109

110110
private static function pass_through_pager( $out ) {

utils/make-phar.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ function get_composer_versions( $current_version ) {
323323
$phar->setStub( <<<EOB
324324
#!/usr/bin/env php
325325
<?php
326+
error_reporting( E_ALL ^ ( E_NOTICE | E_WARNING | E_DEPRECATED ) );
326327
Phar::mapPhar();
327328
include 'phar://ee.phar{$phar_boot}';
328329
__HALT_COMPILER();

0 commit comments

Comments
 (0)