mirror of
https://github.com/werkraum-media/thuecat.git
synced 2024-09-28 19:26:11 +02:00
Add PHP 7.2 support
Add official support of PHP 7.2. Downgrade dev tools to 7.2 compatible version.
This commit is contained in:
parent
c97b9bd24d
commit
056c8c7947
13 changed files with 13 additions and 41 deletions
11
.github/workflows/ci.yaml
vendored
11
.github/workflows/ci.yaml
vendored
|
@ -15,6 +15,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
php-version:
|
php-version:
|
||||||
|
- 7.2
|
||||||
- 7.3
|
- 7.3
|
||||||
- 7.4
|
- 7.4
|
||||||
steps:
|
steps:
|
||||||
|
@ -134,13 +135,19 @@ jobs:
|
||||||
code-quality:
|
code-quality:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [check-dependencies]
|
needs: [check-dependencies]
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
php-version:
|
||||||
|
- 7.2
|
||||||
|
- 7.3
|
||||||
|
- 7.4
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Install PHP
|
- name: Install PHP
|
||||||
uses: shivammathur/setup-php@v2
|
uses: shivammathur/setup-php@v2
|
||||||
with:
|
with:
|
||||||
php-version: "7.4"
|
php-version: "${{ matrix.php-version }}"
|
||||||
tools: composer:v2
|
tools: composer:v2
|
||||||
|
|
||||||
- name: Get Composer Cache Directory
|
- name: Get Composer Cache Directory
|
||||||
|
@ -169,6 +176,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
php-version:
|
php-version:
|
||||||
|
- 7.2
|
||||||
- 7.3
|
- 7.3
|
||||||
- 7.4
|
- 7.4
|
||||||
steps:
|
steps:
|
||||||
|
@ -206,6 +214,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
php-version:
|
php-version:
|
||||||
|
- 7.2
|
||||||
- 7.3
|
- 7.3
|
||||||
- 7.4
|
- 7.4
|
||||||
steps:
|
steps:
|
||||||
|
|
|
@ -25,7 +25,6 @@ namespace WerkraumMedia\ThueCat\Tests\Functional;
|
||||||
|
|
||||||
use Csa\GuzzleHttp\Middleware\Cache\Adapter\MockStorageAdapter;
|
use Csa\GuzzleHttp\Middleware\Cache\Adapter\MockStorageAdapter;
|
||||||
use Csa\GuzzleHttp\Middleware\Cache\MockMiddleware;
|
use Csa\GuzzleHttp\Middleware\Cache\MockMiddleware;
|
||||||
use Prophecy\PhpUnit\ProphecyTrait;
|
|
||||||
use Prophecy\Prophecy\ObjectProphecy;
|
use Prophecy\Prophecy\ObjectProphecy;
|
||||||
use Psr\Http\Message\ServerRequestInterface;
|
use Psr\Http\Message\ServerRequestInterface;
|
||||||
use TYPO3\CMS\Backend\Routing\Route;
|
use TYPO3\CMS\Backend\Routing\Route;
|
||||||
|
@ -70,8 +69,6 @@ use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase as TestCase;
|
||||||
*/
|
*/
|
||||||
class ImportTest extends TestCase
|
class ImportTest extends TestCase
|
||||||
{
|
{
|
||||||
use ProphecyTrait;
|
|
||||||
|
|
||||||
protected $coreExtensionsToLoad = [
|
protected $coreExtensionsToLoad = [
|
||||||
'core',
|
'core',
|
||||||
'backend',
|
'backend',
|
||||||
|
|
|
@ -23,7 +23,6 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import;
|
namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import;
|
||||||
|
|
||||||
use Prophecy\PhpUnit\ProphecyTrait;
|
|
||||||
use WerkraumMedia\ThueCat\Domain\Import\Import;
|
use WerkraumMedia\ThueCat\Domain\Import\Import;
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration;
|
use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration;
|
||||||
|
@ -35,8 +34,6 @@ use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportLogEntry;
|
||||||
*/
|
*/
|
||||||
class ImportTest extends TestCase
|
class ImportTest extends TestCase
|
||||||
{
|
{
|
||||||
use ProphecyTrait;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @test
|
* @test
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -24,7 +24,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\Importer;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\PhpUnit\ProphecyTrait;
|
|
||||||
use Psr\Http\Client\ClientInterface;
|
use Psr\Http\Client\ClientInterface;
|
||||||
use Psr\Http\Message\RequestFactoryInterface;
|
use Psr\Http\Message\RequestFactoryInterface;
|
||||||
use Psr\Http\Message\RequestInterface;
|
use Psr\Http\Message\RequestInterface;
|
||||||
|
@ -38,8 +37,6 @@ use WerkraumMedia\ThueCat\Domain\Import\Importer\FetchData\InvalidResponseExcept
|
||||||
*/
|
*/
|
||||||
class FetchDataTest extends TestCase
|
class FetchDataTest extends TestCase
|
||||||
{
|
{
|
||||||
use ProphecyTrait;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @test
|
* @test
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -24,7 +24,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\Model;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\PhpUnit\ProphecyTrait;
|
|
||||||
use WerkraumMedia\ThueCat\Domain\Import\Model\Entity;
|
use WerkraumMedia\ThueCat\Domain\Import\Model\Entity;
|
||||||
use WerkraumMedia\ThueCat\Domain\Import\Model\EntityCollection;
|
use WerkraumMedia\ThueCat\Domain\Import\Model\EntityCollection;
|
||||||
|
|
||||||
|
@ -33,8 +32,6 @@ use WerkraumMedia\ThueCat\Domain\Import\Model\EntityCollection;
|
||||||
*/
|
*/
|
||||||
class EntityCollectionTest extends TestCase
|
class EntityCollectionTest extends TestCase
|
||||||
{
|
{
|
||||||
use ProphecyTrait;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @test
|
* @test
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -24,7 +24,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\PhpUnit\ProphecyTrait;
|
|
||||||
use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
|
use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
|
||||||
use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
|
use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
|
||||||
use WerkraumMedia\ThueCat\Domain\Import\RequestFactory;
|
use WerkraumMedia\ThueCat\Domain\Import\RequestFactory;
|
||||||
|
@ -34,8 +33,6 @@ use WerkraumMedia\ThueCat\Domain\Import\RequestFactory;
|
||||||
*/
|
*/
|
||||||
class RequestFactoryTest extends TestCase
|
class RequestFactoryTest extends TestCase
|
||||||
{
|
{
|
||||||
use ProphecyTrait;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @test
|
* @test
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -24,7 +24,6 @@ declare(strict_types=1);
|
||||||
namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\Typo3Converter;
|
namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\Typo3Converter;
|
||||||
|
|
||||||
use Prophecy\Argument;
|
use Prophecy\Argument;
|
||||||
use Prophecy\PhpUnit\ProphecyTrait;
|
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
use WerkraumMedia\ThueCat\Domain\Import\Entity\Properties\ForeignReference;
|
use WerkraumMedia\ThueCat\Domain\Import\Entity\Properties\ForeignReference;
|
||||||
use WerkraumMedia\ThueCat\Domain\Import\Entity\Town;
|
use WerkraumMedia\ThueCat\Domain\Import\Entity\Town;
|
||||||
|
@ -44,8 +43,6 @@ use WerkraumMedia\ThueCat\Domain\Repository\Backend\TownRepository;
|
||||||
*/
|
*/
|
||||||
class GeneralConverterTest extends TestCase
|
class GeneralConverterTest extends TestCase
|
||||||
{
|
{
|
||||||
use ProphecyTrait;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @test
|
* @test
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -24,7 +24,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\UrlProvider;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\PhpUnit\ProphecyTrait;
|
|
||||||
use WerkraumMedia\ThueCat\Domain\Import\UrlProvider\Registry;
|
use WerkraumMedia\ThueCat\Domain\Import\UrlProvider\Registry;
|
||||||
use WerkraumMedia\ThueCat\Domain\Import\UrlProvider\UrlProvider;
|
use WerkraumMedia\ThueCat\Domain\Import\UrlProvider\UrlProvider;
|
||||||
use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration;
|
use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration;
|
||||||
|
@ -34,8 +33,6 @@ use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration;
|
||||||
*/
|
*/
|
||||||
class RegistryTest extends TestCase
|
class RegistryTest extends TestCase
|
||||||
{
|
{
|
||||||
use ProphecyTrait;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @test
|
* @test
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -24,7 +24,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\UrlProvider;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\PhpUnit\ProphecyTrait;
|
|
||||||
use WerkraumMedia\ThueCat\Domain\Import\UrlProvider\StaticUrlProvider;
|
use WerkraumMedia\ThueCat\Domain\Import\UrlProvider\StaticUrlProvider;
|
||||||
use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration;
|
use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration;
|
||||||
|
|
||||||
|
@ -33,8 +32,6 @@ use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration;
|
||||||
*/
|
*/
|
||||||
class StaticUrlProviderTest extends TestCase
|
class StaticUrlProviderTest extends TestCase
|
||||||
{
|
{
|
||||||
use ProphecyTrait;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @test
|
* @test
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -23,7 +23,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\UrlProvider;
|
||||||
* 02110-1301, USA.
|
* 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Prophecy\PhpUnit\ProphecyTrait;
|
|
||||||
use WerkraumMedia\ThueCat\Domain\Import\Importer\FetchData;
|
use WerkraumMedia\ThueCat\Domain\Import\Importer\FetchData;
|
||||||
use WerkraumMedia\ThueCat\Domain\Import\UrlProvider\SyncScopeUrlProvider;
|
use WerkraumMedia\ThueCat\Domain\Import\UrlProvider\SyncScopeUrlProvider;
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
|
@ -34,8 +33,6 @@ use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration;
|
||||||
*/
|
*/
|
||||||
class SyncScopeUrlProviderTest extends TestCase
|
class SyncScopeUrlProviderTest extends TestCase
|
||||||
{
|
{
|
||||||
use ProphecyTrait;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @test
|
* @test
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -23,7 +23,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Model\Backend;
|
||||||
* 02110-1301, USA.
|
* 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Prophecy\PhpUnit\ProphecyTrait;
|
|
||||||
use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration;
|
use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration;
|
||||||
use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportLog;
|
use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportLog;
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
|
@ -33,8 +32,6 @@ use PHPUnit\Framework\TestCase;
|
||||||
*/
|
*/
|
||||||
class ImportLogTest extends TestCase
|
class ImportLogTest extends TestCase
|
||||||
{
|
{
|
||||||
use ProphecyTrait;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @test
|
* @test
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.3",
|
"php": "~7.2.0 || ~7.3.0 || ~7.4.0",
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"ext-mbstring": "*",
|
"ext-mbstring": "*",
|
||||||
"psr/http-client": "^1.0",
|
"psr/http-client": "^1.0",
|
||||||
|
@ -49,11 +49,10 @@
|
||||||
"friendsoftypo3/phpstan-typo3": "^0.6.0",
|
"friendsoftypo3/phpstan-typo3": "^0.6.0",
|
||||||
"jangregor/phpstan-prophecy": "^0.8.1",
|
"jangregor/phpstan-prophecy": "^0.8.1",
|
||||||
"maglnet/composer-require-checker": "^2.1",
|
"maglnet/composer-require-checker": "^2.1",
|
||||||
"phpspec/prophecy-phpunit": "^2.0",
|
|
||||||
"phpstan/extension-installer": "^1.1",
|
"phpstan/extension-installer": "^1.1",
|
||||||
"phpstan/phpstan": "^0.12.71",
|
"phpstan/phpstan": "^0.12.71",
|
||||||
"phpstan/phpstan-phpunit": "^0.12.21",
|
"phpstan/phpstan-phpunit": "^0.12.21",
|
||||||
"phpunit/phpunit": "^9.5",
|
"phpunit/phpunit": "^8.5",
|
||||||
"symplify/easy-coding-standard": "^9.0",
|
"symplify/easy-coding-standard": "^9.0",
|
||||||
"typo3/cms-fluid-styled-content": "^10.4",
|
"typo3/cms-fluid-styled-content": "^10.4",
|
||||||
"typo3/testing-framework": "^6.6"
|
"typo3/testing-framework": "^6.6"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<phpunit
|
<phpunit
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
|
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
|
||||||
backupGlobals="false"
|
backupGlobals="false"
|
||||||
backupStaticAttributes="false"
|
backupStaticAttributes="false"
|
||||||
beStrictAboutCoversAnnotation="true"
|
beStrictAboutCoversAnnotation="true"
|
||||||
|
@ -27,12 +27,6 @@
|
||||||
</testsuite>
|
</testsuite>
|
||||||
</testsuites>
|
</testsuites>
|
||||||
|
|
||||||
<coverage>
|
|
||||||
<include>
|
|
||||||
<directory suffix=".php">Classes</directory>
|
|
||||||
</include>
|
|
||||||
</coverage>
|
|
||||||
|
|
||||||
<php>
|
<php>
|
||||||
<env name="typo3DatabaseDriver" value="pdo_sqlite"/>
|
<env name="typo3DatabaseDriver" value="pdo_sqlite"/>
|
||||||
</php>
|
</php>
|
||||||
|
|
Loading…
Reference in a new issue