Merge pull request #24 from homersimpsons/feature/php8-support

PHP8
thecodingmachine · Apr 2, 2021 · c9c9a92 · c9c9a92
2 parents 686ab52 + 693e33c
commit c9c9a92
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 51 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>