Merge tag v2.3.0 into develop

roadiz · May 15, 2024 · 8bbc221 · 8bbc221
1 parent c9ca2f3
commit 8bbc221
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -17,25 +17,26 @@
         }
     ],
     "type": "symfony-bundle",
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
         "php": ">=8.1",
         "api-platform/core": "~3.2.14",
+        "roadiz/core-bundle": "2.3.*",
         "symfony/framework-bundle": "6.4.*",
         "symfony/rate-limiter": "6.4.*",
         "symfony/lock": "6.4.*",
         "doctrine/orm": "~2.19.0"
     },
     "require-dev": {
-        "roadiz/core-bundle": "2.3.x-dev",
         "php-coveralls/php-coveralls": "^2.4",
         "phpstan/phpstan": "^1.5.3",
         "squizlabs/php_codesniffer": "^3.5",
         "phpstan/phpstan-doctrine": "^1.3",
-        "roadiz/entity-generator": "2.3.x-dev",
-        "roadiz/doc-generator": "2.3.x-dev",
-        "roadiz/random": "2.3.x-dev",
-        "roadiz/jwt": "2.3.x-dev"
+        "roadiz/entity-generator": "2.3.*",
+        "roadiz/doc-generator": "2.3.*",
+        "roadiz/random": "2.3.*",
+        "roadiz/jwt": "2.3.*"
     },
     "config": {
         "optimize-autoloader": true,
@@ -57,8 +58,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,8 +32,6 @@ parameters:
         - '#does not accept Doctrine\\Common\\Collections\\ReadableCollection<int, [^\>]+>#'
 
     reportUnmatchedIgnoredErrors: false
-    checkGenericClassInNonGenericObjectType: false
-    checkMissingIterableValueType: false
     doctrine:
         repositoryClass: RZ\Roadiz\CoreBundle\Repository\EntityRepository
 includes: