Merge pull request #22 from homersimpsons/fix/phpstan-typing

Fix CI: PHPStan's error, Dependency conflicts, MySQL version
thecodingmachine · Apr 2, 2021 · ccdb2c3 · ccdb2c3
2 parents 4450c0f + 97aeedc
commit ccdb2c3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -74,7 +74,7 @@ jobs:
 
     services:
       mysql:
-        image: "mysql:8"
+        image: "mysql:5.7"
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: true
           MYSQL_ROOT_PASSWORD:

diff --git a/DependencyInjection/TdbmCompilerPass.php b/DependencyInjection/TdbmCompilerPass.php
@@ -14,7 +14,7 @@ class TdbmCompilerPass implements CompilerPassInterface
     /**
      * @inheritDoc
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $generatorListeners = $this->taggedServicesToReferences($container->findTaggedServiceIds(TdbmExtension::TAG_GENERATOR_LISTENER));
         $codeGeneratorListeners = $this->taggedServicesToReferences($container->findTaggedServiceIds(TdbmExtension::TAG_CODE_GENERATOR_LISTENER));

diff --git a/TdbmBundle.php b/TdbmBundle.php
@@ -11,7 +11,7 @@
 
 class TdbmBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 

diff --git a/composer.json b/composer.json
@@ -23,8 +23,8 @@
   "require" : {
     "php" : ">=7.2",
     "thecodingmachine/tdbm" : "~5.2.0",
-    "doctrine/doctrine-bundle": "^1.9 || ^2",
-    "doctrine/orm": "^1 || ^2",
+    "doctrine/doctrine-bundle": "^2",
+    "doctrine/orm": "^2",
     "symfony/http-kernel": "^4.1.9 || ^5"
   },
   "require-dev": {