From e21c309ba370534c5af2dbcc75ce0b333bf322bb Mon Sep 17 00:00:00 2001 From: Sefux Date: Thu, 7 Mar 2024 17:05:24 +0100 Subject: [PATCH 01/10] [BUGFIX] Wrong path for Configuration/TCA/Overrides (see also #79) --- Configuration/{Configuration => }/TCA/Overrides/tt_content.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename Configuration/{Configuration => }/TCA/Overrides/tt_content.php (94%) diff --git a/Configuration/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php similarity index 94% rename from Configuration/Configuration/TCA/Overrides/tt_content.php rename to Configuration/TCA/Overrides/tt_content.php index 95942b8..6c8c381 100644 --- a/Configuration/Configuration/TCA/Overrides/tt_content.php +++ b/Configuration/TCA/Overrides/tt_content.php @@ -1,12 +1,13 @@ Date: Thu, 7 Mar 2024 17:28:11 +0100 Subject: [PATCH 02/10] [BUGFIX] Return ResponseInterface #92784 / fix deprecations #100662 & #100596 --- Classes/Controller/FeedController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Classes/Controller/FeedController.php b/Classes/Controller/FeedController.php index b6410b9..9bae393 100755 --- a/Classes/Controller/FeedController.php +++ b/Classes/Controller/FeedController.php @@ -16,6 +16,7 @@ use TYPO3\CMS\Core\Core\Environment; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; +use Psr\Http\Message\ResponseInterface; /** * RSS display that will fetch the content of a RSS Feed and display it onto the Frontend. @@ -68,7 +69,7 @@ public function showAction() $this->view->assign('title', $feed->get_title()); $this->view->assign('items', $feed->get_items(0, (int)$this->settings['numberOfItems'])); $this->view->assign('settings', $this->settings); - $cObj = $this->configurationManager->getContentObject(); + $cObj = $this->request->getAttribute('currentContentObject'); $this->view->assign('data', $cObj->data); $result = $this->view->render(); @@ -79,7 +80,7 @@ public function showAction() } } - return $result; + return $this->htmlResponse($result); } /** @@ -106,7 +107,7 @@ protected function canFetchResultFromCache() $result = FALSE; if ($this->getPluginType() === self::PLUGIN_TYPE_USER_INT && $this->getCacheInstance()->has($this->getCacheIdentifier()) - && !GeneralUtility::_GET('no_cache') + && !($this->request->getQueryParams()['no_cache'] ?? null) ) { $result = TRUE; } From fde1e2cdc632e3fe9e7a640d300107d2622f5cfa Mon Sep 17 00:00:00 2001 From: Sefux Date: Thu, 7 Mar 2024 17:28:32 +0100 Subject: [PATCH 03/10] [BUGFIX] Remove unused flexform items --- Configuration/FlexForm/feed.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/Configuration/FlexForm/feed.xml b/Configuration/FlexForm/feed.xml index 2bc7d89..ef937b1 100644 --- a/Configuration/FlexForm/feed.xml +++ b/Configuration/FlexForm/feed.xml @@ -39,7 +39,6 @@ select Fab\RssDisplay\Backend\FlexformHelper->populateTemplatesList selectSingle - From a5cc5600e98b0fc257468d978a947702fa6677c7 Mon Sep 17 00:00:00 2001 From: Sefux Date: Thu, 7 Mar 2024 17:30:18 +0100 Subject: [PATCH 04/10] [BUGFIX Fix content element wizard (#97201) --- .../TsConfig/ContentElementWizard.tsconfig | 17 +++++++++++++++++ Configuration/page.tsconfig | 1 + ext_tables.php | 8 ++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 Configuration/TsConfig/ContentElementWizard.tsconfig create mode 100644 Configuration/page.tsconfig diff --git a/Configuration/TsConfig/ContentElementWizard.tsconfig b/Configuration/TsConfig/ContentElementWizard.tsconfig new file mode 100644 index 0000000..2546a71 --- /dev/null +++ b/Configuration/TsConfig/ContentElementWizard.tsconfig @@ -0,0 +1,17 @@ +mod.wizards { + newContentElement.wizardItems { + plugins { + elements { + rss_display_pi1 { + iconIdentifier = content-widget-rss + title = RSS Feed Display + description = Create a list of rss items + tt_content_defValues { + CType = list + list_type = rss_display_pi1 + } + } + } + } + } +} \ No newline at end of file diff --git a/Configuration/page.tsconfig b/Configuration/page.tsconfig new file mode 100644 index 0000000..5e9e96e --- /dev/null +++ b/Configuration/page.tsconfig @@ -0,0 +1 @@ +@import 'EXT:rss_display/Configuration/TsConfig/ContentElementWizard.tsconfig' \ No newline at end of file diff --git a/ext_tables.php b/ext_tables.php index 9615237..04f9081 100644 --- a/ext_tables.php +++ b/ext_tables.php @@ -1,5 +1,6 @@ getMajorVersion() < 12) { + $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms']['db_new_content_el']['wizardItemsHook'][\Fab\RssDisplay\Backend\Wizard::class] = \Fab\RssDisplay\Backend\Wizard::class; +} + call_user_func(function () { /** From 19ab657fc199049a6aed78c75e12e0c5a7500016 Mon Sep 17 00:00:00 2001 From: Sefux Date: Thu, 7 Mar 2024 17:31:24 +0100 Subject: [PATCH 05/10] [BUGFIX] Remove TYPO3_MODE constant (#92947) --- ext_localconf.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ext_localconf.php b/ext_localconf.php index 24d6226..3658595 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -1,7 +1,14 @@ get('rss_display'); @@ -30,8 +37,8 @@ \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( 'rss_display', 'Pi1', - [\Fab\RssDisplay\Controller\FeedController::class => 'show'], - $pluginType === 'USER_INT' ? [\Fab\RssDisplay\Controller\FeedController::class => 'show'] : [], + [FeedController::class => 'show'], + $pluginType === 'USER_INT' ? [FeedController::class => 'show'] : [], \TYPO3\CMS\Extbase\Utility\ExtensionUtility::PLUGIN_TYPE_PLUGIN ); From cb7c958642880b5d0f96fb61ac75f5425e040a0b Mon Sep 17 00:00:00 2001 From: Sefux Date: Thu, 7 Mar 2024 17:32:01 +0100 Subject: [PATCH 06/10] [TASK] Increase TYPO3 v12 compatibility --- composer.json | 2 +- ext_emconf.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 137f4b1..33686a0 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "issues": "https://github.com/fabarea/rss_display/issues" }, "require": { - "typo3/cms-core": "^10.4 || ^11.5", + "typo3/cms-core": "^10.4 || ^11.5 || ^12.4", "simplepie/simplepie": "^1.5" }, "autoload": { diff --git a/ext_emconf.php b/ext_emconf.php index 9c67614..1b3084a 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -11,7 +11,7 @@ 'author_company' => 'Ecodev', 'constraints' => [ 'depends' => [ - 'typo3' => '10.4.0-11.5.99', + 'typo3' => '10.4.0-12.4.99', ], ], ]; From ea4d28375f4f6e2c5a8dc492a389895e7c94fe2b Mon Sep 17 00:00:00 2001 From: Sefux Date: Wed, 13 Mar 2024 11:47:59 +0100 Subject: [PATCH 07/10] Add a service.yaml --- Configuration/Service.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Configuration/Service.yaml diff --git a/Configuration/Service.yaml b/Configuration/Service.yaml new file mode 100644 index 0000000..f4e3c46 --- /dev/null +++ b/Configuration/Service.yaml @@ -0,0 +1,9 @@ +services: + # general settings + _defaults: + autowire: true + autoconfigure: true + public: false + + Fab\RssDisplay\: + resource: '../Classes/*' From b0b562b8973bfc9443b03e8ae0b81212fb0b3247 Mon Sep 17 00:00:00 2001 From: Sefux Date: Wed, 13 Mar 2024 12:00:24 +0100 Subject: [PATCH 08/10] Update Service.yaml - searching for service --- Configuration/Service.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Configuration/Service.yaml b/Configuration/Service.yaml index f4e3c46..f32e8dc 100644 --- a/Configuration/Service.yaml +++ b/Configuration/Service.yaml @@ -7,3 +7,6 @@ services: Fab\RssDisplay\: resource: '../Classes/*' + + Fab\RssDisplay\Controller\FeedController: + public: true \ No newline at end of file From d816083d111d463dd1f05425f952511d8db123e0 Mon Sep 17 00:00:00 2001 From: Sefux Date: Wed, 13 Mar 2024 12:02:30 +0100 Subject: [PATCH 09/10] Rename Service.yaml to Services.yaml --- Configuration/{Service.yaml => Services.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Configuration/{Service.yaml => Services.yaml} (100%) diff --git a/Configuration/Service.yaml b/Configuration/Services.yaml similarity index 100% rename from Configuration/Service.yaml rename to Configuration/Services.yaml From 0e9a7b8b6954a9923d61bc2610ceb8d1b8cc57ca Mon Sep 17 00:00:00 2001 From: Sefux Date: Wed, 5 Feb 2025 13:29:45 +0100 Subject: [PATCH 10/10] wip: Increace TYPO3 v13 compatibility --- composer.json | 2 +- ext_emconf.php | 2 +- ext_localconf.php | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 33686a0..2b3341c 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "issues": "https://github.com/fabarea/rss_display/issues" }, "require": { - "typo3/cms-core": "^10.4 || ^11.5 || ^12.4", + "typo3/cms-core": "^10.4 || ^11.5 || ^12.4 || ^13.4 ", "simplepie/simplepie": "^1.5" }, "autoload": { diff --git a/ext_emconf.php b/ext_emconf.php index 1b3084a..056113a 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -11,7 +11,7 @@ 'author_company' => 'Ecodev', 'constraints' => [ 'depends' => [ - 'typo3' => '10.4.0-12.4.99', + 'typo3' => '10.4.0-13.4.99', ], ], ]; diff --git a/ext_localconf.php b/ext_localconf.php index 3658595..e5c2820 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -7,8 +7,6 @@ use Fab\RssDisplay\Controller\FeedController; $typo3Version = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Information\Typo3Version::class); - - // Define whether USER or USER_INT. $pluginType = 'USER_INT'; $configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class)->get('rss_display');