From 6adee013d5d36f165d6b112456b911f359265029 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 24 Sep 2023 14:56:44 +0000 Subject: [PATCH] rector fixes --- Theme/Backend/helper-list.tpl.php | 2 +- Theme/Backend/helper-single.tpl.php | 14 ++++----- tests/Bootstrap.php | 4 +-- tests/EventCourse/EventCourse.tpl.php | 2 +- tests/EventCourse/EventCourse.xlsx.php | 42 +++++++++++++------------- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Theme/Backend/helper-list.tpl.php b/Theme/Backend/helper-list.tpl.php index fc871dd..9a62e2d 100755 --- a/Theme/Backend/helper-list.tpl.php +++ b/Theme/Backend/helper-list.tpl.php @@ -163,7 +163,7 @@ echo $this->data['nav']->render(); ?> printHtml($template->name); ?> getTags(); foreach ($tags as $tag) : ?> - icon) ? '' : ''; ?>printHtml($tag->getL11n()); ?> + icon) ? '' : ''; ?>printHtml($tag->getL11n()); ?> printHtml($this->renderUserName('%3$s %2$s %1$s', [$template->createdBy->name1, $template->createdBy->name2, $template->createdBy->name3, $template->createdBy->login ?? ''])); ?> printHtml($template->createdAt->format('Y-m-d')); ?> diff --git a/Theme/Backend/helper-single.tpl.php b/Theme/Backend/helper-single.tpl.php index 203382f..35b2820 100755 --- a/Theme/Backend/helper-single.tpl.php +++ b/Theme/Backend/helper-single.tpl.php @@ -89,12 +89,12 @@ echo $this->data['nav']->render(); ?> getHtml('Export'); ?> @@ -154,7 +154,7 @@ echo $this->data['nav']->render(); ?> getHtml('Tags'); ?> getTags(); foreach ($tags as $tag) : ?> - icon) ? '' : ''; ?>printHtml($tag->getL11n()); ?> + icon) ? '' : ''; ?>printHtml($tag->getL11n()); ?> diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index b904f0c..44438e2 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -381,7 +381,7 @@ function phpServe() : void // Execute the command and store the process ID $output = []; - echo \sprintf('Starting server...') . \PHP_EOL; + echo 'Starting server...' . \PHP_EOL; echo \sprintf(' Current directory: %s', \getcwd()) . \PHP_EOL; echo \sprintf(' %s', $command); \exec($command, $output); @@ -406,7 +406,7 @@ function phpServe() : void // Kill the web server when the process ends \register_shutdown_function(function() use ($killCommand, $pid) : void { - echo \PHP_EOL . \sprintf('Stopping server...') . \PHP_EOL; + echo \PHP_EOL . 'Stopping server...' . \PHP_EOL; echo \sprintf(' %s - Killing process with ID %d', \date('r'), $pid) . \PHP_EOL; \exec($killCommand . $pid); }); diff --git a/tests/EventCourse/EventCourse.tpl.php b/tests/EventCourse/EventCourse.tpl.php index 32e92ee..03f0746 100755 --- a/tests/EventCourse/EventCourse.tpl.php +++ b/tests/EventCourse/EventCourse.tpl.php @@ -25,7 +25,7 @@ $report = $this->getData('report'); $reportLanguage = include __DIR__ . '/../../../../' . \ltrim($tcoll['lang']->getPath(), '/'); $lang = $reportLanguage[$cLang]; -require 'Worker.php'; +require __DIR__ . '/Worker.php'; ?>
diff --git a/tests/EventCourse/EventCourse.xlsx.php b/tests/EventCourse/EventCourse.xlsx.php index c26c3cd..3feaa46 100755 --- a/tests/EventCourse/EventCourse.xlsx.php +++ b/tests/EventCourse/EventCourse.xlsx.php @@ -1,7 +1,7 @@ getData('lang'); \date_default_timezone_set('Europe/London'); @@ -387,7 +387,7 @@ foreach ($costobject as $key => $co) { $excel->getActiveSheet() ->setCellValue('A' . $i, '=MID(B' . $i . ', 1, 1)') ->setCellValue('B' . $i, $key) - ->setCellValue('C' . $i, (!isset($courseList[$key]) ? '' : $courseList[$key][2])) + ->setCellValue('C' . $i, (isset($courseList[$key]) ? $courseList[$key][2] : '')) ->setCellValue('D' . $i, isset($courseList[$key][4]) ? $courseList[$key][4] : '') ->setCellValue('E' . $i, isset($courseList[$key][5]) ? $courseList[$key][5] : '') ->setCellValue('F' . $i, $co[$fiscal_end->format('Y')]['value']) @@ -456,7 +456,7 @@ $excel->getActiveSheet() ->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1); $conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles(); -\array_push($conditionalStyles, $badBudget); +$conditionalStyles[] = $badBudget; $excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles); $excel->getActiveSheet()->setTitle('Advice'); @@ -494,7 +494,7 @@ foreach ($costobject as $key => $co) { $excel->getActiveSheet() ->setCellValue('A' . $i, '=MID(B' . $i . ', 1, 1)') ->setCellValue('B' . $i, $key) - ->setCellValue('C' . $i, (!isset($courseList[$key]) ? '' : $courseList[$key][2])) + ->setCellValue('C' . $i, (isset($courseList[$key]) ? $courseList[$key][2] : '')) ->setCellValue('D' . $i, isset($courseList[$key][4]) ? $courseList[$key][4] : '') ->setCellValue('E' . $i, isset($courseList[$key][5]) ? $courseList[$key][5] : '') ->setCellValue('F' . $i, $co[$fiscal_end->format('Y')]['value']) @@ -563,7 +563,7 @@ $excel->getActiveSheet() ->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1); $conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles(); -\array_push($conditionalStyles, $badBudget); +$conditionalStyles[] = $badBudget; $excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles); $excel->getActiveSheet()->setTitle('Demo'); @@ -602,7 +602,7 @@ foreach ($costobject as $key => $co) { $excel->getActiveSheet() ->setCellValue('A' . $i, '=MID(B' . $i . ', 1, 1)') ->setCellValue('B' . $i, $key) - ->setCellValue('C' . $i, (!isset($courseList[$key]) ? '' : $courseList[$key][2])) + ->setCellValue('C' . $i, (isset($courseList[$key]) ? $courseList[$key][2] : '')) ->setCellValue('D' . $i, isset($courseList[$key][4]) ? $courseList[$key][4] : '') ->setCellValue('E' . $i, isset($courseList[$key][5]) ? $courseList[$key][5] : '') ->setCellValue('F' . $i, $co[$fiscal_end->format('Y')]['value']) @@ -665,7 +665,7 @@ $excel->getActiveSheet() ->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1); $conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles(); -\array_push($conditionalStyles, $badBudget); +$conditionalStyles[] = $badBudget; $excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles); $excel->getActiveSheet()->setTitle('Briefing & Training'); @@ -704,7 +704,7 @@ foreach ($costobject as $key => $co) { $excel->getActiveSheet() ->setCellValue('A' . $i, '=MID(B' . $i . ', 1, 1)') ->setCellValue('B' . $i, $key) - ->setCellValue('C' . $i, (!isset($courseList[$key]) ? '' : $courseList[$key][2])) + ->setCellValue('C' . $i, (isset($courseList[$key]) ? $courseList[$key][2] : '')) ->setCellValue('D' . $i, isset($courseList[$key][4]) ? $courseList[$key][4] : '') ->setCellValue('E' . $i, isset($courseList[$key][5]) ? $courseList[$key][5] : '') ->setCellValue('F' . $i, $co[$fiscal_end->format('Y')]['value']) @@ -767,7 +767,7 @@ $excel->getActiveSheet() ->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1); $conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles(); -\array_push($conditionalStyles, $badBudget); +$conditionalStyles[] = $badBudget; $excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles); $excel->getActiveSheet()->setTitle('IMPLA'); @@ -806,7 +806,7 @@ foreach ($costobject as $key => $co) { $excel->getActiveSheet() ->setCellValue('A' . $i, '=MID(B' . $i . ', 1, 1)') ->setCellValue('B' . $i, $key) - ->setCellValue('C' . $i, (!isset($courseList[$key]) ? '' : $courseList[$key][2])) + ->setCellValue('C' . $i, (isset($courseList[$key]) ? $courseList[$key][2] : '')) ->setCellValue('D' . $i, isset($courseList[$key][4]) ? $courseList[$key][4] : '') ->setCellValue('E' . $i, isset($courseList[$key][5]) ? $courseList[$key][5] : '') ->setCellValue('F' . $i, $co[$fiscal_end->format('Y')]['value']) @@ -869,7 +869,7 @@ $excel->getActiveSheet() ->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1); $conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles(); -\array_push($conditionalStyles, $badBudget); +$conditionalStyles[] = $badBudget; $excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles); $excel->getActiveSheet()->setTitle('Marketing Support'); @@ -908,7 +908,7 @@ foreach ($costobject as $key => $co) { $excel->getActiveSheet() ->setCellValue('A' . $i, '=MID(B' . $i . ', 1, 1)') ->setCellValue('B' . $i, $key) - ->setCellValue('C' . $i, (!isset($courseList[$key]) ? '' : $courseList[$key][2])) + ->setCellValue('C' . $i, (isset($courseList[$key]) ? $courseList[$key][2] : '')) ->setCellValue('D' . $i, isset($courseList[$key][4]) ? $courseList[$key][4] : '') ->setCellValue('E' . $i, isset($courseList[$key][5]) ? $courseList[$key][5] : '') ->setCellValue('F' . $i, $co[$fiscal_end->format('Y')]['value']) @@ -971,7 +971,7 @@ $excel->getActiveSheet() ->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1); $conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles(); -\array_push($conditionalStyles, $badBudget); +$conditionalStyles[] = $badBudget; $excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles); $excel->getActiveSheet()->setTitle('Promotion'); @@ -1010,7 +1010,7 @@ foreach ($costobject as $key => $co) { $excel->getActiveSheet() ->setCellValue('A' . $i, '=MID(B' . $i . ', 1, 1)') ->setCellValue('B' . $i, $key) - ->setCellValue('C' . $i, (!isset($courseList[$key]) ? '' : $courseList[$key][2])) + ->setCellValue('C' . $i, (isset($courseList[$key]) ? $courseList[$key][2] : '')) ->setCellValue('D' . $i, isset($courseList[$key][4]) ? $courseList[$key][4] : '') ->setCellValue('E' . $i, isset($courseList[$key][5]) ? $courseList[$key][5] : '') ->setCellValue('F' . $i, $co[$fiscal_end->format('Y')]['value']) @@ -1073,7 +1073,7 @@ $excel->getActiveSheet() ->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1); $conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles(); -\array_push($conditionalStyles, $badBudget); +$conditionalStyles[] = $badBudget; $excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles); $excel->getActiveSheet()->setTitle('Roadshow'); @@ -1112,7 +1112,7 @@ foreach ($costobject as $key => $co) { $excel->getActiveSheet() ->setCellValue('A' . $i, '=MID(B' . $i . ', 1, 1)') ->setCellValue('B' . $i, $key) - ->setCellValue('C' . $i, (!isset($courseList[$key]) ? '' : $courseList[$key][2])) + ->setCellValue('C' . $i, (isset($courseList[$key]) ? $courseList[$key][2] : '')) ->setCellValue('D' . $i, isset($courseList[$key][4]) ? $courseList[$key][4] : '') ->setCellValue('E' . $i, isset($courseList[$key][5]) ? $courseList[$key][5] : '') ->setCellValue('F' . $i, $co[$fiscal_end->format('Y')]['value']) @@ -1175,7 +1175,7 @@ $excel->getActiveSheet() ->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1); $conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles(); -\array_push($conditionalStyles, $badBudget); +$conditionalStyles[] = $badBudget; $excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles); $excel->getActiveSheet()->setTitle('Additional Support'); @@ -1214,7 +1214,7 @@ foreach ($costobject as $key => $co) { $excel->getActiveSheet() ->setCellValue('A' . $i, '=MID(B' . $i . ', 1, 1)') ->setCellValue('B' . $i, $key) - ->setCellValue('C' . $i, (!isset($courseList[$key]) ? '' : $courseList[$key][2])) + ->setCellValue('C' . $i, (isset($courseList[$key]) ? $courseList[$key][2] : '')) ->setCellValue('D' . $i, isset($courseList[$key][4]) ? $courseList[$key][4] : '') ->setCellValue('E' . $i, isset($courseList[$key][5]) ? $courseList[$key][5] : '') ->setCellValue('F' . $i, $co[$fiscal_end->format('Y')]['value']) @@ -1277,7 +1277,7 @@ $excel->getActiveSheet() ->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1); $conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles(); -\array_push($conditionalStyles, $badBudget); +$conditionalStyles[] = $badBudget; $excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles); $excel->getActiveSheet()->setTitle('Export Courses'); @@ -1316,7 +1316,7 @@ foreach ($costobject as $key => $co) { $excel->getActiveSheet() ->setCellValue('A' . $i, '=MID(B' . $i . ', 1, 1)') ->setCellValue('B' . $i, $key) - ->setCellValue('C' . $i, (!isset($courseList[$key]) ? '' : $courseList[$key][2])) + ->setCellValue('C' . $i, (isset($courseList[$key]) ? $courseList[$key][2] : '')) ->setCellValue('D' . $i, isset($courseList[$key][4]) ? $courseList[$key][4] : '') ->setCellValue('E' . $i, isset($courseList[$key][5]) ? $courseList[$key][5] : '') ->setCellValue('F' . $i, $co[$fiscal_end->format('Y')]['value']) @@ -1379,7 +1379,7 @@ $excel->getActiveSheet() ->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1); $conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles(); -\array_push($conditionalStyles, $badBudget); +$conditionalStyles[] = $badBudget; $excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles); $excel->getActiveSheet()->setTitle('Events & Courses');