Skip to content

PHP 7.4 compatibility: update implode calls #1442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 18, 2019
Merged

PHP 7.4 compatibility: update implode calls #1442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c14fda
PHP 7.4 Compatibility: Update `implode()` calls.
mrrobot47 Dec 18, 2019
1d41ceb
Remove notices, warnings and deprecation msgs from phar
mrrobot47 Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion php/EE/DocParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function get_longdesc() {

$lines[] = $line;
}
$longdesc = trim( implode( $lines, "\n" ) );
$longdesc = trim( implode( "\n", $lines ) );

return $longdesc;
}
Expand Down
2 changes: 1 addition & 1 deletion php/commands/help.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down
1 change: 1 addition & 0 deletions utils/make-phar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ function get_composer_versions( $current_version ) {
$phar->setStub( <<<EOB
#!/usr/bin/env php
<?php
error_reporting( E_ALL ^ ( E_NOTICE | E_WARNING | E_DEPRECATED ) );
Phar::mapPhar();
include 'phar://ee.phar{$phar_boot}';
__HALT_COMPILER();
Expand Down