diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 1db5c8d..5e7745a 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -19,39 +19,27 @@ jobs: - php-version: '7.2' dependency-versions: 'lowest' tools: 'composer:v1' - envs: - SYMFONY_PHPUNIT_REQUIRE: phpspec/prophecy:^1.14 - php-version: '7.4' dependency-versions: 'highest' tools: 'composer:v2' - envs: - SYMFONY_PHPUNIT_REQUIRE: phpspec/prophecy:^1.14 - php-version: '8.0' dependency-versions: 'highest' tools: 'composer:v2' - envs: - SYMFONY_PHPUNIT_REQUIRE: phpspec/prophecy:^1.14 phpspec/prophecy-phpunit:^2.0 - php-version: '8.1' dependency-versions: 'highest' tools: 'composer:v2' - envs: - SYMFONY_PHPUNIT_REQUIRE: phpspec/prophecy:^1.14 phpspec/prophecy-phpunit:^2.0 - php-version: '8.2' dependency-versions: 'highest' tools: 'composer:v2' - envs: - SYMFONY_PHPUNIT_REQUIRE: phpspec/prophecy:^1.14 phpspec/prophecy-phpunit:^2.0 - php-version: '8.3' dependency-versions: 'highest' minimum-stability: 'dev' tools: 'composer:v2' - envs: - SYMFONY_PHPUNIT_REQUIRE: phpspec/prophecy:^1.14 phpspec/prophecy-phpunit:^2.0 steps: - name: Checkout project @@ -72,13 +60,8 @@ jobs: with: dependency-versions: ${{matrix.dependency-versions}} - - name: Install PHPUnit - run: vendor/bin/simple-phpunit install - env: - SYMFONY_PHPUNIT_REQUIRE: ${{ matrix.envs.SYMFONY_PHPUNIT_REQUIRE }} - - name: Execute test cases - run: vendor/bin/simple-phpunit + run: vendor/bin/phpunit lint: name: 'PHP Lint' diff --git a/Tests/Build/BuildRegistryTest.php b/Tests/Build/BuildRegistryTest.php index 58e3c25..938a5c2 100644 --- a/Tests/Build/BuildRegistryTest.php +++ b/Tests/Build/BuildRegistryTest.php @@ -25,7 +25,7 @@ class BuildRegistryTest extends BaseTestCase */ private $buildRegistry; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/Tests/Build/BuilderContextTest.php b/Tests/Build/BuilderContextTest.php index 35cb1af..bd65bd3 100644 --- a/Tests/Build/BuilderContextTest.php +++ b/Tests/Build/BuilderContextTest.php @@ -22,7 +22,7 @@ class BuilderContextTest extends BaseTestCase protected $input; protected $output; - public function setUp() + public function setUp(): void { parent::setUp(); $this->input = $this->prophesize('Symfony\Component\Console\Input\InputInterface'); diff --git a/Tests/Builder/VirtualBuilderTest.php b/Tests/Builder/VirtualBuilderTest.php index 25eac64..bbab732 100644 --- a/Tests/Builder/VirtualBuilderTest.php +++ b/Tests/Builder/VirtualBuilderTest.php @@ -9,15 +9,16 @@ * with this source code in the file LICENSE. */ -namespace Massive\Bundle\BuildBundle\Builder; +namespace Massive\Bundle\BuildBundle\Tests\Builder; +use Massive\Bundle\BuildBundle\Builder\VirtualBuilder; use Massive\Bundle\BuildBundle\Tests\BaseTestCase; class VirtualBuilderTest extends BaseTestCase { protected $builder; - public function setUp() + public function setUp(): void { $this->builder = new VirtualBuilder('builder', ['one', 'two', 'three']); } diff --git a/Tests/Command/BuildCommandTest.php b/Tests/Command/BuildCommandTest.php index 2823f69..450dd3b 100644 --- a/Tests/Command/BuildCommandTest.php +++ b/Tests/Command/BuildCommandTest.php @@ -23,7 +23,7 @@ class BuildCommandTest extends BaseTestCase { use ProphecyTrait; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/composer.json b/composer.json index 0ba301c..815c526 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,9 @@ "symfony/framework-bundle": "^4.3 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { - "symfony/phpunit-bridge": "^5.4.33|^6.3.10|^7.0.1", - "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0" + "phpunit/phpunit": "^8.5", + "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0", + "phpspec/prophecy": "^1.14" }, "autoload": { "psr-4": {"Massive\\Bundle\\BuildBundle\\": "."}, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 3c0c9f3..3133ffb 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,11 +14,4 @@ - - - - - - -