Merge tag v2.3.0 into develop

roadiz · May 15, 2024 · 3b775b8 · 3b775b8
1 parent 723bd9f
commit 3b775b8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -27,8 +27,8 @@
         "doctrine/orm": "~2.19.0",
         "jms/serializer": "^3.9.0",
         "league/flysystem": "^3.0",
-        "roadiz/models": "2.3.x-dev",
-        "roadiz/rozier": "2.3.x-dev",
+        "roadiz/models": "2.3.*",
+        "roadiz/rozier": "2.3.*",
         "sensio/framework-extra-bundle": "^6.1",
         "symfony/asset": "6.4.*",
         "symfony/cache": "6.4.*",
@@ -58,11 +58,11 @@
         "symfony/browser-kit": "6.4.*",
         "symfony/phpunit-bridge": "^7.0",
         "symfony/stopwatch": "6.4.*",
-        "roadiz/core-bundle": "2.3.x-dev",
-        "roadiz/compat-bundle": "2.3.x-dev",
-        "roadiz/rozier-bundle": "2.3.x-dev",
-        "roadiz/documents": "2.3.x-dev",
-        "roadiz/entity-generator": "2.3.x-dev"
+        "roadiz/core-bundle": "2.3.*",
+        "roadiz/compat-bundle": "2.3.*",
+        "roadiz/rozier-bundle": "2.3.*",
+        "roadiz/documents": "2.3.*",
+        "roadiz/entity-generator": "2.3.*"
     },
     "config": {
         "optimize-autoloader": true,
@@ -89,8 +89,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.2.x-dev",
-            "dev-develop": "2.3.x-dev"
+            "dev-main": "2.3.x-dev",
+            "dev-develop": "2.4.x-dev"
         }
     }
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -7,6 +7,8 @@ parameters:
         - */bower_components/*
         - */static/*
     ignoreErrors:
+        - identifier: missingType.iterableValue
+        - identifier: missingType.generics
         - '#Call to an undefined method RZ\\Roadiz\\CoreBundle\\Repository#'
         - '#Call to an undefined method RZ\\Roadiz\\UserBundle\\Repository#'
         - '#Call to an undefined method Doctrine\\Persistence\\ObjectRepository#'
@@ -30,7 +32,5 @@ parameters:
         - '#does not accept Doctrine\\Common\\Collections\\ReadableCollection<int, [^\>]+>#'
 
     reportUnmatchedIgnoredErrors: false
-    checkGenericClassInNonGenericObjectType: false
-    checkMissingIterableValueType: false
 includes:
     - vendor/phpstan/phpstan-doctrine/extension.neon