diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d530556..968eda3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,7 @@ jobs: exclude: - { php: '8.0', symfony: '3.*' } - { php: '8.1', symfony: '3.*' } + - { php: '7.1', symfony: '5.*' } - { php: '7.1', symfony: '6.*' } - { php: '7.2', symfony: '6.*' } - { php: '7.3', symfony: '6.*' } diff --git a/composer.json b/composer.json index 50c8d65..5de0965 100644 --- a/composer.json +++ b/composer.json @@ -30,17 +30,14 @@ "doctrine/annotations": "^v1.14" }, "require-dev": { - "phpunit/phpunit": "^6.5 || ^9.0", - "mockery/mockery": "^1.2.4", + "phpunit/phpunit": "^7.5 || ^9.5", + "mockery/mockery": "^1.3.6", "symfony/yaml": "^3.4.34|^4.3|^5.4|^6.0", "doctrine/doctrine-bundle": "^1.12.0|^2.1", - "doctrine/orm": "~2.5.14|^2.6.3" + "doctrine/orm": "~2.5.14 || ^2.6.3" }, "config": { - "bin-dir": "bin", - "allow-plugins": { - "ocramius/package-versions": false - } + "bin-dir": "bin" }, "scripts": { "phpunit": "phpunit", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 38b68e6..ec7f0ef 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,16 +1,10 @@ - - + diff --git a/tests/Functional/FunctionalTestCase.php b/tests/Functional/FunctionalTestCase.php index 69f5aa1..199f425 100644 --- a/tests/Functional/FunctionalTestCase.php +++ b/tests/Functional/FunctionalTestCase.php @@ -40,10 +40,7 @@ protected function tearDown(): void { $container = $this->kernel->getContainer(); $this->kernel->shutdown(); - if ( - $container instanceof ResettableContainerInterface - || $container instanceof ResetInterface - ) { + if ($container instanceof ResettableContainerInterface || $container instanceof ResetInterface) { $container->reset(); }