From e5a2c2f4b44001d9f2a4f22c1c302598ec3edb43 Mon Sep 17 00:00:00 2001
From: Alexander Kellner <alexander.kellner@in2code.de>
Date: Tue, 8 Oct 2024 13:24:53 +0200
Subject: [PATCH] [TASK] Drop TYPO3 11 support in code

---
 Classes/Controller/AbstractController.php     |  10 +-
 Classes/Controller/LeadController.php         |   5 +-
 .../DataProvider/AbstractDataProvider.php     |   2 +-
 Classes/Domain/Model/Visitor.php              |  10 +-
 Classes/Hooks/PageOverview.php                |  23 ---
 Classes/Utility/ConfigurationUtility.php      |  30 ---
 Classes/Utility/DatabaseUtility.php           |   4 +-
 .../Condition/IsTypo3ElevenViewHelper.php     |  25 ---
 .../ViewHelpers/Pagination/UriViewHelper.php  |   4 -
 Configuration/Services.php                    | 180 +++++-------------
 .../Private/Partials/Box/Leads/Hottest.html   |  22 +--
 .../Partials/Box/Leads/Pagevisits.html        |  25 +--
 .../Partials/PageOverview/Leads/Body.html     |  25 +--
 Resources/Private/Templates/Lead/Company.html |  44 +----
 .../Templates/Lead/CompanyListDetailAjax.html |  25 +--
 Resources/Private/Templates/Lead/Detail.html  |  28 +--
 .../Templates/Lead/ListDetailAjax.html        |  31 +--
 ext_localconf.php                             |  11 --
 ext_tables.php                                |   3 -
 19 files changed, 103 insertions(+), 404 deletions(-)
 delete mode 100644 Classes/ViewHelpers/Condition/IsTypo3ElevenViewHelper.php

diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php
index 1b2b610f..ac5b155e 100644
--- a/Classes/Controller/AbstractController.php
+++ b/Classes/Controller/AbstractController.php
@@ -109,12 +109,11 @@ public function __construct(
     /**
      * Pass some important variables to all views
      *
-     * @param \TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view (Todo: Param is only needed in TYPO3 11)
      * @return void
      * @throws ExtensionConfigurationExtensionNotConfiguredException
      * @throws ExtensionConfigurationPathDoesNotExistException
      */
-    public function initializeView($view)
+    public function initializeView()
     {
         $this->view->assignMultiple([
             'view' => [
@@ -191,13 +190,6 @@ protected function getActionName(): string
      */
     protected function getRoute(): string
     {
-        // Todo: Can be removed when TYPO3 11 support is dropped
-        if (ConfigurationUtility::isTypo3Version11()) {
-            /** @var Route $route */
-            $route = $this->request->getAttribute('route');
-            return $route->getOption('moduleName');
-        }
-
         /** @var RouteResult $routeResult */
         $routeResult = $this->request->getAttribute('routing');
         /** @var ExtbaseModule $extbaseModule */
diff --git a/Classes/Controller/LeadController.php b/Classes/Controller/LeadController.php
index 9e7744f5..f81a5098 100644
--- a/Classes/Controller/LeadController.php
+++ b/Classes/Controller/LeadController.php
@@ -29,7 +29,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Throwable;
 use TYPO3\CMS\Core\Http\JsonResponse;
-use TYPO3\CMS\Core\Messaging\AbstractMessage;
+use TYPO3\CMS\Core\Type\ContextualFeedbackSeverity;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\Exception\InvalidConfigurationTypeException;
 use TYPO3\CMS\Extbase\Http\ForwardResponse;
@@ -241,8 +241,7 @@ public function companiesDisabledAction(string $tokenWiredminds = ''): ResponseI
                 $companyConfigurationService->add($tokenWiredminds);
                 $this->addFlashMessage(LocalizationUtility::translateByKey('module.companiesDisabled.token.success'));
             } catch (Throwable $exception) {
-                // Todo: AbstractMessage::ERROR can be replaced with ContextualFeedbackSeverity::ERROR when TYPO3 11 support is dropped
-                $this->addFlashMessage($exception->getMessage(), '', AbstractMessage::ERROR);
+                $this->addFlashMessage($exception->getMessage(), '', ContextualFeedbackSeverity::ERROR);
             }
             return $this->redirect('companies');
         }
diff --git a/Classes/Domain/DataProvider/AbstractDataProvider.php b/Classes/Domain/DataProvider/AbstractDataProvider.php
index 84f7fb1a..cee7c4aa 100644
--- a/Classes/Domain/DataProvider/AbstractDataProvider.php
+++ b/Classes/Domain/DataProvider/AbstractDataProvider.php
@@ -41,7 +41,7 @@ public function getData(): array
 
     public function getTitlesFromData(): array
     {
-        $titles = (array)$this->getData()['titles'];
+        $titles = $this->getData()['titles'] ?? [];
         if ($this->cropTitles > 0) {
             $titles = ArrayUtility::cropStringInArray($titles, $this->cropTitles);
         }
diff --git a/Classes/Domain/Model/Visitor.php b/Classes/Domain/Model/Visitor.php
index 963bd25b..8774c73d 100644
--- a/Classes/Domain/Model/Visitor.php
+++ b/Classes/Domain/Model/Visitor.php
@@ -56,22 +56,20 @@ class Visitor extends AbstractModel
 
     /**
      * @Lazy
-     * @var ?ObjectStorage<Fingerprint>
+     * @var ?Fingerprint|LazyLoadingProxy
      * @phpstan-var ObjectStorage|LazyLoadingProxy|null
-     * Todo: Type can be changed to Fingerprint|LazyLoadingProxy|null when PHP 7.4 is dropped
      */
-    protected ?object $fingerprints = null;
+    protected Fingerprint|LazyLoadingProxy|null $fingerprints = null;
 
     protected string $email = '';
     protected string $company = '';
 
     /**
      * @Lazy
-     * @var Company|null
+     * @var Company|LazyLoadingProxy|null
      * @phpstan-var Company|LazyLoadingProxy|null
-     * Todo: Type can be changed to Company|LazyLoadingProxy|null when PHP 7.4 is dropped
      */
-    protected ?object $companyrecord = null;
+    protected Company|LazyLoadingProxy|null $companyrecord = null;
 
     protected bool $identified = false;
 
diff --git a/Classes/Hooks/PageOverview.php b/Classes/Hooks/PageOverview.php
index 834bb1a0..7161a0b0 100644
--- a/Classes/Hooks/PageOverview.php
+++ b/Classes/Hooks/PageOverview.php
@@ -55,8 +55,6 @@ public function __construct(
     }
 
     /**
-     * Called from PSR-14 for TYPO3 12
-     *
      * @param ModifyPageLayoutContentEvent $event
      * @return void
      * @throws ConfigurationException
@@ -74,27 +72,6 @@ public function eventRegistration(ModifyPageLayoutContentEvent $event): void
         $event->addHeaderContent($this->renderContent($pageIdentifier));
     }
 
-    /**
-     * Called from ext_localconf.php for TYPO3 11
-     * Todo: Can be removed when TYPO3 11 support is dropped
-     *
-     * @param array $parameters
-     * @param PageLayoutController $plController
-     * @return string
-     * @throws ConfigurationException
-     * @throws ExceptionDbal
-     * @throws ExtensionConfigurationExtensionNotConfiguredException
-     * @throws ExtensionConfigurationPathDoesNotExistException
-     * @throws UnexpectedValueException
-     * @throws ExceptionDbalDriver
-     * @throws DBALException
-     */
-    public function render(array $parameters, PageLayoutController $plController): string
-    {
-        unset($parameters);
-        return $this->renderContent($plController->id);
-    }
-
     /**
      * @param int $pageIdentifier
      * @return string
diff --git a/Classes/Utility/ConfigurationUtility.php b/Classes/Utility/ConfigurationUtility.php
index 910cf7dd..57544c8c 100644
--- a/Classes/Utility/ConfigurationUtility.php
+++ b/Classes/Utility/ConfigurationUtility.php
@@ -8,7 +8,6 @@
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 
 class ConfigurationUtility
 {
@@ -236,33 +235,4 @@ protected static function getExtensionConfiguration(): array
     {
         return GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('lux');
     }
-
-    /**
-     * Todo: Can be removed if TYPO3 11 support is dropped
-     *
-     * @return bool
-     */
-    public static function isTypo3Version11(): bool
-    {
-        return self::isVersionToCompareSameOrHigherThenCurrentTypo3Version('11.5.99');
-    }
-
-    /**
-     * @param string $versionToCompare like "1.2.3"
-     * @return bool
-     */
-    public static function isVersionToCompareSameOrHigherThenCurrentTypo3Version(string $versionToCompare): bool
-    {
-        return VersionNumberUtility::convertVersionNumberToInteger($versionToCompare) >= self::getCurrentTypo3Version();
-    }
-
-    /**
-     * Return current TYPO3 version as integer - e.g. 10003000 (10.3.0) or 9005014 (9.5.14)
-     *
-     * @return int
-     */
-    protected static function getCurrentTypo3Version(): int
-    {
-        return VersionNumberUtility::convertVersionNumberToInteger(VersionNumberUtility::getNumericTypo3Version());
-    }
 }
diff --git a/Classes/Utility/DatabaseUtility.php b/Classes/Utility/DatabaseUtility.php
index e7c92587..ccf661ae 100644
--- a/Classes/Utility/DatabaseUtility.php
+++ b/Classes/Utility/DatabaseUtility.php
@@ -35,7 +35,7 @@ public static function isTableExisting(string $tableName): bool
     {
         $existing = false;
         $connection = self::getConnectionForTable($tableName);
-        $queryResult = $connection->query('show tables;')->fetchAll();
+        $queryResult = $connection->executeQuery('show tables;')->fetchAllAssociative();
         foreach ($queryResult as $tableProperties) {
             if (in_array($tableName, array_values($tableProperties))) {
                 $existing = true;
@@ -55,7 +55,7 @@ public static function isFieldExistingInTable(string $fieldName, string $tableNa
     {
         $found = false;
         $connection = self::getConnectionForTable($tableName);
-        $queryResult = $connection->query('describe ' . $tableName . ';')->fetchAll();
+        $queryResult = $connection->executeQuery('describe ' . $tableName . ';')->fetchAllAssociative();
         foreach ($queryResult as $fieldProperties) {
             if ($fieldProperties['Field'] === $fieldName) {
                 $found = true;
diff --git a/Classes/ViewHelpers/Condition/IsTypo3ElevenViewHelper.php b/Classes/ViewHelpers/Condition/IsTypo3ElevenViewHelper.php
deleted file mode 100644
index dfb42f83..00000000
--- a/Classes/ViewHelpers/Condition/IsTypo3ElevenViewHelper.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-namespace In2code\Lux\ViewHelpers\Condition;
-
-use In2code\Lux\Utility\ConfigurationUtility;
-use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractConditionViewHelper;
-
-/**
- * IsTypo3ElevenViewHelper
- * @noinspection PhpUnused
- * Todo: Can be removed when TYPO3 11 support is dropped
- */
-class IsTypo3ElevenViewHelper extends AbstractConditionViewHelper
-{
-    /**
-     * @param null $arguments
-     * @return bool
-     */
-    protected static function evaluateCondition($arguments = null): bool
-    {
-        unset($arguments);
-        return ConfigurationUtility::isTypo3Version11();
-    }
-}
diff --git a/Classes/ViewHelpers/Pagination/UriViewHelper.php b/Classes/ViewHelpers/Pagination/UriViewHelper.php
index 54583ee6..23020a01 100644
--- a/Classes/ViewHelpers/Pagination/UriViewHelper.php
+++ b/Classes/ViewHelpers/Pagination/UriViewHelper.php
@@ -33,10 +33,6 @@ public function render(): string
         $extensionService = GeneralUtility::makeInstance(ExtensionService::class);
         $pluginNamespace = $extensionService->getPluginNamespace($extensionName, $pluginName);
         $argumentPrefix = $pluginNamespace . '[' . $this->arguments['name'] . ']';
-        if (ConfigurationUtility::isTypo3Version11()) {
-            // Todo: Can be removed in TYPO3 11 support is dropped
-            $argumentPrefix = $this->arguments['name'];
-        }
         $arguments = $this->hasArgument('arguments') ? $this->arguments['arguments'] : [];
         if ($this->hasArgument('action')) {
             $arguments['action'] = $this->arguments['action'];
diff --git a/Configuration/Services.php b/Configuration/Services.php
index 28058657..e60fafc6 100644
--- a/Configuration/Services.php
+++ b/Configuration/Services.php
@@ -31,7 +31,7 @@
     $services = $configurator->services();
 
     if ($containerBuilder->hasDefinition(Dashboard::class)) {
-        $configuration = $services->set('dashboard.widgets.luxPageVisitsWidget')
+        $services->set('dashboard.widgets.luxPageVisitsWidget')
             ->class(BarChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxPageVisits',
@@ -42,16 +42,10 @@
                 'height' => 'medium',
                 'width' => 'medium',
             ])
-            ->arg('$dataProvider', new Reference(LuxPageVisitsDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxPageVisitsDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxDownloadsWidget')
+        $services->set('dashboard.widgets.LuxDownloadsWidget')
             ->class(BarChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxDownloads',
@@ -62,16 +56,10 @@
                 'height' => 'medium',
                 'width' => 'medium',
             ])
-            ->arg('$dataProvider', new Reference(LuxDownloadsDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxDownloadsDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxNewsWidget')
+        $services->set('dashboard.widgets.LuxNewsWidget')
             ->class(BarChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxNews',
@@ -82,16 +70,10 @@
                 'height' => 'medium',
                 'width' => 'medium',
             ])
-            ->arg('$dataProvider', new Reference(LuxNewsDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxNewsDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxSearchtermsWidget')
+        $services->set('dashboard.widgets.LuxSearchtermsWidget')
             ->class(BarChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxSearchterms',
@@ -102,16 +84,10 @@
                 'height' => 'medium',
                 'width' => 'medium',
             ])
-            ->arg('$dataProvider', new Reference(LuxSearchtermsDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxSearchtermsDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxIdentifiedWidget')
+        $services->set('dashboard.widgets.LuxIdentifiedWidget')
             ->class(BarChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'LuxIdentified',
@@ -122,16 +98,10 @@
                 'height' => 'medium',
                 'width' => 'small',
             ])
-            ->arg('$dataProvider', new Reference(LuxIdentifiedDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxIdentifiedDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxIdentifiedPerMonthWidget')
+        $services->set('dashboard.widgets.LuxIdentifiedPerMonthWidget')
             ->class(BarChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'LuxIdentifiedPerMonth',
@@ -142,16 +112,10 @@
                 'height' => 'medium',
                 'width' => 'medium',
             ])
-            ->arg('$dataProvider', new Reference(LuxIdentifiedPerMonthDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxIdentifiedPerMonthDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxRecurringWidget')
+        $services->set('dashboard.widgets.LuxRecurringWidget')
             ->class(DoughnutChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxRecurring',
@@ -162,16 +126,10 @@
                 'height' => 'medium',
                 'width' => 'small',
             ])
-            ->arg('$dataProvider', new Reference(LuxRecurringDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxRecurringDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxPageVisitsWeekWidget')
+        $services->set('dashboard.widgets.LuxPageVisitsWeekWidget')
             ->class(BarChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxPageVisitsWeek',
@@ -182,16 +140,10 @@
                 'height' => 'medium',
                 'width' => 'medium',
             ])
-            ->arg('$dataProvider', new Reference(LuxPageVisitsWeekDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxPageVisitsWeekDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxDownloadsWeekWidget')
+        $services->set('dashboard.widgets.LuxDownloadsWeekWidget')
             ->class(BarChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxDownloadsWeek',
@@ -202,16 +154,10 @@
                 'height' => 'medium',
                 'width' => 'medium',
             ])
-            ->arg('$dataProvider', new Reference(LuxDownloadsWeekDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxDownloadsWeekDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxReferrerWidget')
+        $services->set('dashboard.widgets.LuxReferrerWidget')
             ->class(BarChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxReferrer',
@@ -222,16 +168,10 @@
                 'height' => 'medium',
                 'width' => 'medium',
             ])
-            ->arg('$dataProvider', new Reference(LuxReferrerDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxReferrerDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxBrowserWidget')
+        $services->set('dashboard.widgets.LuxBrowserWidget')
             ->class(DoughnutChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxBrowser',
@@ -242,16 +182,10 @@
                 'height' => 'medium',
                 'width' => 'small',
             ])
-            ->arg('$dataProvider', new Reference(LuxBrowserDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxBrowserDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxHottestLeadsWidget')
+        $services->set('dashboard.widgets.LuxHottestLeadsWidget')
             ->class(ListWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxHottestLeads',
@@ -262,16 +196,10 @@
                 'height' => 'medium',
                 'width' => 'small',
             ])
-            ->arg('$dataProvider', new Reference(LuxHottestLeadsDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxHottestLeadsDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.luxUtmCampaignWidget')
+        $services->set('dashboard.widgets.luxUtmCampaignWidget')
             ->class(BarChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxUtmCampaign',
@@ -282,16 +210,10 @@
                 'height' => 'medium',
                 'width' => 'medium',
             ])
-            ->arg('$dataProvider', new Reference(LuxUtmCampaignDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxUtmCampaignDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxUtmSourceWidget')
+        $services->set('dashboard.widgets.LuxUtmSourceWidget')
             ->class(DoughnutChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxUtmSource',
@@ -302,16 +224,10 @@
                 'height' => 'medium',
                 'width' => 'small',
             ])
-            ->arg('$dataProvider', new Reference(LuxUtmSourceDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxUtmSourceDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
 
-        $configuration = $services->set('dashboard.widgets.LuxUtmMediaWidget')
+        $services->set('dashboard.widgets.LuxUtmMediaWidget')
             ->class(DoughnutChartWidget::class)
             ->tag('dashboard.widget', [
                 'identifier' => 'luxUtmMedia',
@@ -322,13 +238,7 @@
                 'height' => 'medium',
                 'width' => 'small',
             ])
-            ->arg('$dataProvider', new Reference(LuxUtmMediaDataProvider::class));
-        if ($containerBuilder->hasDefinition(BackendViewFactory::class)) {
-            // TYPO3 12
-            $configuration->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
-        } else {
-            // Todo: Can be removed when TYPO3 11 support will be dropped
-            $configuration->arg('$view', new Reference('dashboard.views.widget'));
-        }
+            ->arg('$dataProvider', new Reference(LuxUtmMediaDataProvider::class))
+            ->arg('$backendViewFactory', new Reference(BackendViewFactory::class));
     }
 };
diff --git a/Resources/Private/Partials/Box/Leads/Hottest.html b/Resources/Private/Partials/Box/Leads/Hottest.html
index 93060773..3e2de1f5 100644
--- a/Resources/Private/Partials/Box/Leads/Hottest.html
+++ b/Resources/Private/Partials/Box/Leads/Hottest.html
@@ -15,23 +15,11 @@ <h3 class="panel-title">
                                     <img src="{f:uri.resource(path:'Images/AvatarDefault.svg',extensionName:'lux')}" alt="{visitor.fullName}" class="img-circle" data-lux-asynchronous-image="{visitor.uid}" />
                                 </div>
                                 <div class="col-md-9">
-                                    <!-- Todo: Can be removed if TYPO3 11 support is dropped -->
-                                    <lux:condition.isTypo3Eleven>
-                                        <f:then>
-                                            <f:be.link
-                                                route="lux_LuxLead"
-                                                parameters="{tx_lux_lux_luxlead:'{visitor:visitor.uid,action:\'detail\',controller:\'Lead\'}'}">
-                                                <strong title="{visitor.location}">{visitor.fullName}</strong>
-                                            </f:be.link>
-                                        </f:then>
-                                        <f:else>
-                                            <f:be.link
-                                                route="lux_LuxLead.Lead_detail"
-                                                parameters="{visitor:visitor.uid}">
-                                                <strong title="{visitor.location}">{visitor.fullName}</strong>
-                                            </f:be.link>
-                                        </f:else>
-                                    </lux:condition.isTypo3Eleven>
+                                    <f:be.link
+                                        route="lux_LuxLead.Lead_detail"
+                                        parameters="{visitor:visitor.uid}">
+                                        <strong title="{visitor.location}">{visitor.fullName}</strong>
+                                    </f:be.link>
                                     <f:if condition="{visitor.company}">({visitor.company})</f:if>
                                     <br>
 
diff --git a/Resources/Private/Partials/Box/Leads/Pagevisits.html b/Resources/Private/Partials/Box/Leads/Pagevisits.html
index c9838b6a..29ef10fd 100644
--- a/Resources/Private/Partials/Box/Leads/Pagevisits.html
+++ b/Resources/Private/Partials/Box/Leads/Pagevisits.html
@@ -16,25 +16,12 @@ <h3 class="panel-title">
                                 </span>
                                 Page <strong title="PID{pagevisit.page.uid}: {pagevisit.pageTitleWithLanguage}"><f:format.crop maxCharacters="50" append="..." respectWordBoundaries="0">{pagevisit.pageTitleWithLanguage}</f:format.crop></strong> visited from<br />
                                 <span title="UID{pagevisit.visitor.uid}">
-                                    <!-- Todo: Can be removed if TYPO3 11 support is dropped -->
-                                    <lux:condition.isTypo3Eleven>
-                                        <f:then>
-                                            <f:be.link
-                                                route="lux_LuxLead"
-                                                title="{visitor.companyrecord.title}"
-                                                parameters="{tx_lux_lux_luxlead:'{visitor:pagevisit.visitor.uid,action:\'detail\',controller:\'Lead\'}'}">
-                                                {pagevisit.visitor.fullName}
-                                            </f:be.link>
-                                        </f:then>
-                                        <f:else>
-                                            <f:be.link
-                                                route="lux_LuxLead.Lead_detail"
-                                                title="{visitor.companyrecord.title}"
-                                                parameters="{visitor:pagevisit.visitor.uid}">
-                                                {pagevisit.visitor.fullName}
-                                            </f:be.link>
-                                        </f:else>
-                                    </lux:condition.isTypo3Eleven>
+                                    <f:be.link
+                                        route="lux_LuxLead.Lead_detail"
+                                        title="{visitor.companyrecord.title}"
+                                        parameters="{visitor:pagevisit.visitor.uid}">
+                                        {pagevisit.visitor.fullName}
+                                    </f:be.link>
                                 </span>
                                 <f:if condition="{pagevisit.visitor.company}">({pagevisit.visitor.company})</f:if>
                             </li>
diff --git a/Resources/Private/Partials/PageOverview/Leads/Body.html b/Resources/Private/Partials/PageOverview/Leads/Body.html
index 91f73072..a8b8f8bb 100644
--- a/Resources/Private/Partials/PageOverview/Leads/Body.html
+++ b/Resources/Private/Partials/PageOverview/Leads/Body.html
@@ -1,25 +1,12 @@
 <div class="row">
     <f:for each="{visitors}" as="visitor">
         <div class="col-md-4">
-            <!-- Todo: Can be removed if TYPO3 11 support is dropped -->
-            <lux:condition.isTypo3Eleven>
-                <f:then>
-                    <f:be.link
-                        route="lux_LuxLead"
-                        title="{f:translate(key:'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:pageoverview.link',arguments:'{0:visitor.fullName}')}"
-                        parameters="{tx_lux_lux_luxlead:'{visitor:visitor.uid,action:\'detail\',controller:\'Lead\'}'}">
-                        <f:render section="content" arguments="{_all}"/>
-                    </f:be.link>
-                </f:then>
-                <f:else>
-                    <f:be.link
-                        route="lux_LuxLead.Lead_detail"
-                        title="{f:translate(key:'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:pageoverview.link',arguments:'{0:visitor.fullName}')}"
-                        parameters="{visitor:visitor.uid}">
-                        <f:render section="content" arguments="{_all}"/>
-                    </f:be.link>
-                </f:else>
-            </lux:condition.isTypo3Eleven>
+            <f:be.link
+                route="lux_LuxLead.Lead_detail"
+                title="{f:translate(key:'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:pageoverview.link',arguments:'{0:visitor.fullName}')}"
+                parameters="{visitor:visitor.uid}">
+                <f:render section="content" arguments="{_all}"/>
+            </f:be.link>
         </div>
     </f:for>
 </div>
diff --git a/Resources/Private/Templates/Lead/Company.html b/Resources/Private/Templates/Lead/Company.html
index 049b810c..b74598ee 100644
--- a/Resources/Private/Templates/Lead/Company.html
+++ b/Resources/Private/Templates/Lead/Company.html
@@ -122,23 +122,11 @@ <h3>{company.title}</h3>
                                             <lux:format.readableDate>{company.firstPagevisit.crdate}</lux:format.readableDate>
                                         </span>
                                         <span title="UID{company.firstPagevisit.visitor.uid}" style="margin-left: 1rem;">
-                                            <!-- Todo: Can be removed if TYPO3 11 support is dropped -->
-                                            <lux:condition.isTypo3Eleven>
-                                                <f:then>
-                                                    <f:be.link
-                                                        route="lux_LuxLead"
-                                                        parameters="{tx_lux_lux_luxlead:'{visitor:company.firstPagevisit.visitor.uid,action:\'detail\',controller:\'Lead\'}'}">
-                                                        {company.firstPagevisit.visitor.fullName}
-                                                    </f:be.link>
-                                                </f:then>
-                                                <f:else>
-                                                    <f:be.link
-                                                        route="lux_LuxLead.Lead_detail"
-                                                        parameters="{visitor:company.firstPagevisit.visitor.uid}">
-                                                        {company.firstPagevisit.visitor.fullName}
-                                                    </f:be.link>
-                                                </f:else>
-                                            </lux:condition.isTypo3Eleven>
+                                            <f:be.link
+                                                route="lux_LuxLead.Lead_detail"
+                                                parameters="{visitor:company.firstPagevisit.visitor.uid}">
+                                                {company.firstPagevisit.visitor.fullName}
+                                            </f:be.link>
                                         </span>
                                     </td>
                                 </tr>
@@ -151,23 +139,11 @@ <h3>{company.title}</h3>
                                             <lux:format.readableDate>{company.latestPagevisit.crdate}</lux:format.readableDate>
                                         </span>
                                         <span title="UID{company.latestPagevisit.visitor.uid}" style="margin-left: 1rem;">
-                                            <!-- Todo: Can be removed if TYPO3 11 support is dropped -->
-                                            <lux:condition.isTypo3Eleven>
-                                                <f:then>
-                                                    <f:be.link
-                                                        route="lux_LuxLead"
-                                                        parameters="{tx_lux_lux_luxlead:'{visitor:company.latestPagevisit.visitor.uid,action:\'detail\',controller:\'Lead\'}'}">
-                                                        {company.latestPagevisit.visitor.fullName}
-                                                    </f:be.link>
-                                                </f:then>
-                                                <f:else>
-                                                    <f:be.link
-                                                        route="lux_LuxLead.Lead_detail"
-                                                        parameters="{visitor:company.latestPagevisit.visitor.uid}">
-                                                        {company.latestPagevisit.visitor.fullName}
-                                                    </f:be.link>
-                                                </f:else>
-                                            </lux:condition.isTypo3Eleven>
+                                            <f:be.link
+                                                route="lux_LuxLead.Lead_detail"
+                                                parameters="{visitor:company.latestPagevisit.visitor.uid}">
+                                                {company.latestPagevisit.visitor.fullName}
+                                            </f:be.link>
                                         </span>
                                     </td>
                                 </tr>
diff --git a/Resources/Private/Templates/Lead/CompanyListDetailAjax.html b/Resources/Private/Templates/Lead/CompanyListDetailAjax.html
index 5023e8a3..ad3dfe19 100644
--- a/Resources/Private/Templates/Lead/CompanyListDetailAjax.html
+++ b/Resources/Private/Templates/Lead/CompanyListDetailAjax.html
@@ -164,25 +164,12 @@ <h3 class="panel-title">
                     <tr>
                         <td>
                             <span title="UID{visitor.uid}">
-                                <!-- Todo: Can be removed if TYPO3 11 support is dropped -->
-                                <lux:condition.isTypo3Eleven>
-                                    <f:then>
-                                        <f:be.link
-                                            route="lux_LuxLead"
-                                            title="{f:translate(key:'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:pageoverview.link',arguments:'{0:visitor.fullName}')}"
-                                            parameters="{tx_lux_lux_luxlead:'{visitor:visitor.uid,action:\'detail\',controller:\'Lead\'}'}">
-                                            {visitor.fullName}
-                                        </f:be.link>
-                                    </f:then>
-                                    <f:else>
-                                        <f:be.link
-                                            route="lux_LuxLead.Lead_detail"
-                                            title="{f:translate(key:'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:pageoverview.link',arguments:'{0:visitor.fullName}')}"
-                                            parameters="{visitor:visitor.uid}">
-                                            {visitor.fullName}
-                                        </f:be.link>
-                                    </f:else>
-                                </lux:condition.isTypo3Eleven>
+                                <f:be.link
+                                    route="lux_LuxLead.Lead_detail"
+                                    title="{f:translate(key:'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:pageoverview.link',arguments:'{0:visitor.fullName}')}"
+                                    parameters="{visitor:visitor.uid}">
+                                    {visitor.fullName}
+                                </f:be.link>
                             </span>
                         </td>
                         <td>
diff --git a/Resources/Private/Templates/Lead/Detail.html b/Resources/Private/Templates/Lead/Detail.html
index dccebc40..c56a6a5b 100644
--- a/Resources/Private/Templates/Lead/Detail.html
+++ b/Resources/Private/Templates/Lead/Detail.html
@@ -48,27 +48,13 @@
             </button>
 
             <f:if condition="{visitor.companyrecord}">
-                <!-- Todo: Can be removed if TYPO3 11 support is dropped -->
-                <lux:condition.isTypo3Eleven>
-                    <f:then>
-                        <f:be.link
-                            route="lux_LuxLead"
-                            title="{visitor.companyrecord.title}"
-                            class="btn btn-secondary"
-                            parameters="{tx_lux_lux_luxlead:'{company:visitor.companyrecord.uid,action:\'company\',controller:\'Lead\'}'}">
-                            <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.detailpage.companylink">show</f:translate>
-                        </f:be.link>
-                    </f:then>
-                    <f:else>
-                        <f:be.link
-                            route="lux_LuxLead.Lead_company"
-                            title="{visitor.companyrecord.title}"
-                            class="btn btn-secondary"
-                            parameters="{company:visitor.companyrecord.uid}">
-                            <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.detailpage.companylink">show</f:translate>
-                        </f:be.link>
-                    </f:else>
-                </lux:condition.isTypo3Eleven>
+                <f:be.link
+                    route="lux_LuxLead.Lead_company"
+                    title="{visitor.companyrecord.title}"
+                    class="btn btn-secondary"
+                    parameters="{company:visitor.companyrecord.uid}">
+                    <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.detailpage.companylink">show</f:translate>
+                </f:be.link>
             </f:if>
 
             <f:link.action action="deactivate" arguments="{visitor:visitor}" class="btn btn-default" onclick="return confirm('{f:translate(key:\"LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:areYouSure\")}')">
diff --git a/Resources/Private/Templates/Lead/ListDetailAjax.html b/Resources/Private/Templates/Lead/ListDetailAjax.html
index fef1ce41..c03e9482 100644
--- a/Resources/Private/Templates/Lead/ListDetailAjax.html
+++ b/Resources/Private/Templates/Lead/ListDetailAjax.html
@@ -142,29 +142,14 @@ <h4>{company.title}</h4>
                 </button>
 
                 <f:if condition="{company}">
-                    <!-- Todo: Can be removed if TYPO3 11 support is dropped -->
-                    <lux:condition.isTypo3Eleven>
-                        <f:then>
-                            <f:be.link
-                                route="lux_LuxLead"
-                                title="{company.title}"
-                                style="margin: 1rem 0.5rem 0 0;"
-                                class="btn btn-secondary pull-right"
-                                parameters="{tx_lux_lux_luxlead:'{company:company.uid,action:\'company\',controller:\'Lead\'}'}">
-                                <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.detailpage.companylink">show</f:translate>
-                            </f:be.link>
-                        </f:then>
-                        <f:else>
-                            <f:be.link
-                                route="lux_LuxLead.Lead_company"
-                                title="{company.title}"
-                                style="margin: 1rem 0.5rem 0 0;"
-                                class="btn btn-secondary pull-right"
-                                parameters="{company:company.uid}">
-                                <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.detailpage.companylink">show</f:translate>
-                            </f:be.link>
-                        </f:else>
-                    </lux:condition.isTypo3Eleven>
+                    <f:be.link
+                        route="lux_LuxLead.Lead_company"
+                        title="{company.title}"
+                        style="margin: 1rem 0.5rem 0 0;"
+                        class="btn btn-secondary pull-right"
+                        parameters="{company:company.uid}">
+                        <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.detailpage.companylink">show</f:translate>
+                    </f:be.link>
                 </f:if>
             </div>
         </div>
diff --git a/ext_localconf.php b/ext_localconf.php
index abbd9363..92ae4433 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -83,16 +83,5 @@ function () {
          * CacheHash: Add LUX paramters to excluded variables
          */
         \In2code\Lux\Utility\CacheHashUtility::addLuxArgumentsToExcludedVariables();
-
-        /**
-         * Upgrade Wizards
-         * Todo: Can be removed when TYPO3 11 support is dropped
-         */
-        if (\In2code\Lux\Utility\ConfigurationUtility::isTypo3Version11()) {
-            $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['addSitesUpgradeWizard']
-                = \In2code\Lux\Update\AddSitesUpgradeWizard::class;
-            $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['updateFingerprintRelationsUpgradeWizard']
-                = \In2code\Lux\Update\UpdateFingerprintRelationsUpgradeWizard::class;
-        }
     }
 );
diff --git a/ext_tables.php b/ext_tables.php
index cb369271..7f7a68b2 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -54,19 +54,16 @@ function () {
         if (\In2code\Lux\Utility\ConfigurationUtility::isAnalysisModuleDisabled()) {
             \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig(
                 'options.hideModules := addToList(lux_LuxAnalysis)'
-                . PHP_EOL . 'options.hideModules.lux := addToList(LuxAnalysis)' // Todo: Can be removed, if TYPO3 11 support is dropped
             );
         }
         if (\In2code\Lux\Utility\ConfigurationUtility::isLeadModuleDisabled()) {
             \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig(
                 'options.hideModules := addToList(lux_LuxLead)'
-                . PHP_EOL . 'options.hideModules.lux := addToList(LuxLead)'// Todo: Can be removed, if TYPO3 11 support is dropped
             );
         }
         if (\In2code\Lux\Utility\ConfigurationUtility::isWorkflowModuleDisabled()) {
             \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig(
                 'options.hideModules := addToList(lux_LuxWorkflow)'
-                . PHP_EOL . 'options.hideModules.lux := addToList(LuxWorkflow)' // Todo: Can be removed, if TYPO3 11 support is dropped
             );
         }