Run the CS fixer

terminal42 · Nov 29, 2022 · 63ecac4 · 63ecac4
1 parent f057dba
commit 63ecac4
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 59 deletions.
diff --git a/src/EventListener/BackendView/ArticleViewListener.php b/src/EventListener/BackendView/ArticleViewListener.php
@@ -26,7 +26,8 @@ class ArticleViewListener extends AbstractViewListener
     protected function isSupported()
     {
         return 'article' === (string) Input::get('do')
-            && (('edit' === Input::get('act') && empty(Input::get('table')))
+            && (
+                ('edit' === Input::get('act') && empty(Input::get('table')))
                 || ($this->getTable() === Input::get('table'))
             );
     }
@@ -83,9 +84,12 @@ protected function getAvailableLanguages(PageModel $page)
                 }
             }
 
-            $articles = array_values(array_filter($articles, function (ArticleModel $article) {
-                return $article->inColumn === $this->currentArticle->inColumn;
-            }));
+            $articles = array_values(array_filter(
+                $articles,
+                function (ArticleModel $article) {
+                    return $article->inColumn === $this->currentArticle->inColumn;
+                }
+            ));
 
             if (1 === \count($articles)) {
                 $options[$articles[0]->id] = $this->getLanguageLabel($model->language);

diff --git a/src/EventListener/DataContainer/ArticleListener.php b/src/EventListener/DataContainer/ArticleListener.php
@@ -35,7 +35,7 @@ public function onLoad(DataContainer $dc): void
         } elseif ('edit' === $action) {
             $article = ArticleModel::findByPk($dc->id);
 
-            if ($article !== null) {
+            if (null !== $article) {
                 $page = PageModel::findByPk($article->pid);
 
                 if (null !== $page && null !== (new PageFinder())->findAssociatedInMaster($page)) {

diff --git a/src/EventListener/DataContainer/MissingLanguageIconListener.php b/src/EventListener/DataContainer/MissingLanguageIconListener.php
@@ -84,7 +84,7 @@ public function onPageLabel(array $args, $previousResult = null)
             return sprintf(
                 '%s <span style="color:#999;padding-left:3px">(<a href="%s" title="%s" style="color:#999">%s</a>)</span>',
                 $label,
-                Backend::addToUrl('pn=' . $mainPage->id),
+                Backend::addToUrl('pn='.$mainPage->id),
                 StringUtil::specialchars($GLOBALS['TL_LANG']['MSC']['selectNode']),
                 $mainPage->title
             );
@@ -135,13 +135,13 @@ public function onNewsChildRecords(array $args, $previousResult = null)
         $label = (string) $previousResult;
 
         if (empty($label)) {
-            $label = '<div class="tl_content_left">' . $row['headline'] . ' <span style="color:#999;padding-left:3px">[' . Date::parse(Config::get('datimFormat'), $row['date']) . ']</span></div>';
+            $label = '<div class="tl_content_left">'.$row['headline'].' <span style="color:#999;padding-left:3px">['.Date::parse(Config::get('datimFormat'), $row['date']).']</span></div>';
         }
 
         $archive = NewsArchiveModel::findByPk($row['pid']);
 
         if (
-            $archive !== null
+            null !== $archive
             && $archive->master
             && (!$row['languageMain'] || null === NewsModel::findByPk($row['languageMain']))
         ) {
@@ -166,7 +166,7 @@ public function onCalendarEventChildRecords(array $args, $previousResult = null)
         $calendar = CalendarModel::findByPk($row['pid']);
 
         if (
-            $calendar !== null
+            null !== $calendar
             && $calendar->master
             && (!$row['languageMain'] || null === CalendarEventsModel::findByPk($row['languageMain']))
         ) {
@@ -191,7 +191,7 @@ public function onFaqChildRecords(array $args, $previousResult = null)
         $category = FaqCategoryModel::findByPk($row['pid']);
 
         if (
-            $category !== null
+            null !== $category
             && $category->master
             && (!$row['languageMain'] || null === FaqModel::findByPk($row['languageMain']))
         ) {

diff --git a/src/EventListener/Navigation/AbstractNavigationListener.php b/src/EventListener/Navigation/AbstractNavigationListener.php
@@ -102,7 +102,7 @@ protected function getAutoItem(): string
             || (
                 $GLOBALS['TL_CONFIG']['useAutoItem']
                 && isset($GLOBALS['TL_AUTO_ITEM'])
-                && in_array($strKey, $GLOBALS['TL_AUTO_ITEM'], true)
+                && \in_array($strKey, $GLOBALS['TL_AUTO_ITEM'], true)
             )
         ) {
             $strKey = 'auto_item';

diff --git a/src/FrontendModule/ChangeLanguageModule.php b/src/FrontendModule/ChangeLanguageModule.php
@@ -58,10 +58,10 @@ public function generate()
         $request = System::getContainer()->get('request_stack')->getCurrentRequest();
         $scopeMatcher = System::getContainer()->get('contao.routing.scope_matcher');
 
-        if ($request !== null && $scopeMatcher->isBackendRequest($request)) {
+        if (null !== $request && $scopeMatcher->isBackendRequest($request)) {
             $template = new BackendTemplate('be_wildcard');
 
-            $template->wildcard = '### ' . strtoupper($GLOBALS['TL_LANG']['FMD'][$this->type][0]) . ' ###';
+            $template->wildcard = '### '.strtoupper($GLOBALS['TL_LANG']['FMD'][$this->type][0]).' ###';
             $template->title = $this->headline;
             $template->id = $this->id;
             $template->link = $this->name;
@@ -203,6 +203,7 @@ protected function createUrlParameterBag(array $queryParameters = [])
         unset($input['language'], $input['auto_item']);
 
         $currentQuery = [];
+
         if (!empty($_SERVER['QUERY_STRING'])) {
             parse_str($_SERVER['QUERY_STRING'], $currentQuery);
         }

diff --git a/src/Helper/LabelCallback.php b/src/Helper/LabelCallback.php
@@ -73,6 +73,6 @@ private function executeCallback($callback, array $args)
             );
         }
 
-        return \call_user_func_array($callback, $args);
+        return $callback(...$args);
     }
 }
diff --git a/src/Helper/LanguageText.php b/src/Helper/LanguageText.php
@@ -4,7 +4,6 @@
 
 namespace Terminal42\ChangeLanguage\Helper;
 
-use Contao\Controller;
 use Contao\StringUtil;
 use Contao\System;
 use Terminal42\ChangeLanguage\Navigation\NavigationItem;

diff --git a/src/Migration/CustomLanguageTextMigration.php b/src/Migration/CustomLanguageTextMigration.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Terminal42\ChangeLanguage\Migration;
 
 use Contao\CoreBundle\Framework\ContaoFramework;
@@ -38,7 +40,7 @@ public function shouldRun(): bool
         foreach ($texts as $text) {
             $text = StringUtil::deserialize($text);
 
-            if (is_array($text) && isset($text[0]['label'])) {
+            if (\is_array($text) && isset($text[0]['label'])) {
                 return true;
             }
         }
@@ -55,7 +57,7 @@ public function run(): MigrationResult
         foreach ($records as $record) {
             $data = StringUtil::deserialize($record['customLanguageText']);
 
-            if (is_array($data) && isset($data[0]['label'])) {
+            if (\is_array($data) && isset($data[0]['label'])) {
                 $newData = [];
 
                 foreach ($data as $datum) {

diff --git a/src/Navigation/NavigationItem.php b/src/Navigation/NavigationItem.php
@@ -196,9 +196,9 @@ public function getLocaleId()
     }
 
     /**
-     * @return string
-     *
      * @throws ExceptionInterface
+     *
+     * @return string
      */
     public function getHref(UrlParameterBag $urlParameterBag, bool $catch = false)
     {

diff --git a/src/Navigation/UrlParameterBag.php b/src/Navigation/UrlParameterBag.php
@@ -225,7 +225,7 @@ private function validateScalar($value): void
             return;
         }
 
-        if (!is_scalar($value)) {
+        if (!\is_scalar($value)) {
             throw new \InvalidArgumentException('URL can only contain (array of) scalar values');
         }
     }

diff --git a/tools/ecs/composer.json b/tools/ecs/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "contao/easy-coding-standard": "^3.0"
+        "contao/easy-coding-standard": "^5.3"
     },
     "config": {
         "allow-plugins": {

diff --git a/tools/ecs/composer.lock b/tools/ecs/composer.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,6 +73,6 @@ private function executeCallback($callback, array $args) @@
                 );
             }
-            return \call_user_func_array($callback, $args);
+            return $callback(...$args);
         }
     }