Skip to content

PHP8 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 2, 2021
Merged

PHP8 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ jobs:
strategy:
matrix:
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"

services:
mysql:
Expand Down Expand Up @@ -68,9 +67,8 @@ jobs:
strategy:
matrix:
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"

services:
mysql:
Expand Down
4 changes: 0 additions & 4 deletions Tests/TdbmTestingKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 5 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
66 changes: 27 additions & 39 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit backupGlobals="false"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
bootstrap="vendor/autoload.php"
>
<testsuites>
<testsuite name="Graphql controllers bundle Test Suite">
<directory>./Tests/</directory>
</testsuite>
</testsuites>

<filter>
<whitelist>
<directory>./</directory>
<exclude>
<directory>./Resources</directory>
<directory>./Tests</directory>
<directory>./vendor</directory>
<directory>./var</directory>
</exclude>
</whitelist>
</filter>

<php>
<env name="DATABASE_URL" value="mysql://root:@127.0.0.1:3306/test_tdbmbundle" />
<env name="DATABASE_URL2" value="mysql://root:@127.0.0.1:3306/test_tdbmbundle2" />
<env name="DATABASE_URL_ROOT" value="mysql://root:@127.0.0.1:3306/" />
</php>

<logging>
<log type="coverage-html" target="build/coverage"/>
<log type="coverage-clover" target="build/logs/clover.xml"/>
</logging>
<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">
<coverage>
<include>
<directory>./</directory>
</include>
<exclude>
<directory>./Resources</directory>
<directory>./Tests</directory>
<directory>./vendor</directory>
<directory>./var</directory>
</exclude>
<report>
<clover outputFile="build/logs/clover.xml"/>
<html outputDirectory="build/coverage"/>
</report>
</coverage>
<testsuites>
<testsuite name="Graphql controllers bundle Test Suite">
<directory>./Tests/</directory>
</testsuite>
</testsuites>
<php>
<env name="DATABASE_URL" value="mysql://root:@127.0.0.1:3306/test_tdbmbundle"/>
<env name="DATABASE_URL2" value="mysql://root:@127.0.0.1:3306/test_tdbmbundle2"/>
<env name="DATABASE_URL_ROOT" value="mysql://root:@127.0.0.1:3306/"/>
</php>
<logging/>
</phpunit>