Skip to content

PHP 8 and TYPO3 related updates #17 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

PHP 8 and TYPO3 related updates #17 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eab5e2a
[TASK] Raise PHP version constraint
josefglatz Oct 7, 2022
f163862
[TASK] Update to TYPO3 constant
josefglatz Oct 7, 2022
6ec9c86
[TASK] PHP 8.x support: remove undefined array key PHP warning
josefglatz Oct 7, 2022
1db2ec4
[TASK] Profile:showAction: return htmlResponse()
josefglatz Oct 7, 2022
1b815e1
[TASK] Update to TYPO3 constant
josefglatz Oct 7, 2022
5924631
[BUGFIX] Use correct if condition
josefglatz Oct 12, 2022
c16b019
[BUGFIX] Reduce version constraints to necessary versions
josefglatz Oct 12, 2022
31a1668
[TASK] Limit TYPO3 version constraint to ^11.5
josefglatz Oct 12, 2022
74d4b7e
[TASK] Raise TYPO3 core version constraint in ext_emconf.php
josefglatz Oct 12, 2022
fcb3bf9
[TASK] Raise php version for release CI
josefglatz Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ter-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Classes/Controller/ProfileController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -35,13 +36,14 @@ public function __construct(FeedRepository $feedRepository, TokenRepository $tok
/**
* @return void
*/
public function showAction()
public function showAction(): ResponseInterface
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a question: Is this still ok for TYPO3 10? I'm asking because otherwise, we have to adjust the requirements.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's ok I would leave it as-is and therefore remove the support for TYPO3 10. Since the extension looks like it's feature complete and TYPO3 v12 is coming I would suggest to support only v11 – if OK for you Alex!

I will update therefore the proper constraints.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@einpraegsam would love to hear from you

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, dropping support for 10 is fine also for me

{
$feed = $this->feedRepository->findDataByUsername((string)$this->settings['username']);
$this->view->assignMultiple([
'data' => $this->configurationManager->getContentObject()->data,
'feed' => $feed,
'token' => $this->tokenRepository->findValidTokenByUsername((string)$this->settings['username'])
]);
return $this->htmlResponse();
}
}
2 changes: 1 addition & 1 deletion Configuration/TCA/Overrides/sys_template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
defined('TYPO3_MODE') || die();
defined('TYPO3') || die();

/**
* Register Static Template
Expand Down
2 changes: 1 addition & 1 deletion Configuration/TCA/Overrides/tt_content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
defined('TYPO3_MODE') || die();
defined('TYPO3') || die();

/**
* Register Plugins
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"type": "typo3-cms-extension",
"license": "GPL-2.0-or-later",
"require": {
"php": "^7.2",
"typo3/cms-core": "^10.4 || ^11.5",
"php": "^7.2 || ^8.0",
"typo3/cms-core": "^11.5",
"ext-json": "*"
},
"autoload": {
Expand Down
4 changes: 2 additions & 2 deletions ext_emconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
'state' => 'stable',
'constraints' => [
'depends' => [
'typo3' => '10.4.0-11.5.99',
'php' => '7.2.0-7.99.99'
'typo3' => '11.5.0-11.5.99',
'php' => '7.2.0-8.1.99'
],
'conflicts' => [],
'suggests' => [],
Expand Down
5 changes: 2 additions & 3 deletions ext_localconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php

if (!defined('TYPO3_MODE')) {
if (!defined('TYPO3')) {
die('Access denied.');
}

Expand All @@ -20,7 +19,7 @@ function () {
/**
* Caching framework
*/
if (!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'] = [];
}

Expand Down
2 changes: 1 addition & 1 deletion ext_tables.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
defined('TYPO3_MODE') || die();
defined('TYPO3') || die();

call_user_func(
function () {
Expand Down