Skip to content

Commit 98af8ca

Browse files
committed
[!!!][TASK] Remove obsolete DeeplPreviewFlagGeneratePageHook
Since TYPO3 v12 `contentPostProc-all` hook is not called and replaced with PSR-14 event `AfterCacheableContentIsGeneratedEvent`, which has been respected with * #397 * #398 TYPO3 v11 support has been removed and this change cleansup introduced dual version code with upporting the bugfix as a housekeeping change. Further, the now obsolete hook is completly removed. Related: #397 Related: #398
1 parent 95d0636 commit 98af8ca

File tree

4 files changed

+9
-82
lines changed

4 files changed

+9
-82
lines changed

Classes/Event/Listener/RenderTranslatedFlagInFrontendPreviewMode.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
use TYPO3\CMS\Core\Context\Context;
88
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
99
use TYPO3\CMS\Frontend\Event\AfterCacheableContentIsGeneratedEvent;
10-
use WebVision\Deepltranslate\Core\Hooks\DeeplPreviewFlagGeneratePageHook;
1110

1211
/**
1312
* Event listener to render the frontend preview flag information.
1413
*
15-
* TYPO3 v12+ only and this is the counter-part of the {@see DeeplPreviewFlagGeneratePageHook} for older TYPO3 versions.
16-
* https://docs.typo3.org/c/typo3/cms-core/main/en-us/Changelog/12.0/Breaking-97862-HooksRelatedToGeneratingPageContentRemoved.html
14+
* @internal for `deepltranslate-core` internal usage and not part of public API.
1715
*/
1816
final class RenderTranslatedFlagInFrontendPreviewMode
1917
{

Classes/Hooks/DeeplPreviewFlagGeneratePageHook.php

Lines changed: 0 additions & 59 deletions
This file was deleted.

Configuration/Services.php

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use TYPO3\CMS\Core\Cache\CacheManager;
1010
use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
1111
use TYPO3\CMS\Core\DependencyInjection\SingletonPass;
12-
use TYPO3\CMS\Core\Information\Typo3Version;
1312
use TYPO3\CMS\Dashboard\WidgetRegistry;
1413
use WebVision\Deepltranslate\Core\Client;
1514
use WebVision\Deepltranslate\Core\ClientInterface;
@@ -35,8 +34,6 @@
3534
use WebVision\Deepltranslate\Core\Widgets\UsageWidget;
3635

3736
return function (ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder) {
38-
$typo3version = new Typo3Version();
39-
4037
$services = $containerConfigurator
4138
->services();
4239
$services->defaults()
@@ -162,17 +159,14 @@
162159
]
163160
);
164161

165-
if ((new Typo3Version())->getMajorVersion() >= 12) {
166-
// @todo Unnest this in next major when TYPO3 v11 support has been removed.
167-
$services
168-
->set(RenderTranslatedFlagInFrontendPreviewMode::class)
169-
->tag(
170-
'event.listener',
171-
[
172-
'identifier' => 'deepltranslate-core/render-translated-flag-in-frontend-preview-mode',
173-
]
174-
);
175-
}
162+
$services
163+
->set(RenderTranslatedFlagInFrontendPreviewMode::class)
164+
->tag(
165+
'event.listener',
166+
[
167+
'identifier' => 'deepltranslate-core/render-translated-flag-in-frontend-preview-mode',
168+
]
169+
);
176170

177171
/**
178172
* Check if WidgetRegistry is defined, which means that EXT:dashboard is available.

ext_localconf.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['checkModifyAccessList']['deepl']
2727
= \WebVision\Deepltranslate\Core\Hooks\TCEmainHook::class;
2828

29-
if ($typo3version->getMajorVersion() < 12) {
30-
// @todo Remove when TYPO3 v11 support is removed.
31-
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['contentPostProc-all']['deepl-1675946132'] =
32-
\WebVision\WvDeepltranslate\Hooks\DeeplPreviewFlagGeneratePageHook::class . '->renderDeeplPreviewFlag';
33-
}
34-
3529
//xclass localizationcontroller for localizeRecords() and process() action
3630
$GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][\TYPO3\CMS\Backend\Controller\Page\LocalizationController::class] = [
3731
'className' => \WebVision\Deepltranslate\Core\Override\LocalizationController::class,

0 commit comments

Comments
 (0)