diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b3dc541..5519c82 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,6 +15,7 @@ jobs: strategy: matrix: php-version: + - 7.2 - 7.3 - 7.4 steps: @@ -134,13 +135,19 @@ jobs: code-quality: runs-on: ubuntu-latest needs: [check-dependencies] + strategy: + matrix: + php-version: + - 7.2 + - 7.3 + - 7.4 steps: - uses: actions/checkout@v2 - name: Install PHP uses: shivammathur/setup-php@v2 with: - php-version: "7.4" + php-version: "${{ matrix.php-version }}" tools: composer:v2 - name: Get Composer Cache Directory @@ -169,6 +176,7 @@ jobs: strategy: matrix: php-version: + - 7.2 - 7.3 - 7.4 steps: @@ -206,6 +214,7 @@ jobs: strategy: matrix: php-version: + - 7.2 - 7.3 - 7.4 steps: diff --git a/Tests/Functional/ImportTest.php b/Tests/Functional/ImportTest.php index bfaa013..8842aec 100644 --- a/Tests/Functional/ImportTest.php +++ b/Tests/Functional/ImportTest.php @@ -25,7 +25,6 @@ namespace WerkraumMedia\ThueCat\Tests\Functional; use Csa\GuzzleHttp\Middleware\Cache\Adapter\MockStorageAdapter; use Csa\GuzzleHttp\Middleware\Cache\MockMiddleware; -use Prophecy\PhpUnit\ProphecyTrait; use Prophecy\Prophecy\ObjectProphecy; use Psr\Http\Message\ServerRequestInterface; use TYPO3\CMS\Backend\Routing\Route; @@ -70,8 +69,6 @@ use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase as TestCase; */ class ImportTest extends TestCase { - use ProphecyTrait; - protected $coreExtensionsToLoad = [ 'core', 'backend', diff --git a/Tests/Unit/Domain/Import/ImportTest.php b/Tests/Unit/Domain/Import/ImportTest.php index 4dac290..ae8c9a8 100644 --- a/Tests/Unit/Domain/Import/ImportTest.php +++ b/Tests/Unit/Domain/Import/ImportTest.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import; -use Prophecy\PhpUnit\ProphecyTrait; use WerkraumMedia\ThueCat\Domain\Import\Import; use PHPUnit\Framework\TestCase; use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration; @@ -35,8 +34,6 @@ use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportLogEntry; */ class ImportTest extends TestCase { - use ProphecyTrait; - /** * @test */ diff --git a/Tests/Unit/Domain/Import/Importer/FetchDataTest.php b/Tests/Unit/Domain/Import/Importer/FetchDataTest.php index b226840..2a967e4 100644 --- a/Tests/Unit/Domain/Import/Importer/FetchDataTest.php +++ b/Tests/Unit/Domain/Import/Importer/FetchDataTest.php @@ -24,7 +24,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\Importer; */ use PHPUnit\Framework\TestCase; -use Prophecy\PhpUnit\ProphecyTrait; use Psr\Http\Client\ClientInterface; use Psr\Http\Message\RequestFactoryInterface; use Psr\Http\Message\RequestInterface; @@ -38,8 +37,6 @@ use WerkraumMedia\ThueCat\Domain\Import\Importer\FetchData\InvalidResponseExcept */ class FetchDataTest extends TestCase { - use ProphecyTrait; - /** * @test */ diff --git a/Tests/Unit/Domain/Import/Model/EntityCollectionTest.php b/Tests/Unit/Domain/Import/Model/EntityCollectionTest.php index 0a6532c..cba214b 100644 --- a/Tests/Unit/Domain/Import/Model/EntityCollectionTest.php +++ b/Tests/Unit/Domain/Import/Model/EntityCollectionTest.php @@ -24,7 +24,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\Model; */ use PHPUnit\Framework\TestCase; -use Prophecy\PhpUnit\ProphecyTrait; use WerkraumMedia\ThueCat\Domain\Import\Model\Entity; use WerkraumMedia\ThueCat\Domain\Import\Model\EntityCollection; @@ -33,8 +32,6 @@ use WerkraumMedia\ThueCat\Domain\Import\Model\EntityCollection; */ class EntityCollectionTest extends TestCase { - use ProphecyTrait; - /** * @test */ diff --git a/Tests/Unit/Domain/Import/RequestFactoryTest.php b/Tests/Unit/Domain/Import/RequestFactoryTest.php index bc5a4f2..b67599b 100644 --- a/Tests/Unit/Domain/Import/RequestFactoryTest.php +++ b/Tests/Unit/Domain/Import/RequestFactoryTest.php @@ -24,7 +24,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import; */ use PHPUnit\Framework\TestCase; -use Prophecy\PhpUnit\ProphecyTrait; use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException; use TYPO3\CMS\Core\Configuration\ExtensionConfiguration; use WerkraumMedia\ThueCat\Domain\Import\RequestFactory; @@ -34,8 +33,6 @@ use WerkraumMedia\ThueCat\Domain\Import\RequestFactory; */ class RequestFactoryTest extends TestCase { - use ProphecyTrait; - /** * @test */ diff --git a/Tests/Unit/Domain/Import/Typo3Converter/GeneralConverterTest.php b/Tests/Unit/Domain/Import/Typo3Converter/GeneralConverterTest.php index df0576d..f64b07b 100644 --- a/Tests/Unit/Domain/Import/Typo3Converter/GeneralConverterTest.php +++ b/Tests/Unit/Domain/Import/Typo3Converter/GeneralConverterTest.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\Typo3Converter; use Prophecy\Argument; -use Prophecy\PhpUnit\ProphecyTrait; use Psr\Log\LoggerInterface; use WerkraumMedia\ThueCat\Domain\Import\Entity\Properties\ForeignReference; use WerkraumMedia\ThueCat\Domain\Import\Entity\Town; @@ -44,8 +43,6 @@ use WerkraumMedia\ThueCat\Domain\Repository\Backend\TownRepository; */ class GeneralConverterTest extends TestCase { - use ProphecyTrait; - /** * @test */ diff --git a/Tests/Unit/Domain/Import/UrlProvider/RegistryTest.php b/Tests/Unit/Domain/Import/UrlProvider/RegistryTest.php index 0d02a8a..a174f81 100644 --- a/Tests/Unit/Domain/Import/UrlProvider/RegistryTest.php +++ b/Tests/Unit/Domain/Import/UrlProvider/RegistryTest.php @@ -24,7 +24,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\UrlProvider; */ use PHPUnit\Framework\TestCase; -use Prophecy\PhpUnit\ProphecyTrait; use WerkraumMedia\ThueCat\Domain\Import\UrlProvider\Registry; use WerkraumMedia\ThueCat\Domain\Import\UrlProvider\UrlProvider; use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration; @@ -34,8 +33,6 @@ use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration; */ class RegistryTest extends TestCase { - use ProphecyTrait; - /** * @test */ diff --git a/Tests/Unit/Domain/Import/UrlProvider/StaticUrlProviderTest.php b/Tests/Unit/Domain/Import/UrlProvider/StaticUrlProviderTest.php index d278088..573a311 100644 --- a/Tests/Unit/Domain/Import/UrlProvider/StaticUrlProviderTest.php +++ b/Tests/Unit/Domain/Import/UrlProvider/StaticUrlProviderTest.php @@ -24,7 +24,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\UrlProvider; */ use PHPUnit\Framework\TestCase; -use Prophecy\PhpUnit\ProphecyTrait; use WerkraumMedia\ThueCat\Domain\Import\UrlProvider\StaticUrlProvider; use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration; @@ -33,8 +32,6 @@ use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration; */ class StaticUrlProviderTest extends TestCase { - use ProphecyTrait; - /** * @test */ diff --git a/Tests/Unit/Domain/Import/UrlProvider/SyncScopeUrlProviderTest.php b/Tests/Unit/Domain/Import/UrlProvider/SyncScopeUrlProviderTest.php index c6b8e82..ce8d85d 100644 --- a/Tests/Unit/Domain/Import/UrlProvider/SyncScopeUrlProviderTest.php +++ b/Tests/Unit/Domain/Import/UrlProvider/SyncScopeUrlProviderTest.php @@ -23,7 +23,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\UrlProvider; * 02110-1301, USA. */ -use Prophecy\PhpUnit\ProphecyTrait; use WerkraumMedia\ThueCat\Domain\Import\Importer\FetchData; use WerkraumMedia\ThueCat\Domain\Import\UrlProvider\SyncScopeUrlProvider; use PHPUnit\Framework\TestCase; @@ -34,8 +33,6 @@ use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration; */ class SyncScopeUrlProviderTest extends TestCase { - use ProphecyTrait; - /** * @test */ diff --git a/Tests/Unit/Domain/Model/Backend/ImportLogTest.php b/Tests/Unit/Domain/Model/Backend/ImportLogTest.php index db96950..b55af40 100644 --- a/Tests/Unit/Domain/Model/Backend/ImportLogTest.php +++ b/Tests/Unit/Domain/Model/Backend/ImportLogTest.php @@ -23,7 +23,6 @@ namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Model\Backend; * 02110-1301, USA. */ -use Prophecy\PhpUnit\ProphecyTrait; use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration; use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportLog; use PHPUnit\Framework\TestCase; @@ -33,8 +32,6 @@ use PHPUnit\Framework\TestCase; */ class ImportLogTest extends TestCase { - use ProphecyTrait; - /** * @test */ diff --git a/composer.json b/composer.json index 3b95c34..c6d18e3 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ } }, "require": { - "php": "^7.3", + "php": "~7.2.0 || ~7.3.0 || ~7.4.0", "ext-json": "*", "ext-mbstring": "*", "psr/http-client": "^1.0", @@ -49,11 +49,10 @@ "friendsoftypo3/phpstan-typo3": "^0.6.0", "jangregor/phpstan-prophecy": "^0.8.1", "maglnet/composer-require-checker": "^2.1", - "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^0.12.71", "phpstan/phpstan-phpunit": "^0.12.21", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^8.5", "symplify/easy-coding-standard": "^9.0", "typo3/cms-fluid-styled-content": "^10.4", "typo3/testing-framework": "^6.6" diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 11810aa..fd7829f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,7 +1,7 @@ - - - Classes - - -