Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3104421 by peterkokot: PHP 7.4 deprecated reverse order of glue and pieces in implode

merge-requests/2419/head
catch 2020-01-13 18:56:45 +00:00
parent c62cf5d5bd
commit 73116db19c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/FileTransfer/FileTransfer.php
View File

@ -363,7 +363,7 @@ abstract class FileTransfer {
$parts = explode('/', $path); $parts = explode('/', $path);
$chroot = ''; $chroot = '';
while (count($parts)) { while (count($parts)) {
$check = implode($parts, '/'); $check = implode('/', $parts);
if ($this->isFile($check . '/' . \Drupal::service('file_system')->basename(__FILE__))) { if ($this->isFile($check . '/' . \Drupal::service('file_system')->basename(__FILE__))) {
// Remove the trailing slash. // Remove the trailing slash.
return substr($chroot, 0, -1); return substr($chroot, 0, -1);

2
core/modules/inline_form_errors/tests/src/Unit/FormErrorHandlerTest.php
View File

@ -138,7 +138,7 @@ class FormErrorHandlerTest extends UnitTestCase {
foreach ($render_array[1]['#items'] as $item) { foreach ($render_array[1]['#items'] as $item) {
$links[] = htmlspecialchars($item['#title']); $links[] = htmlspecialchars($item['#title']);
} }
return $render_array[0]['#markup'] . '<ul-comma-list-mock><li-mock>' . implode($links, '</li-mock><li-mock>') . '</li-mock></ul-comma-list-mock>'; return $render_array[0]['#markup'] . '<ul-comma-list-mock><li-mock>' . implode('</li-mock><li-mock>', $links) . '</li-mock></ul-comma-list-mock>';
})); }));
$form_state = new FormState(); $form_state = new FormState();