[TASK] Make automatic tests happy again

in2code-de · Oct 26, 2024 · 1d1095c · 1d1095c
1 parent f0552c3
commit 1d1095c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 23 deletions.
diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 jobs:
   php-lint:
     name: "PHP linter"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: "Checkout"
         uses: actions/checkout@v2
@@ -25,7 +25,7 @@ jobs:
           - 8.3
   typoscript-lint:
     name: "TypoScript linter"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: "Checkout"
         uses: actions/checkout@v2
@@ -36,7 +36,7 @@ jobs:
           config_file: ".project/tests/typoscript-lint.yml"
   php-cs-fixer:
     name: "PHP CS Fixer"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: php-lint
     steps:
       - name: "Checkout"
@@ -51,7 +51,7 @@ jobs:
         run: "composer test:php:cs"
   unit-tests:
     name: "PHP Unit Tests"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: php-lint
     steps:
       - name: Checkout
@@ -70,5 +70,5 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - 8.1
           - 8.2
+          - 8.3
diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php
@@ -65,7 +65,8 @@ public function __construct(
         protected readonly CacheLayer $cacheLayer,
         protected readonly ModuleTemplateFactory $moduleTemplateFactory,
         protected readonly IconFactory $iconFactory
-    ) {}
+    ) {
+    }
 
     /**
      * Pass some important variables to all views

diff --git a/Classes/Controller/FrontendController.php b/Classes/Controller/FrontendController.php
@@ -127,13 +127,13 @@ public function dispatchRequestAction(
      */
     public function pageRequestAction(string $identificator, array $arguments): ResponseInterface
     {
-            $visitor = $this->getVisitor($identificator);
-            $this->callAdditionalTrackers($visitor, $arguments);
-            $this->companyTracker->track($visitor);
-            $pagevisit = $this->pageTracker->track($visitor, $arguments);
-            $this->newsTracker->track($visitor, $arguments, $pagevisit);
-            $this->searchTracker->track($visitor, $arguments, $pagevisit);
-            return $this->jsonResponse(json_encode($this->afterAction($visitor)));
+        $visitor = $this->getVisitor($identificator);
+        $this->callAdditionalTrackers($visitor, $arguments);
+        $this->companyTracker->track($visitor);
+        $pagevisit = $this->pageTracker->track($visitor, $arguments);
+        $this->newsTracker->track($visitor, $arguments, $pagevisit);
+        $this->searchTracker->track($visitor, $arguments, $pagevisit);
+        return $this->jsonResponse(json_encode($this->afterAction($visitor)));
     }
 
     /**

diff --git a/Classes/Domain/Tracker/UtmTracker.php b/Classes/Domain/Tracker/UtmTracker.php
@@ -12,7 +12,6 @@
 use In2code\Lux\Events\PageTrackerEvent;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Throwable;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class UtmTracker
 {

diff --git a/Classes/Hooks/PageOverview.php b/Classes/Hooks/PageOverview.php
@@ -16,7 +16,6 @@
 use In2code\Lux\Utility\BackendUtility;
 use In2code\Lux\Utility\ConfigurationUtility;
 use TYPO3\CMS\Backend\Controller\Event\ModifyPageLayoutContentEvent;
-use TYPO3\CMS\Backend\Controller\PageLayoutController;
 use TYPO3\CMS\Backend\Utility\BackendUtility as BackendUtilityCore;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;

diff --git a/Classes/ViewHelpers/Pagination/UriViewHelper.php b/Classes/ViewHelpers/Pagination/UriViewHelper.php
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 namespace In2code\Lux\ViewHelpers\Pagination;
 
-use In2code\Lux\Utility\ConfigurationUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
 use TYPO3\CMS\Extbase\Service\ExtensionService;

diff --git a/composer.json b/composer.json
@@ -36,12 +36,6 @@
 	"replace": {
 		"typo3-ter/lux": "self.version"
 	},
-	"repositories": [
-		{
-			"type": "vcs",
-			"url": "https://github.com/bmack/TYPO3-Console"
-		}
-	],
 	"suggest": {
 		"typo3/cms-dashboard": "*"
 	},
@@ -73,7 +67,7 @@
 		"phpmd/phpmd": "^2.8",
 		"friendsofphp/php-cs-fixer": "^3.10",
 		"helmich/typo3-typoscript-lint": "^3.1",
-		"helhum/typo3-console": "dev-issue/1169"
+		"helhum/typo3-console": "^8.2"
 	},
 	"autoload": {
 		"psr-4": {