[TASK] Remove support for TYPO3 7.6

This commit is contained in:
Benjamin Serfhos 2018-10-26 14:48:13 +02:00
parent 35fdc6905f
commit 0d14f80f62
10 changed files with 5 additions and 61 deletions

View file

@ -26,7 +26,6 @@ env:
- typo3DatabaseUsername="travis" - typo3DatabaseUsername="travis"
- typo3DatabasePassword="" - typo3DatabasePassword=""
matrix: matrix:
- TYPO3_VERSION="~7.6"
- TYPO3_VERSION="~8.7" - TYPO3_VERSION="~8.7"
matrix: matrix:

View file

@ -1,31 +0,0 @@
<?php
namespace Codappix\SearchCore\Compatibility;
/*
* Copyright (C) 2018 Daniel Siepmann <coding@daniel-siepmann.de>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
use TYPO3\CMS\Extbase\Service\TypoScriptService as CoreTypoScriptService;
/**
* Used before TYPO3 CMS 8.7.
*/
class TypoScriptService76 extends CoreTypoScriptService implements TypoScriptServiceInterface
{
}

View file

@ -41,8 +41,8 @@ If all tests are okay, start your work.
If you are working with multiple TYPO3 versions make sure to export `typo3DatabaseName` and If you are working with multiple TYPO3 versions make sure to export `typo3DatabaseName` and
`TYPO3_VERSION` in your environment like:: `TYPO3_VERSION` in your environment like::
export typo3DatabaseName="searchcoretest76" export typo3DatabaseName="searchcoretest87"
export TYPO3_VERSION="~7.6" export TYPO3_VERSION="~8.7"
Also run the install command for each version before running any tests. Only this will make sure you Also run the install command for each version before running any tests. Only this will make sure you
are testing against the actual TYPO3 Version and database scheme. are testing against the actual TYPO3 Version and database scheme.

View file

@ -11,16 +11,9 @@ typo3DatabasePassword ?= "dev"
typo3DatabaseHost ?= "127.0.0.1" typo3DatabaseHost ?= "127.0.0.1"
sourceOrDist=--prefer-dist sourceOrDist=--prefer-dist
ifeq ($(TYPO3_VERSION),~7.6)
sourceOrDist=--prefer-source
endif
.PHONY: install .PHONY: install
install: clean install: clean
if [ $(TYPO3_VERSION) = ~7.6 ]; then \
patch composer.json Tests/InstallPatches/composer.json.patch; \
fi
COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev $(sourceOrDist) typo3/cms="$(TYPO3_VERSION)" COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev $(sourceOrDist) typo3/cms="$(TYPO3_VERSION)"
git checkout composer.json git checkout composer.json

View file

@ -2,8 +2,4 @@
$filePath = '.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php'; $filePath = '.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php';
if (getenv('TYPO3_VERSION') === '~7.6') {
$filePath = '.Build/vendor/typo3/cms/typo3/sysext/core/Build/FunctionalTestsBootstrap.php';
}
require_once dirname(dirname(__DIR__)) . '/' . $filePath; require_once dirname(dirname(__DIR__)) . '/' . $filePath;

View file

@ -22,7 +22,6 @@ namespace Codappix\SearchCore\Tests\Functional\DataProcessing;
*/ */
use Codappix\SearchCore\Compatibility\TypoScriptService; use Codappix\SearchCore\Compatibility\TypoScriptService;
use Codappix\SearchCore\Compatibility\TypoScriptService76;
use Codappix\SearchCore\DataProcessing\ContentObjectDataProcessorAdapterProcessor; use Codappix\SearchCore\DataProcessing\ContentObjectDataProcessorAdapterProcessor;
use Codappix\SearchCore\Tests\Functional\AbstractFunctionalTestCase; use Codappix\SearchCore\Tests\Functional\AbstractFunctionalTestCase;
use TYPO3\CMS\Frontend\DataProcessing\SplitProcessor; use TYPO3\CMS\Frontend\DataProcessing\SplitProcessor;
@ -46,11 +45,7 @@ class ContentObjectDataProcessorAdapterProcessorTest extends AbstractFunctionalT
'new_content' => ['value1', 'value2'], 'new_content' => ['value1', 'value2'],
]; ];
if ($this->isLegacyVersion()) {
$typoScriptService = new TypoScriptService76();
} else {
$typoScriptService = new TypoScriptService(); $typoScriptService = new TypoScriptService();
}
$subject = new ContentObjectDataProcessorAdapterProcessor($typoScriptService); $subject = new ContentObjectDataProcessorAdapterProcessor($typoScriptService);
$processedData = $subject->processData($record, $configuration); $processedData = $subject->processData($record, $configuration);

View file

@ -2,10 +2,6 @@
$filePath = '.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php'; $filePath = '.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php';
if (getenv('TYPO3_VERSION') === '~7.6') {
$filePath = '.Build/vendor/typo3/cms/typo3/sysext/core/Build/UnitTestsBootstrap.php';
}
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
require_once dirname(dirname(__DIR__)) . '/' . $filePath; require_once dirname(dirname(__DIR__)) . '/' . $filePath;

View file

@ -24,7 +24,6 @@ namespace Codappix\SearchCore\Tests\Unit\Domain\Index\TcaIndexer;
use Codappix\SearchCore\Configuration\ConfigurationContainerInterface; use Codappix\SearchCore\Configuration\ConfigurationContainerInterface;
use Codappix\SearchCore\Domain\Index\TcaIndexer\RelationResolver; use Codappix\SearchCore\Domain\Index\TcaIndexer\RelationResolver;
use Codappix\SearchCore\Domain\Index\TcaIndexer\TcaTableService; use Codappix\SearchCore\Domain\Index\TcaIndexer\TcaTableService;
use Codappix\SearchCore\Domain\Index\TcaIndexer\TcaTableService76;
use Codappix\SearchCore\Tests\Unit\AbstractUnitTestCase; use Codappix\SearchCore\Tests\Unit\AbstractUnitTestCase;
use TYPO3\CMS\Core\Database\DatabaseConnection; use TYPO3\CMS\Core\Database\DatabaseConnection;
@ -53,9 +52,6 @@ class TcaTableServiceTest extends AbstractUnitTestCase
$this->databaseConnection = $this->getMockBuilder(DatabaseConnection::class)->getMock(); $this->databaseConnection = $this->getMockBuilder(DatabaseConnection::class)->getMock();
$className = TcaTableService::class; $className = TcaTableService::class;
if ($this->isLegacyVersion()) {
$className = TcaTableService76::class;
}
$this->subject = $this->getMockBuilder($className) $this->subject = $this->getMockBuilder($className)
->disableOriginalConstructor() ->disableOriginalConstructor()
->setMethods(['getConnection', 'getSystemWhereClause']) ->setMethods(['getConnection', 'getSystemWhereClause'])

View file

@ -17,7 +17,7 @@
}, },
"require": { "require": {
"php": ">=7.0.0", "php": ">=7.0.0",
"typo3/cms": ">= 7.6.0 < 9.0.0", "typo3/cms": ">= 8.7.0 < 9.0.0",
"ruflin/elastica": "^6.0.2" "ruflin/elastica": "^6.0.2"
}, },
"require-dev": { "require-dev": {

View file

@ -7,7 +7,7 @@ $EM_CONF[$_EXTKEY] = [
'clearCacheOnLoad' => 1, 'clearCacheOnLoad' => 1,
'constraints' => [ 'constraints' => [
'depends' => [ 'depends' => [
'typo3' => '7.6.0-8.7.99', 'typo3' => '8.7.0-8.7.99',
'php' => '7.0.0-7.2.99' 'php' => '7.0.0-7.2.99'
], ],
'conflicts' => [], 'conflicts' => [],