diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 2e777c1..1eaa9be 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -14,9 +14,8 @@ jobs: strategy: matrix: php-version: - - "7.2" - - "7.3" - "7.4" + - "8.0" services: mysql: @@ -68,9 +67,8 @@ jobs: strategy: matrix: php-version: - - "7.2" - - "7.3" - "7.4" + - "8.0" services: mysql: diff --git a/Tests/TdbmTestingKernel.php b/Tests/TdbmTestingKernel.php index 2464238..309efbe 100644 --- a/Tests/TdbmTestingKernel.php +++ b/Tests/TdbmTestingKernel.php @@ -107,10 +107,6 @@ public function configureContainer(ContainerBuilder $c, LoaderInterface $loader) $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob'); } - protected function configureRoutes(RoutingConfigurator $routes) - { - } - public function getCacheDir() { return __DIR__.'/../cache/'.($this->multiDb?"multidb":"singledb").spl_object_hash($this); diff --git a/composer.json b/composer.json index b25dcb3..351f9ee 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,8 @@ } ], "require" : { - "php" : ">=7.2", - "thecodingmachine/tdbm" : "~5.2.0", + "php": "^7.4 || ^8.0", + "thecodingmachine/tdbm": "~5.3.0", "doctrine/doctrine-bundle": "^2", "doctrine/orm": "^2", "symfony/http-kernel": "^4.1.9 || ^5" @@ -31,9 +31,10 @@ "roave/security-advisories": "dev-master", "symfony/security-bundle": "^4.1.9 || ^5", "symfony/yaml": "^4.1.9 || ^5", - "phpunit/phpunit": "^8.5.8", + "phpunit/phpunit": "^9.5", "phpstan/phpstan": "^0.12", - "thecodingmachine/tdbm-fluid-schema-builder": "^1.0.0" + "thecodingmachine/tdbm-fluid-schema-builder": "^1.0.0", + "symfony/framework-bundle": "^5.2" }, "scripts": { "phpstan": "phpstan analyse TdbmBundle.php DependencyInjection/ Utils/ -c phpstan.neon --level=8 --no-progress" diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 5f256e0..4d3c9cd 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,41 +1,29 @@ - - - - - ./Tests/ - - - - - - ./ - - ./Resources - ./Tests - ./vendor - ./var - - - - - - - - - - - - - - + + + + ./ + + + ./Resources + ./Tests + ./vendor + ./var + + + + + + + + + ./Tests/ + + + + + + + +