Skip to content

Commit 693e33c

Browse files
homersimpsonshomersimpsons
committed
PHP8
1 parent 686ab52 commit 693e33c

File tree

4 files changed

+34
-51
lines changed

4 files changed

+34
-51
lines changed

‎.github/workflows/continuous-integration.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ jobs:
1414
strategy:
1515
matrix:
1616
php-version:
17-
- "7.2"
18-
- "7.3"
1917
- "7.4"
18+
- "8.0"
2019

2120
services:
2221
mysql:
@@ -68,9 +67,8 @@ jobs:
6867
strategy:
6968
matrix:
7069
php-version:
71-
- "7.2"
72-
- "7.3"
7370
- "7.4"
71+
- "8.0"
7472

7573
services:
7674
mysql:

‎Tests/TdbmTestingKernel.php

-4
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@ public function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
107107
$loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');
108108
}
109109

110-
protected function configureRoutes(RoutingConfigurator $routes)
111-
{
112-
}
113-
114110
public function getCacheDir()
115111
{
116112
return __DIR__.'/../cache/'.($this->multiDb?"multidb":"singledb").spl_object_hash($this);

‎composer.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
}
2222
],
2323
"require" : {
24-
"php" : ">=7.2",
25-
"thecodingmachine/tdbm" : "~5.2.0",
24+
"php": "^7.4 || ^8.0",
25+
"thecodingmachine/tdbm": "~5.3.0",
2626
"doctrine/doctrine-bundle": "^2",
2727
"doctrine/orm": "^2",
2828
"symfony/http-kernel": "^4.1.9 || ^5"
@@ -31,9 +31,10 @@
3131
"roave/security-advisories": "dev-master",
3232
"symfony/security-bundle": "^4.1.9 || ^5",
3333
"symfony/yaml": "^4.1.9 || ^5",
34-
"phpunit/phpunit": "^8.5.8",
34+
"phpunit/phpunit": "^9.5",
3535
"phpstan/phpstan": "^0.12",
36-
"thecodingmachine/tdbm-fluid-schema-builder": "^1.0.0"
36+
"thecodingmachine/tdbm-fluid-schema-builder": "^1.0.0",
37+
"symfony/framework-bundle": "^5.2"
3738
},
3839
"scripts": {
3940
"phpstan": "phpstan analyse TdbmBundle.php DependencyInjection/ Utils/ -c phpstan.neon --level=8 --no-progress"

‎phpunit.xml.dist

+27-39
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit backupGlobals="false"
4-
backupStaticAttributes="false"
5-
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
11-
bootstrap="vendor/autoload.php"
12-
>
13-
<testsuites>
14-
<testsuite name="Graphql controllers bundle Test Suite">
15-
<directory>./Tests/</directory>
16-
</testsuite>
17-
</testsuites>
18-
19-
<filter>
20-
<whitelist>
21-
<directory>./</directory>
22-
<exclude>
23-
<directory>./Resources</directory>
24-
<directory>./Tests</directory>
25-
<directory>./vendor</directory>
26-
<directory>./var</directory>
27-
</exclude>
28-
</whitelist>
29-
</filter>
30-
31-
<php>
32-
<env name="DATABASE_URL" value="mysql://root:@127.0.0.1:3306/test_tdbmbundle" />
33-
<env name="DATABASE_URL2" value="mysql://root:@127.0.0.1:3306/test_tdbmbundle2" />
34-
<env name="DATABASE_URL_ROOT" value="mysql://root:@127.0.0.1:3306/" />
35-
</php>
36-
37-
<logging>
38-
<log type="coverage-html" target="build/coverage"/>
39-
<log type="coverage-clover" target="build/logs/clover.xml"/>
40-
</logging>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
3+
<coverage>
4+
<include>
5+
<directory>./</directory>
6+
</include>
7+
<exclude>
8+
<directory>./Resources</directory>
9+
<directory>./Tests</directory>
10+
<directory>./vendor</directory>
11+
<directory>./var</directory>
12+
</exclude>
13+
<report>
14+
<clover outputFile="build/logs/clover.xml"/>
15+
<html outputDirectory="build/coverage"/>
16+
</report>
17+
</coverage>
18+
<testsuites>
19+
<testsuite name="Graphql controllers bundle Test Suite">
20+
<directory>./Tests/</directory>
21+
</testsuite>
22+
</testsuites>
23+
<php>
24+
<env name="DATABASE_URL" value="mysql://root:@127.0.0.1:3306/test_tdbmbundle"/>
25+
<env name="DATABASE_URL2" value="mysql://root:@127.0.0.1:3306/test_tdbmbundle2"/>
26+
<env name="DATABASE_URL_ROOT" value="mysql://root:@127.0.0.1:3306/"/>
27+
</php>
28+
<logging/>
4129
</phpunit>

0 commit comments

Comments
 (0)