mirror of
https://github.com/FriendsOfTYPO3/tea.git
synced 2024-09-19 23:36:13 +02:00
Upgrade to TYPO3 v12.2 (#746)
This commit is contained in:
Łukasz Uznański
GitHub
parent
fa77cef5f2
commit
7cd09a3b52
8 changed files with 17 additions and 24 deletions
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
|
|
@ -162,10 +162,10 @@ jobs:
|
|||
- typo3-version: "^11.5"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: highest
|
||||
- typo3-version: "^12.1"
|
||||
- typo3-version: "^12.2"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: lowest
|
||||
- typo3-version: "^12.1"
|
||||
- typo3-version: "^12.2"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: highest
|
||||
functional-tests:
|
||||
|
|
@ -244,9 +244,9 @@ jobs:
|
|||
- typo3-version: "^11.5"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: highest
|
||||
- typo3-version: "^12.1"
|
||||
- typo3-version: "^12.2"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: lowest
|
||||
- typo3-version: "^12.1"
|
||||
- typo3-version: "^12.2"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: highest
|
||||
|
|
|
|||
8
.github/workflows/predefined.yml
vendored
8
.github/workflows/predefined.yml
vendored
|
|
@ -211,10 +211,10 @@ jobs:
|
|||
- typo3-version: "^11.5"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: highest
|
||||
- typo3-version: "^12.1"
|
||||
- typo3-version: "^12.2"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: lowest
|
||||
- typo3-version: "^12.1"
|
||||
- typo3-version: "^12.2"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: highest
|
||||
functional-tests:
|
||||
|
|
@ -291,9 +291,9 @@ jobs:
|
|||
- typo3-version: "^11.5"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: highest
|
||||
- typo3-version: "^12.1"
|
||||
- typo3-version: "^12.2"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: lowest
|
||||
- typo3-version: "^12.1"
|
||||
- typo3-version: "^12.2"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: highest
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ func-php8.1-v11-highest:
|
|||
- build-composer-dependencies
|
||||
- php-lint-php8.1
|
||||
script:
|
||||
- composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.1"
|
||||
- composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.2"
|
||||
- composer update --no-ansi --no-interaction --no-progress --with-dependencies
|
||||
- wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ func-php8.1-v11-lowest:
|
|||
- build-composer-dependencies
|
||||
- php-lint-php8.1
|
||||
script:
|
||||
- composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.1"
|
||||
- composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.2"
|
||||
- composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest
|
||||
- wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional
|
||||
|
|
|
|||
|
|
@ -6,5 +6,5 @@ unit-php8.1-v12-highest:
|
|||
- build-composer-dependencies
|
||||
- php-lint-php8.1
|
||||
script:
|
||||
- composer require --no-progress typo3/cms-core:"^12.1"
|
||||
- composer require --no-progress typo3/cms-core:"^12.2"
|
||||
- composer ci:tests:unit
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@ unit-php8.1-v12-lowest:
|
|||
- build-composer-dependencies
|
||||
- php-lint-php8.1
|
||||
script:
|
||||
- composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.1"
|
||||
- composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.2"
|
||||
- composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest
|
||||
- composer ci:tests:unit
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@ namespace TTN\Tea\Tests\Functional\Domain\Repository\Product;
|
|||
|
||||
use TTN\Tea\Domain\Model\Product\Tea;
|
||||
use TTN\Tea\Domain\Repository\Product\TeaRepository;
|
||||
use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
|
||||
use TYPO3\CMS\Core\Http\ServerRequest;
|
||||
use TYPO3\CMS\Core\Utility\GeneralUtility;
|
||||
use TYPO3\CMS\Extbase\Domain\Model\FileReference;
|
||||
use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
|
||||
|
|
@ -29,11 +27,6 @@ class TeaRepositoryTest extends FunctionalTestCase
|
|||
{
|
||||
parent::setUp();
|
||||
|
||||
// This is needed to make the functional tests work with TYPO3 12.1. We might be able to remove this in the
|
||||
// once we've updated to TYPO3 12.1.3 or 12.2.
|
||||
$request = (new ServerRequest())->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_CLI);
|
||||
$GLOBALS['TYPO3_REQUEST'] = $request;
|
||||
|
||||
$this->persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
|
||||
|
||||
$this->subject = $this->getContainer()->get(TeaRepository::class);
|
||||
|
|
|
|||
|
|
@ -29,10 +29,10 @@
|
|||
"require": {
|
||||
"php": "~7.4.0 || ~8.0.0 || ~8.1.0",
|
||||
"psr/http-message": "^1.0.1",
|
||||
"typo3/cms-core": "^11.5.4 || ^12.1",
|
||||
"typo3/cms-extbase": "^11.5.4 || ^12.1",
|
||||
"typo3/cms-fluid": "^11.5.4 || ^12.1",
|
||||
"typo3/cms-frontend": "^11.5.4 || ^12.1"
|
||||
"typo3/cms-core": "^11.5.4 || ^12.2",
|
||||
"typo3/cms-extbase": "^11.5.4 || ^12.2",
|
||||
"typo3/cms-fluid": "^11.5.4 || ^12.2",
|
||||
"typo3/cms-frontend": "^11.5.4 || ^12.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/dbal": "^2.13.8 || ^3.3.7",
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
"seld/jsonlint": "^1.9.0",
|
||||
"squizlabs/php_codesniffer": "^3.7.1",
|
||||
"symfony/yaml": "^5.4 || ^6.1",
|
||||
"typo3/cms-fluid-styled-content": "^11.5.4 || ^12.1",
|
||||
"typo3/cms-fluid-styled-content": "^11.5.4 || ^12.2",
|
||||
"typo3/coding-standards": "^0.6.1",
|
||||
"typo3/testing-framework": "^7.0@dev"
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in a new issue