From ee439d017ef7ccec5630dcae17bc8839477e2a1c Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Sun, 3 Nov 2019 22:59:10 +0100 Subject: [PATCH] MDL-67115 core: php74 params order for implode()/join() Passing parameters to implode() in reverse order is deprecated, use implode($glue, $parts) instead of implode($parts, $glue). This commit corresponds to phpunit and manual detections, core files. --- admin/renderer.php | 8 ++++---- completion/criteria/completion_criteria_activity.php | 2 +- filter/tex/filter.php | 2 +- group/classes/output/user_groups_editable.php | 2 +- lib/listlib.php | 2 +- lib/questionlib.php | 4 ++-- lib/tests/behat/behat_navigation.php | 2 +- lib/tests/other/pdflibtestpage.php | 2 +- mod/glossary/lib.php | 4 ++-- question/editlib.php | 2 +- question/format/examview/format.php | 2 +- question/format/examview/tests/examviewformat_test.php | 2 +- user/classes/output/user_roles_editable.php | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/admin/renderer.php b/admin/renderer.php index 4dbe8c0c882..4ab7754a13b 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -1290,7 +1290,7 @@ class core_admin_renderer extends plugin_renderer_base { if ($unavailable or $unknown) { $out .= $this->output->heading(get_string('misdepsunavail', 'core_plugin')); if ($unknown) { - $out .= $this->output->notification(get_string('misdepsunknownlist', 'core_plugin', implode($unknown, ', '))); + $out .= $this->output->notification(get_string('misdepsunknownlist', 'core_plugin', implode(', ', $unknown))); } if ($unavailable) { $unavailablelist = array(); @@ -1305,7 +1305,7 @@ class core_admin_renderer extends plugin_renderer_base { $unavailablelist[] = $unavailablelistitem; } $out .= $this->output->notification(get_string('misdepsunavaillist', 'core_plugin', - implode($unavailablelist, ', '))); + implode(', ', $unavailablelist))); } $out .= $this->output->container_start('plugins-check-dependencies-actions'); $out .= ' '.html_writer::link(new moodle_url('/admin/tool/installaddon/'), @@ -1425,7 +1425,7 @@ class core_admin_renderer extends plugin_renderer_base { html_writer::div($plugin->name, 'name').' '.html_writer::div($plugin->component, 'component'), $plugin->version->release, $plugin->version->version, - implode($supportedmoodles, ' '), + implode(' ', $supportedmoodles), $info ); } @@ -2037,7 +2037,7 @@ class core_admin_renderer extends plugin_renderer_base { if (empty($CFG->docroot) or $environment_result->plugin) { $report = get_string($stringtouse, 'admin', $rec); } else { - $report = $this->doc_link(join($linkparts, '/'), get_string($stringtouse, 'admin', $rec), true); + $report = $this->doc_link(join('/', $linkparts), get_string($stringtouse, 'admin', $rec), true); } // Enclose report text in div so feedback text will be displayed underneath it. $report = html_writer::div($report); diff --git a/completion/criteria/completion_criteria_activity.php b/completion/criteria/completion_criteria_activity.php index 592c84e8a57..3e43ef1e5c6 100644 --- a/completion/criteria/completion_criteria_activity.php +++ b/completion/criteria/completion_criteria_activity.php @@ -288,7 +288,7 @@ class completion_criteria_activity extends completion_criteria { } } - $details['requirement'] = implode($details['requirement'], ', '); + $details['requirement'] = implode(', ', $details['requirement']); $details['status'] = ''; diff --git a/filter/tex/filter.php b/filter/tex/filter.php index 924837fc499..395638d22b7 100644 --- a/filter/tex/filter.php +++ b/filter/tex/filter.php @@ -160,7 +160,7 @@ class filter_tex extends moodle_text_filter { '\\\\\((.+?)\\\\\)', '\\[tex\\](.+?)\\[\/tex\\]' ); - $megarule = '/' . implode($rules, '|') . '/is'; + $megarule = '/' . implode('|', $rules) . '/is'; preg_match_all($megarule, $text, $matches); for ($i=0; $idisplayvalue = implode($listofgroups, ', '); + $this->displayvalue = implode(', ', $listofgroups); } else { $this->displayvalue = get_string('groupsnone'); } diff --git a/lib/listlib.php b/lib/listlib.php index 25ed2660e4a..67520aebbcd 100644 --- a/lib/listlib.php +++ b/lib/listlib.php @@ -552,7 +552,7 @@ abstract class list_item { } else { $childrenhtml = ''; } - return $this->item_html($extraargs).' '.(join($this->icons, '')).(($childrenhtml !='')?("\n".$childrenhtml):''); + return $this->item_html($extraargs).' '.(join('', $this->icons)).(($childrenhtml !='')?("\n".$childrenhtml):''); } public function set_icon_html($first, $last, $lastitem) { diff --git a/lib/questionlib.php b/lib/questionlib.php index 8566321a1e1..9fa33f9f2ad 100644 --- a/lib/questionlib.php +++ b/lib/questionlib.php @@ -1420,7 +1420,7 @@ function question_category_options($contexts, $top = false, $currentcat = 0, foreach ($contexts as $context) { $pcontexts[] = $context->id; } - $contextslist = join($pcontexts, ', '); + $contextslist = join(', ', $pcontexts); $categories = get_categories_for_contexts($contextslist, 'parent, sortorder, name ASC', $top); @@ -2011,7 +2011,7 @@ class question_edit_contexts { */ public function require_one_cap($caps) { if (!$this->have_one_cap($caps)) { - $capsstring = join($caps, ', '); + $capsstring = join(', ', $caps); print_error('nopermissions', '', '', $capsstring); } } diff --git a/lib/tests/behat/behat_navigation.php b/lib/tests/behat/behat_navigation.php index 58abfafc836..52760799bb0 100644 --- a/lib/tests/behat/behat_navigation.php +++ b/lib/tests/behat/behat_navigation.php @@ -300,7 +300,7 @@ class behat_navigation extends behat_base { // Throw exception if no node found. if (!$nodetoclick) { throw new ExpectationException('Navigation node "' . $nodetext . '" not found under "' . - implode($parentnodes, ' > ') . '"', $this->getSession()); + implode(' > ', $parentnodes) . '"', $this->getSession()); } $nodetoclick->click(); } diff --git a/lib/tests/other/pdflibtestpage.php b/lib/tests/other/pdflibtestpage.php index 3263829e56b..e4f6fb4d1cd 100644 --- a/lib/tests/other/pdflibtestpage.php +++ b/lib/tests/other/pdflibtestpage.php @@ -104,7 +104,7 @@ if ($getpdf) { } $list[] = $f; } - $c .= implode($list, ', '); + $c .= implode(', ', $list); $c .= '

Note: * Standard core fonts are not embedded in PDF files, PDF viewers are using local fonts.

'; $c .= '

Installed languages and their alphabets

'; diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 2372c35f971..2615e43e456 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -570,13 +570,13 @@ function glossary_print_recent_activity($course, $viewfullnames, $timestart) { $joins = array(' FROM {glossary_entries} ge '); $joins[] = 'JOIN {user} u ON u.id = ge.userid '; - $fromsql = implode($joins, "\n"); + $fromsql = implode("\n", $joins); $params['timestart'] = $timestart; $clausesql = ' WHERE ge.timemodified > :timestart '; if (count($approvals) > 0) { - $approvalsql = 'AND ('. implode($approvals, ' OR ') .') '; + $approvalsql = 'AND ('. implode(' OR ', $approvals) .') '; } else { $approvalsql = ''; } diff --git a/question/editlib.php b/question/editlib.php index d0dfbf87c74..f1360717795 100644 --- a/question/editlib.php +++ b/question/editlib.php @@ -490,7 +490,7 @@ function question_build_edit_resources($edittab, $baseurl, $params) { foreach ($contexts->having_one_edit_tab_cap($edittab) as $context){ $contextlistarr[] = "'{$context->id}'"; } - $contextlist = join($contextlistarr, ' ,'); + $contextlist = join(' ,', $contextlistarr); if (!empty($pagevars['cat'])){ $catparts = explode(',', $pagevars['cat']); if (!$catparts[0] || (false !== array_search($catparts[1], $contextlistarr)) || diff --git a/question/format/examview/format.php b/question/format/examview/format.php index e2e1a9af611..e092a877c44 100644 --- a/question/format/examview/format.php +++ b/question/format/examview/format.php @@ -164,7 +164,7 @@ class qformat_examview extends qformat_based_on_xml { $questions = array(); $currentquestion = array(); - $text = implode($lines, ' '); + $text = implode(' ', $lines); $text = $this->cleanunicode($text); $xml = xmlize($text, 0); diff --git a/question/format/examview/tests/examviewformat_test.php b/question/format/examview/tests/examviewformat_test.php index 601650fd27c..ab19677d8a1 100644 --- a/question/format/examview/tests/examviewformat_test.php +++ b/question/format/examview/tests/examviewformat_test.php @@ -252,7 +252,7 @@ class qformat_examview_test extends question_testcase { $lines = $this->make_test_xml(); $importer = new qformat_examview(); - $text = implode($lines, ' '); + $text = implode(' ', $lines); $xml = xmlize($text, 0); $importer->parse_matching_groups($xml['examview']['#']['matching-group']); diff --git a/user/classes/output/user_roles_editable.php b/user/classes/output/user_roles_editable.php index 12fc5c51e7b..4ee19611b61 100644 --- a/user/classes/output/user_roles_editable.php +++ b/user/classes/output/user_roles_editable.php @@ -128,7 +128,7 @@ class user_roles_editable extends \core\output\inplace_editable { } if (!empty($listofroles)) { - $this->displayvalue = implode($listofroles, ', '); + $this->displayvalue = implode(', ', $listofroles); } else if (!empty($roleids) && empty($viewableroleids)) { $this->displayvalue = get_string('novisibleroles', 'role'); } else {