Merge tag v2.2.0 into develop

roadiz · Dec 12, 2023 · 5106c19 · 5106c19
1 parent bfc5c57
commit 5106c19
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 30 deletions.
diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
@@ -19,7 +19,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.0', '8.1']
+                php-version: ['8.1', '8.2', '8.3']
         steps:
             - uses: shivammathur/setup-php@v2
               with:

diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -16,7 +16,6 @@
         }
     ],
     "type": "symfony-bundle",
-    "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
         "php": ">=8.1",
@@ -44,15 +43,15 @@
         "rezozero/intervention-request-bundle": "~3.0.0",
         "rezozero/liform-bundle": "^0.19",
         "rezozero/tree-walker": "^1.3.0",
-        "roadiz/doc-generator": "2.2.x-dev",
-        "roadiz/documents": "2.2.x-dev",
-        "roadiz/dts-generator": "2.2.x-dev",
-        "roadiz/entity-generator": "2.2.x-dev",
-        "roadiz/jwt": "2.2.x-dev",
-        "roadiz/markdown": "2.2.x-dev",
-        "roadiz/models": "2.2.x-dev",
+        "roadiz/doc-generator": "2.2.*",
+        "roadiz/documents": "2.2.*",
+        "roadiz/dts-generator": "2.2.*",
+        "roadiz/entity-generator": "2.2.*",
+        "roadiz/jwt": "2.2.*",
+        "roadiz/markdown": "2.2.*",
+        "roadiz/models": "2.2.*",
         "roadiz/nodetype-contracts": "~1.1.2",
-        "roadiz/random": "2.2.x-dev",
+        "roadiz/random": "2.2.*",
         "rollerworks/password-common-list": "^0.2.0",
         "rollerworks/password-strength-bundle": "^2.2",
         "scienta/doctrine-json-functions": "^4.2",
@@ -133,8 +132,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.1.x-dev",
-            "dev-develop": "2.2.x-dev"
+            "dev-main": "2.2.x-dev",
+            "dev-develop": "2.3.x-dev"
         }
     }
 }
diff --git a/config/services.yaml b/config/services.yaml
@@ -1,7 +1,7 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.2.x-dev'
-    roadiz_core.cms_version_prefix: 'develop'
+    roadiz_core.cms_version: '2.2.0'
+    roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"
     env(APP_USE_ACCEPT_LANGUAGE_HEADER): 'false'

diff --git a/src/Api/TreeWalker/Definition/NonReachableNodeSourceBlockDefinition.php b/src/Api/TreeWalker/Definition/NonReachableNodeSourceBlockDefinition.php
@@ -47,6 +47,7 @@ public function __invoke(NodesSources $source): array
                 if ($iterator instanceof ArrayIterator) {
                     return $iterator->getArrayCopy();
                 }
+                // @phpstan-ignore-next-line
                 return iterator_to_array($iterator);
             }
             return $children;

diff --git a/src/Api/TreeWalker/Definition/ReachableNodeSourceDefinition.php b/src/Api/TreeWalker/Definition/ReachableNodeSourceDefinition.php
@@ -47,6 +47,7 @@ public function __invoke(NodesSources $source): array
                 if ($iterator instanceof ArrayIterator) {
                     return $iterator->getArrayCopy();
                 }
+                // @phpstan-ignore-next-line
                 return iterator_to_array($iterator);
             }
             return $children;

diff --git a/src/Doctrine/ORM/SimpleQueryBuilder.php b/src/Doctrine/ORM/SimpleQueryBuilder.php
@@ -133,7 +133,7 @@ public function buildExpressionWithoutBinding($value, string $prefix, string $ke
         if (null === $value) {
             return $this->queryBuilder->expr()->isNull($prefix . $key);
         }
-
+        // @phpstan-ignore-next-line
         throw new \InvalidArgumentException('Value is not supported for expression.');
     }
 
@@ -187,7 +187,7 @@ public function bindValue(string $key, $value): QueryBuilder
         if (null === $value) {
             return $this->queryBuilder;
         }
-
+        // @phpstan-ignore-next-line
         throw new \InvalidArgumentException('Value is not supported for binding.');
     }