From d7156c41d36475e62100a4af59565dffa893bdef Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Wed, 23 Oct 2024 09:36:41 +0200 Subject: [PATCH 01/20] [TASK] v14 compat (faked) --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index dec5c108f..95e6410f4 100644 --- a/composer.json +++ b/composer.json @@ -32,15 +32,15 @@ "ext-libxml": "*", "ext-simplexml": "*", "scssphp/scssphp": "^1.13", - "typo3/cms-backend": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-core": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-extbase": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-extensionmanager": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-fluid": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-frontend": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-install": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-rte-ckeditor": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-seo": "^12.4 || ^13.4 || 13.*.*@dev" + "typo3/cms-backend": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-core": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-extbase": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-extensionmanager": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-fluid": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-frontend": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-install": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-rte-ckeditor": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-seo": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev" }, "require-dev": { "b13/container": "^2.3 || dev-task/dev-main", From 93fa020e5ea6aa701ad59fffb48df233285833f3 Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Wed, 23 Oct 2024 09:50:50 +0200 Subject: [PATCH 02/20] [TASK] Adapt v14 non-dev --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 95e6410f4..1a9a782b9 100644 --- a/composer.json +++ b/composer.json @@ -32,15 +32,15 @@ "ext-libxml": "*", "ext-simplexml": "*", "scssphp/scssphp": "^1.13", - "typo3/cms-backend": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-core": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-extbase": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-extensionmanager": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-fluid": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-frontend": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-install": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-rte-ckeditor": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-seo": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev" + "typo3/cms-backend": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-core": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-extbase": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-extensionmanager": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-fluid": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-frontend": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-install": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-rte-ckeditor": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-seo": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*" }, "require-dev": { "b13/container": "^2.3 || dev-task/dev-main", From 61542e1d8d9620fe96c32463df5230ad24dfb76b Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Thu, 24 Oct 2024 09:17:42 +0200 Subject: [PATCH 03/20] [TASK] v13/v14 compatibility: Use \TYPO3\CMS\Core\Resource\FileType ENUM --- Build/phpstan-baseline-v13.neon | 112 ------------------ .../ViewHelpers/File/IsAudioViewHelper.php | 3 +- .../ViewHelpers/File/IsImageViewHelper.php | 3 +- .../ViewHelpers/File/IsMediaViewHelper.php | 3 +- Configuration/TCA/Overrides/100_pages.php | 4 +- .../225_content_element_texticon.php | 2 +- .../Overrides/300_content_general_columns.php | 2 +- .../tx_bootstrappackage_accordion_item.php | 4 +- .../tx_bootstrappackage_card_group_item.php | 4 +- .../TCA/tx_bootstrappackage_carousel_item.php | 4 +- .../tx_bootstrappackage_icon_group_item.php | 2 +- .../TCA/tx_bootstrappackage_tab_item.php | 4 +- .../TCA/tx_bootstrappackage_timeline_item.php | 4 +- 13 files changed, 21 insertions(+), 130 deletions(-) diff --git a/Build/phpstan-baseline-v13.neon b/Build/phpstan-baseline-v13.neon index bc09fae1b..e1cfcc864 100644 --- a/Build/phpstan-baseline-v13.neon +++ b/Build/phpstan-baseline-v13.neon @@ -16,30 +16,6 @@ parameters: count: 1 path: ../Classes/ViewHelpers/Data/PaginateViewHelper.php - - - message: """ - #^Fetching deprecated class constant FILETYPE_AUDIO of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:AUDIO instead$# - """ - count: 1 - path: ../Classes/ViewHelpers/File/IsAudioViewHelper.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# - """ - count: 1 - path: ../Classes/ViewHelpers/File/IsImageViewHelper.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_VIDEO of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:VIDEO instead$# - """ - count: 1 - path: ../Classes/ViewHelpers/File/IsMediaViewHelper.php - - message: """ #^Fetching class constant class of deprecated class TYPO3\\\\CMS\\\\Fluid\\\\View\\\\StandaloneView\\: @@ -55,91 +31,3 @@ parameters: """ count: 1 path: ../Classes/ViewHelpers/FrameViewHelper.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# - """ - count: 2 - path: ../Configuration/TCA/Overrides/100_pages.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# - """ - count: 1 - path: ../Configuration/TCA/Overrides/225_content_element_texticon.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# - """ - count: 1 - path: ../Configuration/TCA/Overrides/300_content_general_columns.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# - """ - count: 1 - path: ../Configuration/TCA/tx_bootstrappackage_accordion_item.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_VIDEO of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:VIDEO instead$# - """ - count: 1 - path: ../Configuration/TCA/tx_bootstrappackage_accordion_item.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# - """ - count: 2 - path: ../Configuration/TCA/tx_bootstrappackage_card_group_item.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# - """ - count: 2 - path: ../Configuration/TCA/tx_bootstrappackage_carousel_item.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# - """ - count: 1 - path: ../Configuration/TCA/tx_bootstrappackage_icon_group_item.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# - """ - count: 1 - path: ../Configuration/TCA/tx_bootstrappackage_tab_item.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_VIDEO of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:VIDEO instead$# - """ - count: 1 - path: ../Configuration/TCA/tx_bootstrappackage_tab_item.php - - - - message: """ - #^Fetching deprecated class constant FILETYPE_IMAGE of class TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\: - will be removed in TYPO3 v14, use TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileType\\:\\:IMAGE instead$# - """ - count: 2 - path: ../Configuration/TCA/tx_bootstrappackage_timeline_item.php diff --git a/Classes/ViewHelpers/File/IsAudioViewHelper.php b/Classes/ViewHelpers/File/IsAudioViewHelper.php index 66a346cb7..ee301590d 100644 --- a/Classes/ViewHelpers/File/IsAudioViewHelper.php +++ b/Classes/ViewHelpers/File/IsAudioViewHelper.php @@ -11,6 +11,7 @@ use TYPO3\CMS\Core\Resource\File; use TYPO3\CMS\Core\Resource\FileReference; +use TYPO3\CMS\Core\Resource\FileType; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; @@ -29,7 +30,7 @@ public function render() && ($file instanceof FileReference || $file instanceof File) && ( in_array($file->getExtension(), $allowedFileExtensions, true) - || $file->getType() === File::FILETYPE_AUDIO + || $file->getType() === FileType::AUDIO->value ) ) { return true; diff --git a/Classes/ViewHelpers/File/IsImageViewHelper.php b/Classes/ViewHelpers/File/IsImageViewHelper.php index 969dd3c1f..3b5be9b24 100644 --- a/Classes/ViewHelpers/File/IsImageViewHelper.php +++ b/Classes/ViewHelpers/File/IsImageViewHelper.php @@ -11,6 +11,7 @@ use TYPO3\CMS\Core\Resource\File; use TYPO3\CMS\Core\Resource\FileReference; +use TYPO3\CMS\Core\Resource\FileType; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; @@ -29,7 +30,7 @@ public function render() && ($file instanceof FileReference || $file instanceof File) && ( in_array($file->getExtension(), $allowedFileExtensions, true) - || $file->getType() === File::FILETYPE_IMAGE + || $file->getType() === FileType::IMAGE->value ) ) { return true; diff --git a/Classes/ViewHelpers/File/IsMediaViewHelper.php b/Classes/ViewHelpers/File/IsMediaViewHelper.php index ff400a750..776fad505 100644 --- a/Classes/ViewHelpers/File/IsMediaViewHelper.php +++ b/Classes/ViewHelpers/File/IsMediaViewHelper.php @@ -11,6 +11,7 @@ use TYPO3\CMS\Core\Resource\File; use TYPO3\CMS\Core\Resource\FileReference; +use TYPO3\CMS\Core\Resource\FileType; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; @@ -29,7 +30,7 @@ public function render() && ($file instanceof FileReference || $file instanceof File) && ( in_array($file->getExtension(), $allowedFileExtensions, true) - || $file->getType() === File::FILETYPE_VIDEO + || $file->getType() === FileType::VIDEO->value ) ) { return true; diff --git a/Configuration/TCA/Overrides/100_pages.php b/Configuration/TCA/Overrides/100_pages.php index 0e74d3e6b..090879446 100644 --- a/Configuration/TCA/Overrides/100_pages.php +++ b/Configuration/TCA/Overrides/100_pages.php @@ -88,7 +88,7 @@ ], 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => '--palette--;;filePalette', ], ], @@ -108,7 +108,7 @@ 'maxitems' => 1, 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => ' --palette--;;imageoverlayPalette, --palette--;;filePalette diff --git a/Configuration/TCA/Overrides/225_content_element_texticon.php b/Configuration/TCA/Overrides/225_content_element_texticon.php index 510f19550..acf0339fe 100644 --- a/Configuration/TCA/Overrides/225_content_element_texticon.php +++ b/Configuration/TCA/Overrides/225_content_element_texticon.php @@ -126,7 +126,7 @@ ], 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => '--palette--;;filePalette', ], ], diff --git a/Configuration/TCA/Overrides/300_content_general_columns.php b/Configuration/TCA/Overrides/300_content_general_columns.php index 0d425cef3..6462ebc95 100644 --- a/Configuration/TCA/Overrides/300_content_general_columns.php +++ b/Configuration/TCA/Overrides/300_content_general_columns.php @@ -182,7 +182,7 @@ ], 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => 'crop,--palette--;;filePalette', ], ], diff --git a/Configuration/TCA/tx_bootstrappackage_accordion_item.php b/Configuration/TCA/tx_bootstrappackage_accordion_item.php index 45ed47983..4efff5a7a 100644 --- a/Configuration/TCA/tx_bootstrappackage_accordion_item.php +++ b/Configuration/TCA/tx_bootstrappackage_accordion_item.php @@ -189,12 +189,12 @@ ], 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => ' --palette--;;imageoverlayPalette, --palette--;;filePalette', ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_VIDEO => [ + \TYPO3\CMS\Core\Resource\FileType::VIDEO->value => [ 'showitem' => ' --palette--;;videoOverlayPalette, --palette--;;filePalette', diff --git a/Configuration/TCA/tx_bootstrappackage_card_group_item.php b/Configuration/TCA/tx_bootstrappackage_card_group_item.php index a4f04e02b..f861bee53 100644 --- a/Configuration/TCA/tx_bootstrappackage_card_group_item.php +++ b/Configuration/TCA/tx_bootstrappackage_card_group_item.php @@ -197,7 +197,7 @@ 'maxitems' => 1, 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => ' --palette--;;imageoverlayPalette, --palette--;;filePalette', @@ -275,7 +275,7 @@ ], 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => '--palette--;;filePalette', ], ], diff --git a/Configuration/TCA/tx_bootstrappackage_carousel_item.php b/Configuration/TCA/tx_bootstrappackage_carousel_item.php index 775de99d7..6e39603af 100644 --- a/Configuration/TCA/tx_bootstrappackage_carousel_item.php +++ b/Configuration/TCA/tx_bootstrappackage_carousel_item.php @@ -599,7 +599,7 @@ 'maxitems' => 1, 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => ' --palette--;;imageoverlayPalette, --palette--;;filePalette', @@ -641,7 +641,7 @@ ], 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => 'crop,--palette--;;filePalette', ], ], diff --git a/Configuration/TCA/tx_bootstrappackage_icon_group_item.php b/Configuration/TCA/tx_bootstrappackage_icon_group_item.php index befa4b07b..de5e074d1 100644 --- a/Configuration/TCA/tx_bootstrappackage_icon_group_item.php +++ b/Configuration/TCA/tx_bootstrappackage_icon_group_item.php @@ -228,7 +228,7 @@ ], 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => '--palette--;;filePalette', ], ], diff --git a/Configuration/TCA/tx_bootstrappackage_tab_item.php b/Configuration/TCA/tx_bootstrappackage_tab_item.php index 8d206a5f5..87c27980b 100644 --- a/Configuration/TCA/tx_bootstrappackage_tab_item.php +++ b/Configuration/TCA/tx_bootstrappackage_tab_item.php @@ -189,12 +189,12 @@ ], 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => ' --palette--;;imageoverlayPalette, --palette--;;filePalette', ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_VIDEO => [ + \TYPO3\CMS\Core\Resource\FileType::VIDEO->value => [ 'showitem' => ' --palette--;;videoOverlayPalette, --palette--;;filePalette', diff --git a/Configuration/TCA/tx_bootstrappackage_timeline_item.php b/Configuration/TCA/tx_bootstrappackage_timeline_item.php index 827789297..05631567b 100644 --- a/Configuration/TCA/tx_bootstrappackage_timeline_item.php +++ b/Configuration/TCA/tx_bootstrappackage_timeline_item.php @@ -223,7 +223,7 @@ ], 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => '--palette--;;filePalette', ], ], @@ -243,7 +243,7 @@ 'maxitems' => 1, 'overrideChildTca' => [ 'types' => [ - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [ 'showitem' => ' --palette--;;imageoverlayPalette, --palette--;;filePalette', From 5c602a4aad4e381e3ee01c32d5e1d6b1319a436a Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Thu, 24 Oct 2024 09:24:13 +0200 Subject: [PATCH 04/20] [TASK] Update to v13/v14 compat, raise version, alter README --- README.rst | 22 ++++++++++++++++++++++ composer.json | 36 ++++++++++++++++++------------------ ext_emconf.php | 8 ++++---- 3 files changed, 44 insertions(+), 22 deletions(-) diff --git a/README.rst b/README.rst index c9f3fbb69..c9d8900d8 100644 --- a/README.rst +++ b/README.rst @@ -2,6 +2,10 @@ :alt: Latest Stable Version :target: https://extensions.typo3.org/extension/bootstrap_package/ +.. image:: https://img.shields.io/badge/TYPO3-13-orange.svg + :alt: TYPO3 13 + :target: https://get.typo3.org/version/13 + .. image:: https://img.shields.io/badge/TYPO3-12-orange.svg :alt: TYPO3 12 :target: https://get.typo3.org/version/12 @@ -53,6 +57,7 @@ Compatibility :header-rows: 1 * - + - v14 - v13 - v12 - v11 @@ -61,7 +66,18 @@ Compatibility - v8 - v7 + * - BP 16.x + - ✔️ + - ✔️ + - + - + - + - + - + - + * - BP 15.x + - - ✔️ - ✔️ - @@ -71,6 +87,7 @@ Compatibility - * - BP 14.x + - - - ✔️ - ✔️ @@ -80,6 +97,7 @@ Compatibility - * - BP 13.x + - - - ✔️ - ✔️ @@ -89,6 +107,7 @@ Compatibility - * - BP 12.x + - - - - ✔️ @@ -101,6 +120,7 @@ Compatibility - - - + - - ✔️ - ✔️ - @@ -111,6 +131,7 @@ Compatibility - - - + - - ✔️ - ✔️ - @@ -122,4 +143,5 @@ Compatibility - - - + - - ✔️ diff --git a/composer.json b/composer.json index 1a9a782b9..496cd152e 100644 --- a/composer.json +++ b/composer.json @@ -32,15 +32,15 @@ "ext-libxml": "*", "ext-simplexml": "*", "scssphp/scssphp": "^1.13", - "typo3/cms-backend": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-core": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-extbase": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-extensionmanager": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-fluid": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-frontend": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-install": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-rte-ckeditor": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-seo": "^12.4 || ^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*" + "typo3/cms-backend": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-core": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-extbase": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-extensionmanager": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-fluid": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-frontend": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-install": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-rte-ckeditor": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-seo": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*" }, "require-dev": { "b13/container": "^2.3 || dev-task/dev-main", @@ -53,15 +53,15 @@ "phpstan/phpstan-deprecation-rules": "^1.1", "phpstan/phpstan-phpunit": "^1.3", "phpstan/phpstan-strict-rules": "^1.5", - "typo3/cms-belog": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-felogin": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-filelist": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-form": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-indexed-search": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-info": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-lowlevel": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-tstemplate": "^12.4 || ^13.4 || 13.*.*@dev", - "typo3/cms-workspaces": "^12.4 || ^13.4 || 13.*.*@dev", + "typo3/cms-belog": "^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-felogin": "^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-filelist": "^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-form": "^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-indexed-search": "^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-info": "^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-lowlevel": "^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-tstemplate": "^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-workspaces": "^13.4 || 13.*.*@dev || 14.*.*@dev", "typo3/testing-framework": "^8.2.3" }, "config": { diff --git a/ext_emconf.php b/ext_emconf.php index f774eaa85..7c13e66ff 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -13,9 +13,9 @@ 'category' => 'templates', 'constraints' => [ 'depends' => [ - 'typo3' => '12.4.0-13.4.99', - 'rte_ckeditor' => '12.4.0-13.4.99', - 'seo' => '12.4.0-13.4.99', + 'typo3' => '13.4.0-14.4.99', + 'rte_ckeditor' => '13.4.0-14.4.99', + 'seo' => '13.4.0-14.4.99', ], 'conflicts' => [ 'css_styled_content' => '*', @@ -34,5 +34,5 @@ 'author' => 'Benjamin Kott', 'author_email' => 'info@bk2k.info', 'author_company' => 'private', - 'version' => '15.0.0', + 'version' => '16.0.0', ]; From dda7f9532b34dc42b204b8acc5aeb0d41ec8f1ef Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Thu, 24 Oct 2024 22:45:34 +0200 Subject: [PATCH 05/20] [TASK] [WIP] Try to make 'composer install' work -> container fail --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 496cd152e..086a9dd77 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "typo3/cms-seo": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*" }, "require-dev": { - "b13/container": "^2.3 || dev-task/dev-main", + "b13/container": "^3.0 || dev-master", "bk2k/demo-package": "@dev", "bk2k/extension-helper": "^2.1", "friendsofphp/php-cs-fixer": "^3.64", @@ -62,7 +62,7 @@ "typo3/cms-lowlevel": "^13.4 || 13.*.*@dev || 14.*.*@dev", "typo3/cms-tstemplate": "^13.4 || 13.*.*@dev || 14.*.*@dev", "typo3/cms-workspaces": "^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/testing-framework": "^8.2.3" + "typo3/testing-framework": "^9.0.0 || dev-main" }, "config": { "bin-dir": ".build/bin", From 3c235e9b73e8eb8fbe4395863b400e1df04f7615 Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Thu, 24 Oct 2024 22:46:22 +0200 Subject: [PATCH 06/20] [TASK] Implement ViewFactoryInterface in Viewhelpers --- Build/phpstan-baseline-v13.neon | 31 -------------- .../ViewHelpers/Data/PaginateViewHelper.php | 22 +++++++--- Classes/ViewHelpers/FrameViewHelper.php | 42 ++++++++++++++----- 3 files changed, 48 insertions(+), 47 deletions(-) diff --git a/Build/phpstan-baseline-v13.neon b/Build/phpstan-baseline-v13.neon index e1cfcc864..364905f71 100644 --- a/Build/phpstan-baseline-v13.neon +++ b/Build/phpstan-baseline-v13.neon @@ -1,33 +1,2 @@ parameters: ignoreErrors: - - - message: """ - #^Fetching class constant class of deprecated class TYPO3\\\\CMS\\\\Fluid\\\\View\\\\StandaloneView\\: - \\: since TYPO3 v13, will be removed in v14\\. Use ext\\:core ViewFactoryInterface instead\\.$# - """ - count: 1 - path: ../Classes/ViewHelpers/Data/PaginateViewHelper.php - - - - message: """ - #^Return type of method BK2K\\\\BootstrapPackage\\\\ViewHelpers\\\\Data\\\\PaginateViewHelper\\:\\:getTemplateObject\\(\\) has typehint with deprecated class TYPO3\\\\CMS\\\\Fluid\\\\View\\\\StandaloneView\\: - \\: since TYPO3 v13, will be removed in v14\\. Use ext\\:core ViewFactoryInterface instead\\.$# - """ - count: 1 - path: ../Classes/ViewHelpers/Data/PaginateViewHelper.php - - - - message: """ - #^Fetching class constant class of deprecated class TYPO3\\\\CMS\\\\Fluid\\\\View\\\\StandaloneView\\: - \\: since TYPO3 v13, will be removed in v14\\. Use ext\\:core ViewFactoryInterface instead\\.$# - """ - count: 1 - path: ../Classes/ViewHelpers/FrameViewHelper.php - - - - message: """ - #^Return type of method BK2K\\\\BootstrapPackage\\\\ViewHelpers\\\\FrameViewHelper\\:\\:getTemplateObject\\(\\) has typehint with deprecated class TYPO3\\\\CMS\\\\Fluid\\\\View\\\\StandaloneView\\: - \\: since TYPO3 v13, will be removed in v14\\. Use ext\\:core ViewFactoryInterface instead\\.$# - """ - count: 1 - path: ../Classes/ViewHelpers/FrameViewHelper.php diff --git a/Classes/ViewHelpers/Data/PaginateViewHelper.php b/Classes/ViewHelpers/Data/PaginateViewHelper.php index 4ede4d734..1cd443883 100644 --- a/Classes/ViewHelpers/Data/PaginateViewHelper.php +++ b/Classes/ViewHelpers/Data/PaginateViewHelper.php @@ -14,6 +14,8 @@ use TYPO3\CMS\Core\Pagination\SimplePagination; use TYPO3\CMS\Core\Utility\ArrayUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; +use TYPO3\CMS\Core\View\ViewFactoryData; +use TYPO3\CMS\Core\View\ViewFactoryInterface; use TYPO3\CMS\Extbase\Configuration\ConfigurationManager; use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; use TYPO3\CMS\Extbase\Pagination\QueryResultPaginator; @@ -23,6 +25,7 @@ use TYPO3\CMS\Fluid\View\StandaloneView; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\View\ViewInterface as FluidStandaloneViewInterface; /** * PaginateViewHelper @@ -34,6 +37,10 @@ class PaginateViewHelper extends AbstractViewHelper */ protected $escapeOutput = false; + public function __construct(protected ViewFactoryInterface $viewFactory) + { + } + public function initializeArguments(): void { parent::initializeArguments(); @@ -78,7 +85,7 @@ public function render(): string 'pagination' => $pagination, 'configuration' => $configuration, ]); - $paginationRendered = $paginationView->render(); + $paginationRendered = $paginationView->render('Paginate/Index'); $variableProvider = $renderingContext->getVariableProvider(); $variableProvider->add('paginator', $paginator); @@ -99,7 +106,7 @@ public function render(): string ); } - protected function getTemplateObject(RenderingContextInterface $renderingContext, ServerRequestInterface $request): StandaloneView + protected function getTemplateObject(RenderingContextInterface $renderingContext, ServerRequestInterface $request): FluidStandaloneViewInterface { $setup = $this->getConfigurationManager()->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT); @@ -135,10 +142,13 @@ protected function getTemplateObject(RenderingContextInterface $renderingContext } } - $view->setLayoutRootPaths($layoutRootPaths); - $view->setPartialRootPaths($partialRootPaths); - $view->setTemplateRootPaths($templateRootPaths); - $view->setTemplate('Paginate/Index'); + $viewFactoryData = new ViewFactoryData( + templateRootPaths: $templateRootPaths, + partialRootPaths: $partialRootPaths, + layoutRootPaths: $layoutRootPaths, + request: $request, + ); + $view = $this->viewFactory->create($viewFactoryData); return $view; } diff --git a/Classes/ViewHelpers/FrameViewHelper.php b/Classes/ViewHelpers/FrameViewHelper.php index 7cbfabce8..dac1c3c38 100644 --- a/Classes/ViewHelpers/FrameViewHelper.php +++ b/Classes/ViewHelpers/FrameViewHelper.php @@ -10,14 +10,19 @@ namespace BK2K\BootstrapPackage\ViewHelpers; use BK2K\BootstrapPackage\Utility\ImageVariantsUtility; +use Psr\Http\Message\ServerRequestInterface; use TYPO3\CMS\Core\Resource\File; use TYPO3\CMS\Core\Resource\FileReference; use TYPO3\CMS\Core\Resource\ResourceFactory; use TYPO3\CMS\Core\Utility\GeneralUtility; +use TYPO3\CMS\Core\View\ViewFactoryData; +use TYPO3\CMS\Core\View\ViewFactoryInterface; use TYPO3\CMS\Extbase\Configuration\ConfigurationManager; use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; -use TYPO3\CMS\Fluid\View\StandaloneView; +use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\View\ViewInterface as FluidStandaloneViewInterface; /** * FrameViewHelper @@ -29,6 +34,10 @@ class FrameViewHelper extends AbstractViewHelper */ protected $escapeOutput = false; + public function __construct(protected ViewFactoryInterface $viewFactory) + { + } + public function initializeArguments(): void { parent::initializeArguments(); @@ -144,7 +153,7 @@ public function render() ); // Template - $view = self::getTemplateObject(); + $view = $this->getTemplateObject(); $view->assignMultiple( [ 'id' => $identifier, @@ -162,10 +171,10 @@ public function render() ] ); - return $view->render(); + return $view->render('Frame/Index'); } - protected static function getTemplateObject(): StandaloneView + protected function getTemplateObject(): FluidStandaloneViewInterface { $setup = static::getConfigurationManager()->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT); @@ -191,12 +200,13 @@ protected static function getTemplateObject(): StandaloneView } } - /** @var StandaloneView $view */ - $view = GeneralUtility::makeInstance(StandaloneView::class); - $view->setLayoutRootPaths($layoutRootPaths); - $view->setPartialRootPaths($partialRootPaths); - $view->setTemplateRootPaths($templateRootPaths); - $view->setTemplate('Frame/Index'); + $viewFactoryData = new ViewFactoryData( + templateRootPaths: $templateRootPaths, + partialRootPaths: $partialRootPaths, + layoutRootPaths: $layoutRootPaths, + request: $this->getRequestFromRenderingContext($this->renderingContext), + ); + $view = $this->viewFactory->create($viewFactoryData); return $view; } @@ -208,4 +218,16 @@ protected static function getConfigurationManager(): ConfigurationManagerInterfa return $configurationManager; } + + protected function getRequestFromRenderingContext(RenderingContextInterface $renderingContext): ?ServerRequestInterface + { + if ($renderingContext->hasAttribute(ServerRequestInterface::class)) { + return $renderingContext->getAttribute(ServerRequestInterface::class); + } elseif ($renderingContext instanceof RenderingContext) { + /** @phpstan-ignore-next-line */ + return $renderingContext->getRequest(); + } + + return null; + } } From 9f10179f95519b216a2ed26aa6f9188239d98bc8 Mon Sep 17 00:00:00 2001 From: Oliver Hader Date: Mon, 28 Oct 2024 20:33:50 +0100 Subject: [PATCH 07/20] [TASK] Drop phpstan baseline file --- Build/phpstan-baseline-v13.neon | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 Build/phpstan-baseline-v13.neon diff --git a/Build/phpstan-baseline-v13.neon b/Build/phpstan-baseline-v13.neon deleted file mode 100644 index 364905f71..000000000 --- a/Build/phpstan-baseline-v13.neon +++ /dev/null @@ -1,2 +0,0 @@ -parameters: - ignoreErrors: From 303f2ba02b521fc7d591276e08b2182246d9c851 Mon Sep 17 00:00:00 2001 From: Oliver Hader Date: Mon, 28 Oct 2024 20:34:29 +0100 Subject: [PATCH 08/20] [BUGFIX] Use proper ViewInterface --- .../ViewHelpers/Data/PaginateViewHelper.php | 21 +++++++------------ Classes/ViewHelpers/FrameViewHelper.php | 17 +++++++-------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/Classes/ViewHelpers/Data/PaginateViewHelper.php b/Classes/ViewHelpers/Data/PaginateViewHelper.php index 1cd443883..f62976465 100644 --- a/Classes/ViewHelpers/Data/PaginateViewHelper.php +++ b/Classes/ViewHelpers/Data/PaginateViewHelper.php @@ -16,16 +16,15 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\View\ViewFactoryData; use TYPO3\CMS\Core\View\ViewFactoryInterface; +use TYPO3\CMS\Core\View\ViewInterface; use TYPO3\CMS\Extbase\Configuration\ConfigurationManager; use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; use TYPO3\CMS\Extbase\Pagination\QueryResultPaginator; use TYPO3\CMS\Extbase\Persistence\QueryResultInterface; use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext; use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextFactory; -use TYPO3\CMS\Fluid\View\StandaloneView; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; -use TYPO3Fluid\Fluid\View\ViewInterface as FluidStandaloneViewInterface; /** * PaginateViewHelper @@ -37,9 +36,9 @@ class PaginateViewHelper extends AbstractViewHelper */ protected $escapeOutput = false; - public function __construct(protected ViewFactoryInterface $viewFactory) - { - } + public function __construct( + protected readonly ViewFactoryInterface $viewFactory, + ) {} public function initializeArguments(): void { @@ -106,7 +105,7 @@ public function render(): string ); } - protected function getTemplateObject(RenderingContextInterface $renderingContext, ServerRequestInterface $request): FluidStandaloneViewInterface + protected function getTemplateObject(RenderingContextInterface $renderingContext, ServerRequestInterface $request): ViewInterface { $setup = $this->getConfigurationManager()->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT); @@ -117,9 +116,6 @@ protected function getTemplateObject(RenderingContextInterface $renderingContext $context->setRequest($request); } - /** @var StandaloneView $view */ - $view = GeneralUtility::makeInstance(StandaloneView::class, $context); - $layoutRootPaths = []; $layoutRootPaths[] = GeneralUtility::getFileAbsFileName('EXT:bootstrap_package/Resources/Private/Layouts/ViewHelpers/'); if (isset($setup['plugin.']['tx_bootstrappackage.']['view.']['layoutRootPaths.'])) { @@ -142,15 +138,12 @@ protected function getTemplateObject(RenderingContextInterface $renderingContext } } - $viewFactoryData = new ViewFactoryData( + return $this->viewFactory->create(new ViewFactoryData( templateRootPaths: $templateRootPaths, partialRootPaths: $partialRootPaths, layoutRootPaths: $layoutRootPaths, request: $request, - ); - $view = $this->viewFactory->create($viewFactoryData); - - return $view; + )); } protected function getConfigurationManager(): ConfigurationManagerInterface diff --git a/Classes/ViewHelpers/FrameViewHelper.php b/Classes/ViewHelpers/FrameViewHelper.php index dac1c3c38..450e19e06 100644 --- a/Classes/ViewHelpers/FrameViewHelper.php +++ b/Classes/ViewHelpers/FrameViewHelper.php @@ -17,12 +17,12 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\View\ViewFactoryData; use TYPO3\CMS\Core\View\ViewFactoryInterface; +use TYPO3\CMS\Core\View\ViewInterface; use TYPO3\CMS\Extbase\Configuration\ConfigurationManager; use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; -use TYPO3Fluid\Fluid\View\ViewInterface as FluidStandaloneViewInterface; /** * FrameViewHelper @@ -34,9 +34,9 @@ class FrameViewHelper extends AbstractViewHelper */ protected $escapeOutput = false; - public function __construct(protected ViewFactoryInterface $viewFactory) - { - } + public function __construct( + protected readonly ViewFactoryInterface $viewFactory, + ) {} public function initializeArguments(): void { @@ -174,7 +174,7 @@ public function render() return $view->render('Frame/Index'); } - protected function getTemplateObject(): FluidStandaloneViewInterface + protected function getTemplateObject(): ViewInterface { $setup = static::getConfigurationManager()->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT); @@ -200,15 +200,12 @@ protected function getTemplateObject(): FluidStandaloneViewInterface } } - $viewFactoryData = new ViewFactoryData( + return $this->viewFactory->create(new ViewFactoryData( templateRootPaths: $templateRootPaths, partialRootPaths: $partialRootPaths, layoutRootPaths: $layoutRootPaths, request: $this->getRequestFromRenderingContext($this->renderingContext), - ); - $view = $this->viewFactory->create($viewFactoryData); - - return $view; + )); } protected static function getConfigurationManager(): ConfigurationManagerInterface From 87ff58cffe393cfb9c0291ff467a4ebf2289eccf Mon Sep 17 00:00:00 2001 From: Oliver Hader Date: Mon, 28 Oct 2024 20:42:14 +0100 Subject: [PATCH 09/20] [TASK] Adjust CI test matrix --- .github/workflows/ci.yml | 6 +----- composer.json | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e3633de7..b5138cd1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,12 +17,8 @@ jobs: fail-fast: false max-parallel: 5 matrix: - typo3: ['^12', '^13', '13.4.x-dev'] + typo3: ['^13', '13.4.x-dev'] php: ['8.2', '8.3'] - include: - - typo3: '^12' - php: '8.1' - steps: - id: checkout name: Checkout Code diff --git a/composer.json b/composer.json index 086a9dd77..a19203006 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ } ], "require": { - "php": ">=8.1.0", + "php": ">=8.2.0", "ext-PDO": "*", "ext-dom": "*", "ext-filter": "*", @@ -33,7 +33,7 @@ "ext-simplexml": "*", "scssphp/scssphp": "^1.13", "typo3/cms-backend": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-core": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", + "typo3/cms-core": "14.0.x-dev", "typo3/cms-extbase": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", "typo3/cms-extensionmanager": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", "typo3/cms-fluid": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", @@ -43,7 +43,7 @@ "typo3/cms-seo": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*" }, "require-dev": { - "b13/container": "^3.0 || dev-master", + "b13/container": "^3.0 || dev-task/dev-main", "bk2k/demo-package": "@dev", "bk2k/extension-helper": "^2.1", "friendsofphp/php-cs-fixer": "^3.64", From 41c3c66c27e88953165cb5c0786215250b643f8e Mon Sep 17 00:00:00 2001 From: Oliver Hader Date: Mon, 28 Oct 2024 20:46:20 +0100 Subject: [PATCH 10/20] [TASK] Remove include for phpstan-baseline-v13.neon --- Build/phpstan.neon | 1 - 1 file changed, 1 deletion(-) diff --git a/Build/phpstan.neon b/Build/phpstan.neon index f425b9b4a..878fd19b7 100644 --- a/Build/phpstan.neon +++ b/Build/phpstan.neon @@ -3,7 +3,6 @@ includes: - %currentWorkingDirectory%/.build/vendor/phpstan/phpstan-strict-rules/rules.neon - %currentWorkingDirectory%/.build/vendor/phpstan/phpstan-deprecation-rules/rules.neon - %currentWorkingDirectory%/.build/vendor/friendsoftypo3/phpstan-typo3/extension.neon - - %currentWorkingDirectory%/Build/phpstan-baseline-v13.neon parameters: level: 8 From db9bed4834c6798cd479d481c5a7ca591114d203 Mon Sep 17 00:00:00 2001 From: Oliver Hader Date: Mon, 28 Oct 2024 20:49:25 +0100 Subject: [PATCH 11/20] [TASK] Clean-up code --- Classes/ViewHelpers/File/IsAudioViewHelper.php | 9 ++------- Classes/ViewHelpers/File/IsImageViewHelper.php | 9 ++------- Classes/ViewHelpers/File/IsMediaViewHelper.php | 9 ++------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/Classes/ViewHelpers/File/IsAudioViewHelper.php b/Classes/ViewHelpers/File/IsAudioViewHelper.php index ee301590d..3a07ae5c0 100644 --- a/Classes/ViewHelpers/File/IsAudioViewHelper.php +++ b/Classes/ViewHelpers/File/IsAudioViewHelper.php @@ -26,16 +26,11 @@ public function render() $allowedFileExtensions = $GLOBALS['TYPO3_CONF_VARS']['SYS']['audiofile_ext'] ?? ''; $allowedFileExtensions = GeneralUtility::trimExplode(',', $allowedFileExtensions); - if (is_object($file) + return is_object($file) && ($file instanceof FileReference || $file instanceof File) && ( in_array($file->getExtension(), $allowedFileExtensions, true) || $file->getType() === FileType::AUDIO->value - ) - ) { - return true; - } - - return false; + ); } } diff --git a/Classes/ViewHelpers/File/IsImageViewHelper.php b/Classes/ViewHelpers/File/IsImageViewHelper.php index 3b5be9b24..2884fe2dc 100644 --- a/Classes/ViewHelpers/File/IsImageViewHelper.php +++ b/Classes/ViewHelpers/File/IsImageViewHelper.php @@ -26,16 +26,11 @@ public function render() $allowedFileExtensions = $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] ?? ''; $allowedFileExtensions = GeneralUtility::trimExplode(',', $allowedFileExtensions); - if (is_object($file) + return is_object($file) && ($file instanceof FileReference || $file instanceof File) && ( in_array($file->getExtension(), $allowedFileExtensions, true) || $file->getType() === FileType::IMAGE->value - ) - ) { - return true; - } - - return false; + ); } } diff --git a/Classes/ViewHelpers/File/IsMediaViewHelper.php b/Classes/ViewHelpers/File/IsMediaViewHelper.php index 776fad505..4810bd0e8 100644 --- a/Classes/ViewHelpers/File/IsMediaViewHelper.php +++ b/Classes/ViewHelpers/File/IsMediaViewHelper.php @@ -26,16 +26,11 @@ public function render() $allowedFileExtensions = $GLOBALS['TYPO3_CONF_VARS']['SYS']['mediafile_ext'] ?? ''; $allowedFileExtensions = GeneralUtility::trimExplode(',', $allowedFileExtensions); - if (is_object($file) + return is_object($file) && ($file instanceof FileReference || $file instanceof File) && ( in_array($file->getExtension(), $allowedFileExtensions, true) || $file->getType() === FileType::VIDEO->value - ) - ) { - return true; - } - - return false; + ); } } From cddbd404c9b850a5d8e5caa229edf0fd7e6a1554 Mon Sep 17 00:00:00 2001 From: Oliver Hader Date: Mon, 28 Oct 2024 20:51:17 +0100 Subject: [PATCH 12/20] [TASK] Apply CGL --- Classes/ViewHelpers/Data/PaginateViewHelper.php | 3 ++- Classes/ViewHelpers/FrameViewHelper.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Classes/ViewHelpers/Data/PaginateViewHelper.php b/Classes/ViewHelpers/Data/PaginateViewHelper.php index f62976465..732d700ac 100644 --- a/Classes/ViewHelpers/Data/PaginateViewHelper.php +++ b/Classes/ViewHelpers/Data/PaginateViewHelper.php @@ -38,7 +38,8 @@ class PaginateViewHelper extends AbstractViewHelper public function __construct( protected readonly ViewFactoryInterface $viewFactory, - ) {} + ) { + } public function initializeArguments(): void { diff --git a/Classes/ViewHelpers/FrameViewHelper.php b/Classes/ViewHelpers/FrameViewHelper.php index 450e19e06..bd6dcc6d8 100644 --- a/Classes/ViewHelpers/FrameViewHelper.php +++ b/Classes/ViewHelpers/FrameViewHelper.php @@ -36,7 +36,8 @@ class FrameViewHelper extends AbstractViewHelper public function __construct( protected readonly ViewFactoryInterface $viewFactory, - ) {} + ) { + } public function initializeArguments(): void { From 07ba42e0292638324b76c77ffd8a6f48e8b4efd7 Mon Sep 17 00:00:00 2001 From: Oliver Hader Date: Mon, 28 Oct 2024 20:52:47 +0100 Subject: [PATCH 13/20] [TASK] Add 14.0.x-dev to CI test matrix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5138cd1f..e9c6f1958 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false max-parallel: 5 matrix: - typo3: ['^13', '13.4.x-dev'] + typo3: ['^13', '13.4.x-dev', '14.0.x-dev'] php: ['8.2', '8.3'] steps: - id: checkout From 51af37b475c415c85e2c9646ea00b6bc96c0c7a1 Mon Sep 17 00:00:00 2001 From: Benjamin Kott Date: Mon, 4 Nov 2024 06:27:26 +0100 Subject: [PATCH 14/20] [TASK] Drop v13 dev ci checks --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9c6f1958..dc5f17d7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false max-parallel: 5 matrix: - typo3: ['^13', '13.4.x-dev', '14.0.x-dev'] + typo3: ['^13', '14.0.x-dev'] php: ['8.2', '8.3'] steps: - id: checkout From 3ea42dc9cd02209afe7c1fc0d3131e9a6121d27d Mon Sep 17 00:00:00 2001 From: Benjamin Kott Date: Mon, 4 Nov 2024 06:32:27 +0100 Subject: [PATCH 15/20] [BUGFIX] Correct composer dependencies --- composer.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index a19203006..8006b5c09 100644 --- a/composer.json +++ b/composer.json @@ -32,15 +32,15 @@ "ext-libxml": "*", "ext-simplexml": "*", "scssphp/scssphp": "^1.13", - "typo3/cms-backend": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-core": "14.0.x-dev", - "typo3/cms-extbase": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-extensionmanager": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-fluid": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-frontend": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-install": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-rte-ckeditor": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*", - "typo3/cms-seo": "^13.4 || 13.*.*@dev || 14.*.*@dev || 14.*.*" + "typo3/cms-backend": "^13.4 || 14.*.*@dev", + "typo3/cms-core": "^13.4 || 14.*.*@dev", + "typo3/cms-extbase": "^13.4 || 14.*.*@dev", + "typo3/cms-extensionmanager": "^13.4 || 14.*.*@dev", + "typo3/cms-fluid": "^13.4 || 14.*.*@dev", + "typo3/cms-frontend": "^13.4 || 14.*.*@dev", + "typo3/cms-install": "^13.4 || 14.*.*@dev", + "typo3/cms-rte-ckeditor": "^13.4 || 14.*.*@dev", + "typo3/cms-seo": "^13.4 || 14.*.*@dev" }, "require-dev": { "b13/container": "^3.0 || dev-task/dev-main", @@ -53,15 +53,15 @@ "phpstan/phpstan-deprecation-rules": "^1.1", "phpstan/phpstan-phpunit": "^1.3", "phpstan/phpstan-strict-rules": "^1.5", - "typo3/cms-belog": "^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-felogin": "^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-filelist": "^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-form": "^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-indexed-search": "^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-info": "^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-lowlevel": "^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-tstemplate": "^13.4 || 13.*.*@dev || 14.*.*@dev", - "typo3/cms-workspaces": "^13.4 || 13.*.*@dev || 14.*.*@dev", + "typo3/cms-belog": "^13.4 || 14.*.*@dev", + "typo3/cms-felogin": "^13.4 || 14.*.*@dev", + "typo3/cms-filelist": "^13.4 || 14.*.*@dev", + "typo3/cms-form": "^13.4 || 14.*.*@dev", + "typo3/cms-indexed-search": "^13.4 || 14.*.*@dev", + "typo3/cms-info": "^13.4 || 14.*.*@dev", + "typo3/cms-lowlevel": "^13.4 || 14.*.*@dev", + "typo3/cms-tstemplate": "^13.4 || 14.*.*@dev", + "typo3/cms-workspaces": "^13.4 || 14.*.*@dev", "typo3/testing-framework": "^9.0.0 || dev-main" }, "config": { From fadc5b97d7030e3fdcdf677734fd00091237a2e8 Mon Sep 17 00:00:00 2001 From: Benjamin Kott Date: Mon, 4 Nov 2024 06:40:01 +0100 Subject: [PATCH 16/20] [TASK] Drop v12 fallback for codeEditor --- .../400_bootstrappackage_carousel_item.php | 32 +++++-------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/Configuration/TCA/Overrides/400_bootstrappackage_carousel_item.php b/Configuration/TCA/Overrides/400_bootstrappackage_carousel_item.php index e02331b12..ac79c4694 100644 --- a/Configuration/TCA/Overrides/400_bootstrappackage_carousel_item.php +++ b/Configuration/TCA/Overrides/400_bootstrappackage_carousel_item.php @@ -12,28 +12,12 @@ defined('TYPO3') or die('Access denied.'); -// v12 -if (ExtensionManagementUtility::isLoaded('t3editor')) { - $GLOBALS['TCA']['tx_bootstrappackage_carousel_item']['types']['html']['columnsOverrides'] = [ - 'bodytext' => [ - 'config' => [ - 'renderType' => 't3editor', - 'wrap' => 'off', - 'format' => 'html', - ], +$GLOBALS['TCA']['tx_bootstrappackage_carousel_item']['types']['html']['columnsOverrides'] = [ + 'bodytext' => [ + 'config' => [ + 'renderType' => 'codeEditor', + 'wrap' => 'off', + 'format' => 'html', ], - ]; -} - -// v13 onwards -if ((new Typo3Version)->getMajorVersion() >= 13) { - $GLOBALS['TCA']['tx_bootstrappackage_carousel_item']['types']['html']['columnsOverrides'] = [ - 'bodytext' => [ - 'config' => [ - 'renderType' => 'codeEditor', - 'wrap' => 'off', - 'format' => 'html', - ], - ], - ]; -} + ], +]; From 5ef69f643dc8b8d005ae88bdb94447e675507cd6 Mon Sep 17 00:00:00 2001 From: Benjamin Kott Date: Mon, 4 Nov 2024 06:43:38 +0100 Subject: [PATCH 17/20] [TASK] Drop request fallbacks in viewhelpers --- Classes/ViewHelpers/Data/PaginateViewHelper.php | 3 --- Classes/ViewHelpers/FrameViewHelper.php | 3 --- Classes/ViewHelpers/Link/PaginateViewHelper.php | 3 --- Classes/ViewHelpers/TypoScript/ConstantViewHelper.php | 3 --- 4 files changed, 12 deletions(-) diff --git a/Classes/ViewHelpers/Data/PaginateViewHelper.php b/Classes/ViewHelpers/Data/PaginateViewHelper.php index 732d700ac..6c61231b8 100644 --- a/Classes/ViewHelpers/Data/PaginateViewHelper.php +++ b/Classes/ViewHelpers/Data/PaginateViewHelper.php @@ -159,9 +159,6 @@ protected function getRequestFromRenderingContext(RenderingContextInterface $ren { if ($renderingContext->hasAttribute(ServerRequestInterface::class)) { return $renderingContext->getAttribute(ServerRequestInterface::class); - } elseif ($renderingContext instanceof RenderingContext) { - /** @phpstan-ignore-next-line */ - return $renderingContext->getRequest(); } return null; diff --git a/Classes/ViewHelpers/FrameViewHelper.php b/Classes/ViewHelpers/FrameViewHelper.php index bd6dcc6d8..1323f2da4 100644 --- a/Classes/ViewHelpers/FrameViewHelper.php +++ b/Classes/ViewHelpers/FrameViewHelper.php @@ -221,9 +221,6 @@ protected function getRequestFromRenderingContext(RenderingContextInterface $ren { if ($renderingContext->hasAttribute(ServerRequestInterface::class)) { return $renderingContext->getAttribute(ServerRequestInterface::class); - } elseif ($renderingContext instanceof RenderingContext) { - /** @phpstan-ignore-next-line */ - return $renderingContext->getRequest(); } return null; diff --git a/Classes/ViewHelpers/Link/PaginateViewHelper.php b/Classes/ViewHelpers/Link/PaginateViewHelper.php index 8bb959255..36d6bc68f 100644 --- a/Classes/ViewHelpers/Link/PaginateViewHelper.php +++ b/Classes/ViewHelpers/Link/PaginateViewHelper.php @@ -95,9 +95,6 @@ protected function getRequestFromRenderingContext(RenderingContextInterface $ren { if ($renderingContext->hasAttribute(ServerRequestInterface::class)) { return $renderingContext->getAttribute(ServerRequestInterface::class); - } elseif ($renderingContext instanceof RenderingContext) { - /** @phpstan-ignore-next-line */ - return $renderingContext->getRequest(); } return null; diff --git a/Classes/ViewHelpers/TypoScript/ConstantViewHelper.php b/Classes/ViewHelpers/TypoScript/ConstantViewHelper.php index e1189a835..4fbd1acfb 100644 --- a/Classes/ViewHelpers/TypoScript/ConstantViewHelper.php +++ b/Classes/ViewHelpers/TypoScript/ConstantViewHelper.php @@ -53,9 +53,6 @@ protected function getRequestFromRenderingContext(RenderingContextInterface $ren { if ($renderingContext->hasAttribute(ServerRequestInterface::class)) { return $renderingContext->getAttribute(ServerRequestInterface::class); - } elseif ($renderingContext instanceof RenderingContext) { - /** @phpstan-ignore-next-line */ - return $renderingContext->getRequest(); } return null; From 8f2f63bdaea70efc1c5c48e8184621a3e224d29c Mon Sep 17 00:00:00 2001 From: Benjamin Kott Date: Mon, 4 Nov 2024 06:45:36 +0100 Subject: [PATCH 18/20] [BUGFIX] CGL --- Classes/ViewHelpers/Data/PaginateViewHelper.php | 1 - Classes/ViewHelpers/FrameViewHelper.php | 1 - Classes/ViewHelpers/Link/PaginateViewHelper.php | 1 - Classes/ViewHelpers/TypoScript/ConstantViewHelper.php | 1 - .../TCA/Overrides/400_bootstrappackage_carousel_item.php | 3 --- 5 files changed, 7 deletions(-) diff --git a/Classes/ViewHelpers/Data/PaginateViewHelper.php b/Classes/ViewHelpers/Data/PaginateViewHelper.php index 6c61231b8..de3fad5db 100644 --- a/Classes/ViewHelpers/Data/PaginateViewHelper.php +++ b/Classes/ViewHelpers/Data/PaginateViewHelper.php @@ -21,7 +21,6 @@ use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; use TYPO3\CMS\Extbase\Pagination\QueryResultPaginator; use TYPO3\CMS\Extbase\Persistence\QueryResultInterface; -use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext; use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextFactory; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; diff --git a/Classes/ViewHelpers/FrameViewHelper.php b/Classes/ViewHelpers/FrameViewHelper.php index 1323f2da4..08c281b84 100644 --- a/Classes/ViewHelpers/FrameViewHelper.php +++ b/Classes/ViewHelpers/FrameViewHelper.php @@ -20,7 +20,6 @@ use TYPO3\CMS\Core\View\ViewInterface; use TYPO3\CMS\Extbase\Configuration\ConfigurationManager; use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; -use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; diff --git a/Classes/ViewHelpers/Link/PaginateViewHelper.php b/Classes/ViewHelpers/Link/PaginateViewHelper.php index 36d6bc68f..cc4683f11 100644 --- a/Classes/ViewHelpers/Link/PaginateViewHelper.php +++ b/Classes/ViewHelpers/Link/PaginateViewHelper.php @@ -13,7 +13,6 @@ use TYPO3\CMS\Core\Http\ApplicationType; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\HttpUtility; -use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext; use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer; use TYPO3\CMS\Frontend\Typolink\LinkFactory; use TYPO3\CMS\Frontend\Typolink\UnableToLinkException; diff --git a/Classes/ViewHelpers/TypoScript/ConstantViewHelper.php b/Classes/ViewHelpers/TypoScript/ConstantViewHelper.php index 4fbd1acfb..47dbdd1f7 100644 --- a/Classes/ViewHelpers/TypoScript/ConstantViewHelper.php +++ b/Classes/ViewHelpers/TypoScript/ConstantViewHelper.php @@ -12,7 +12,6 @@ use BK2K\BootstrapPackage\Utility\TypoScriptUtility; use Psr\Http\Message\ServerRequestInterface; -use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; diff --git a/Configuration/TCA/Overrides/400_bootstrappackage_carousel_item.php b/Configuration/TCA/Overrides/400_bootstrappackage_carousel_item.php index ac79c4694..f8da10224 100644 --- a/Configuration/TCA/Overrides/400_bootstrappackage_carousel_item.php +++ b/Configuration/TCA/Overrides/400_bootstrappackage_carousel_item.php @@ -7,9 +7,6 @@ * LICENSE file that was distributed with this source code. */ -use TYPO3\CMS\Core\Information\Typo3Version; -use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; - defined('TYPO3') or die('Access denied.'); $GLOBALS['TCA']['tx_bootstrappackage_carousel_item']['types']['html']['columnsOverrides'] = [ From 446b7190c63672a7b27e4d0e4fb4664edaba12e5 Mon Sep 17 00:00:00 2001 From: Benjamin Kott Date: Mon, 4 Nov 2024 06:48:58 +0100 Subject: [PATCH 19/20] [TASK] Drop unused context --- Classes/ViewHelpers/Data/PaginateViewHelper.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Classes/ViewHelpers/Data/PaginateViewHelper.php b/Classes/ViewHelpers/Data/PaginateViewHelper.php index de3fad5db..df24822a8 100644 --- a/Classes/ViewHelpers/Data/PaginateViewHelper.php +++ b/Classes/ViewHelpers/Data/PaginateViewHelper.php @@ -21,7 +21,6 @@ use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; use TYPO3\CMS\Extbase\Pagination\QueryResultPaginator; use TYPO3\CMS\Extbase\Persistence\QueryResultInterface; -use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextFactory; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; @@ -109,13 +108,6 @@ protected function getTemplateObject(RenderingContextInterface $renderingContext { $setup = $this->getConfigurationManager()->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT); - /** @phpstan-ignore-next-line */ - $context = GeneralUtility::makeInstance(RenderingContextFactory::class)->create([], $request); - if ((new \ReflectionMethod(RenderingContextFactory::class, 'create'))->getNumberOfParameters() === 1) { - /** @phpstan-ignore-next-line */ - $context->setRequest($request); - } - $layoutRootPaths = []; $layoutRootPaths[] = GeneralUtility::getFileAbsFileName('EXT:bootstrap_package/Resources/Private/Layouts/ViewHelpers/'); if (isset($setup['plugin.']['tx_bootstrappackage.']['view.']['layoutRootPaths.'])) { From 5bbb0c5a6417315537c986d9c66ea678bfb27d34 Mon Sep 17 00:00:00 2001 From: Benjamin Kott Date: Mon, 4 Nov 2024 06:49:26 +0100 Subject: [PATCH 20/20] [TASK] Remove @phpstan-ignore-next-line in scss parser test --- Tests/Functional/Parser/ScssParserTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Functional/Parser/ScssParserTest.php b/Tests/Functional/Parser/ScssParserTest.php index 243e13a47..4d21cf9f8 100644 --- a/Tests/Functional/Parser/ScssParserTest.php +++ b/Tests/Functional/Parser/ScssParserTest.php @@ -114,7 +114,7 @@ protected function buildRequest(string $typoScriptString = ''): ServerRequest $request = new ServerRequest(); $lineStream = (new LossyTokenizer())->tokenize($typoScriptString); $typoScriptAst = (new AstBuilder(new NoopEventDispatcher()))->build($lineStream, new RootNode()); - /** @phpstan-ignore-next-line */ + $typoScriptAttribute = new FrontendTypoScript(new RootNode(), [], [], []); $typoScriptAttribute->setSetupTree($typoScriptAst); $typoScriptAttribute->setSetupArray($typoScriptAst->toArray());