From eab5e2afd62d52e0adb1400bb67ab6092f81e17e Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Fri, 7 Oct 2022 14:08:54 +0200 Subject: [PATCH 01/10] [TASK] Raise PHP version constraint --- composer.json | 2 +- ext_emconf.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 3fd382e..3464615 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "type": "typo3-cms-extension", "license": "GPL-2.0-or-later", "require": { - "php": "^7.2", + "php": "^7.2|| ^8.0 || 8.1", "typo3/cms-core": "^10.4 || ^11.5", "ext-json": "*" }, diff --git a/ext_emconf.php b/ext_emconf.php index 33458e5..f807416 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -11,7 +11,7 @@ 'constraints' => [ 'depends' => [ 'typo3' => '10.4.0-11.5.99', - 'php' => '7.2.0-7.99.99' + 'php' => '7.2.0-8.1.99' ], 'conflicts' => [], 'suggests' => [], From f163862941b451cd979bf64bc56dd13237d8fada Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Fri, 7 Oct 2022 15:41:27 +0200 Subject: [PATCH 02/10] [TASK] Update to TYPO3 constant --- ext_localconf.php | 3 +-- ext_tables.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ext_localconf.php b/ext_localconf.php index 30985d5..18ce703 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -1,6 +1,5 @@ Date: Fri, 7 Oct 2022 15:42:16 +0200 Subject: [PATCH 03/10] [TASK] PHP 8.x support: remove undefined array key PHP warning --- ext_localconf.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext_localconf.php b/ext_localconf.php index 18ce703..7d5abfe 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -19,7 +19,8 @@ function () { /** * Caching framework */ - if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['instagram'])) { + if (isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['instagram']) + && !is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['instagram'])) { $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['instagram'] = []; } From 1db2ec47ad9d92de90aa8b68441363438a2a7e00 Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Fri, 7 Oct 2022 15:43:21 +0200 Subject: [PATCH 04/10] [TASK] Profile:showAction: return htmlResponse() --- Classes/Controller/ProfileController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Classes/Controller/ProfileController.php b/Classes/Controller/ProfileController.php index 93d1268..ac83a1f 100644 --- a/Classes/Controller/ProfileController.php +++ b/Classes/Controller/ProfileController.php @@ -2,6 +2,7 @@ declare(strict_types=1); namespace In2code\Instagram\Controller; +use Psr\Http\Message\ResponseInterface; use In2code\Instagram\Domain\Repository\FeedRepository; use In2code\Instagram\Domain\Repository\TokenRepository; use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; @@ -35,7 +36,7 @@ public function __construct(FeedRepository $feedRepository, TokenRepository $tok /** * @return void */ - public function showAction() + public function showAction(): ResponseInterface { $feed = $this->feedRepository->findDataByUsername((string)$this->settings['username']); $this->view->assignMultiple([ @@ -43,5 +44,6 @@ public function showAction() 'feed' => $feed, 'token' => $this->tokenRepository->findValidTokenByUsername((string)$this->settings['username']) ]); + return $this->htmlResponse(); } } From 1b815e1cc56be67409dede423748df4e3034ee72 Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Fri, 7 Oct 2022 15:44:00 +0200 Subject: [PATCH 05/10] [TASK] Update to TYPO3 constant --- Configuration/TCA/Overrides/sys_template.php | 2 +- Configuration/TCA/Overrides/tt_content.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php index 915b4cc..60175f9 100644 --- a/Configuration/TCA/Overrides/sys_template.php +++ b/Configuration/TCA/Overrides/sys_template.php @@ -1,5 +1,5 @@ Date: Wed, 12 Oct 2022 22:20:05 +0200 Subject: [PATCH 06/10] [BUGFIX] Use correct if condition --- ext_localconf.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ext_localconf.php b/ext_localconf.php index 7d5abfe..ea4145b 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -19,8 +19,7 @@ function () { /** * Caching framework */ - if (isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['instagram']) - && !is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['instagram'])) { + if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['instagram'])) { $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['instagram'] = []; } From c16b0197fd6596edeae89d15bfa444baf9da6999 Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Wed, 12 Oct 2022 22:20:36 +0200 Subject: [PATCH 07/10] [BUGFIX] Reduce version constraints to necessary versions --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3464615..cf02db7 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,8 @@ "type": "typo3-cms-extension", "license": "GPL-2.0-or-later", "require": { - "php": "^7.2|| ^8.0 || 8.1", "typo3/cms-core": "^10.4 || ^11.5", + "php": "^7.2 || ^8.0", "ext-json": "*" }, "autoload": { From 31a16689c040bd8ac1463949fe739fad644b7199 Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Wed, 12 Oct 2022 22:21:21 +0200 Subject: [PATCH 08/10] [TASK] Limit TYPO3 version constraint to ^11.5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cf02db7..c8f1d5d 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,8 @@ "type": "typo3-cms-extension", "license": "GPL-2.0-or-later", "require": { - "typo3/cms-core": "^10.4 || ^11.5", "php": "^7.2 || ^8.0", + "typo3/cms-core": "^11.5", "ext-json": "*" }, "autoload": { From 74d4b7e3b82cf7e6bdd173d8a69abeb68601bbee Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Wed, 12 Oct 2022 22:34:41 +0200 Subject: [PATCH 09/10] [TASK] Raise TYPO3 core version constraint in ext_emconf.php --- ext_emconf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext_emconf.php b/ext_emconf.php index f807416..7a43d92 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -10,7 +10,7 @@ 'state' => 'stable', 'constraints' => [ 'depends' => [ - 'typo3' => '10.4.0-11.5.99', + 'typo3' => '11.5.0-11.5.99', 'php' => '7.2.0-8.1.99' ], 'conflicts' => [], From fcb3bf95ed13a06c50531f4dc374187bb3caaf04 Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Wed, 12 Oct 2022 22:34:53 +0200 Subject: [PATCH 10/10] [TASK] Raise php version for release CI --- .github/workflows/ter-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ter-release.yml b/.github/workflows/ter-release.yml index b8c74ce..839f30e 100644 --- a/.github/workflows/ter-release.yml +++ b/.github/workflows/ter-release.yml @@ -24,7 +24,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: '8.1' extensions: intl, mbstring, xml, soap, zip, curl - name: Install EXT:tailor