Skip to content
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

Jump to bottom

[BUGFIX] Provide compatibility with TYPO3 master #681

Merged
merged 1 commit into from
Feb 28, 2018
Merged

[BUGFIX] Provide compatibility with TYPO3 master #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ install:
typo3/cms-extbase="$TYPO3_VERSION" \
typo3/cms-extensionmanager="$TYPO3_VERSION" \
typo3/cms-fluid="$TYPO3_VERSION" \
typo3/cms-frontend="$TYPO3_VERSION" \
typo3/cms-install="$TYPO3_VERSION" \
typo3/cms-saltedpasswords="$TYPO3_VERSION" \
typo3/cms-scheduler="$TYPO3_VERSION" \
$PREFER_LOWEST
- git checkout composer.json
Expand Down Expand Up @@ -73,16 +75,16 @@ jobs:

- stage: test
php: 7.2
env: TYPO3_VERSION=^8.7
env: TYPO3_VERSION=^8.7.10
- stage: test
php: 7.1
env: TYPO3_VERSION=^8.7
env: TYPO3_VERSION=^8.7.10
- stage: test
php: 7.0
env: TYPO3_VERSION=^8.7
env: TYPO3_VERSION=^8.7.10
- stage: test
php: 7.0
env: TYPO3_VERSION=^8.7 PREFER_LOWEST="--prefer-lowest"
env: TYPO3_VERSION=^8.7.10 PREFER_LOWEST="--prefer-lowest"
- stage: test
php: 7.2
env: TYPO3_VERSION="~9.1.0"
Expand Down
1 change: 0 additions & 1 deletion Classes/Core/Kernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ public function handle(InputInterface $input): int
*/
public function terminate(int $exitCode = 0)
{
$this->bootstrap->shutdown();
if ($exitCode > 255) {
$exitCode = 255;
}
Expand Down
4 changes: 4 additions & 0 deletions Tests/Functional/Command/UpgradeCommandControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,13 @@ private function setUpNewTypo3Instance($instancePath)
mkdir($instancePath);
}
putenv('TYPO3_PATH_COMPOSER_ROOT=' . $instancePath);
$_ENV['TYPO3_PATH_COMPOSER_ROOT'] = $instancePath;
putenv('TYPO3_PATH_ROOT=' . $instancePath . '/web');
$_ENV['TYPO3_PATH_ROOT'] = $instancePath . '/web';
putenv('TYPO3_PATH_WEB=' . $instancePath . '/web');
$_ENV['TYPO3_PATH_WEB'] = $instancePath . '/web';
putenv('TYPO3_INSTALL_DB_DBNAME=' . getenv('TYPO3_INSTALL_DB_DBNAME') . '_up');
$_ENV['TYPO3_INSTALL_DB_DBNAME'] = getenv('TYPO3_INSTALL_DB_DBNAME') . '_up';
chdir($instancePath);

file_put_contents($instancePath . '/composer.json', '{}');
Expand Down
2 changes: 1 addition & 1 deletion Tests/Functional/Fixtures/Extensions/ext_test/ext_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE TABLE pages (
author_email varchar(255) DEFAULT '' NOT NULL
author_email varchar(242) DEFAULT '' NOT NULL
);

CREATE TABLE tx_exttest_cattest (
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ install:
- IF NOT EXIST c:\php mkdir c:\php
- IF NOT EXIST c:\php\%PHP_VERSION% mkdir c:\php\%PHP_VERSION%
- cd c:\php\%PHP_VERSION%
- IF NOT EXIST php-installed.txt appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-%PHP_VERSION%-x86.zip
- IF NOT EXIST php-installed.txt curl -fsS -o php-%PHP_VERSION%-x86.zip http://windows.php.net/downloads/releases/archives/php-%PHP_VERSION%-x86.zip
- IF NOT EXIST php-installed.txt 7z x php-%PHP_VERSION%-x86.zip -y >nul
- IF NOT EXIST php-installed.txt del /Q *.zip
- IF NOT EXIST php-installed.txt copy /Y php.ini-development php.ini
Expand All @@ -45,12 +45,12 @@ install:
- IF NOT EXIST php-installed.txt echo extension=php_mbstring.dll >> php.ini
- IF NOT EXIST php-installed.txt echo extension=php_fileinfo.dll >> php.ini
- IF NOT EXIST php-installed.txt echo extension=php_mysqli.dll >> php.ini
- IF NOT EXIST php-installed.txt appveyor DownloadFile https://getcomposer.org/composer.phar
- IF NOT EXIST php-installed.txt curl -fsS -o composer.phar https://getcomposer.org/composer.phar
- IF NOT EXIST php-installed.txt echo @php %%~dp0composer.phar %%* > composer.bat
- IF NOT EXIST php-installed.txt type nul >> php-installed.txt

- cd c:\t3c
- composer require "typo3/cms-backend=%TYPO3_VERSION%" "typo3/cms-core=%TYPO3_VERSION%" "typo3/cms-extbase=%TYPO3_VERSION%" "typo3/cms-extensionmanager=%TYPO3_VERSION%" "typo3/cms-fluid=%TYPO3_VERSION%" "typo3/cms-install=%TYPO3_VERSION%" "typo3/cms-scheduler=%TYPO3_VERSION%" --prefer-dist --no-progress --ansi
- composer require "typo3/cms-backend=%TYPO3_VERSION%" "typo3/cms-core=%TYPO3_VERSION%" "typo3/cms-extbase=%TYPO3_VERSION%" "typo3/cms-extensionmanager=%TYPO3_VERSION%" "typo3/cms-fluid=%TYPO3_VERSION%" "typo3/cms-frontend=%TYPO3_VERSION%" "typo3/cms-install=%TYPO3_VERSION%" "typo3/cms-saltedpasswords=%TYPO3_VERSION%" "typo3/cms-scheduler=%TYPO3_VERSION%" --prefer-dist --no-progress --ansi
- git checkout .

test_script:
Expand Down
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"typo3/cms-extbase": "^8.7.10 || ~9.1.0",
"typo3/cms-extensionmanager": "^8.7.10 || ~9.1.0",
"typo3/cms-fluid": "^8.7.10 || ~9.1.0",
"typo3/cms-frontend": "^8.7.10 || ~9.1.0",
"typo3/cms-install": "^8.7.10 || ~9.1.0",
"typo3/cms-scheduler": "^8.7.10 || ~9.1.0",
"typo3/cms-saltedpasswords": "^8.7.10 || ~9.1.0",
Expand Down