diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml index 3b17d56e..189e3a55 100644 --- 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 deleted file mode 100644 index 316f0e9e..00000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -language: php -php: - - '8.0' - - '8.1' - - 'nightly' -jobs: - allow_failures: - - php: 'nightly' -install: - - composer install --dev --no-scripts --no-suggest - -script: - - vendor/bin/phpcs -p ./src - - vendor/bin/phpstan analyse -c phpstan.neon diff --git a/composer.json b/composer.json index fab80ec6..e9dcb335 100644 --- 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 index 0dced9fd..320fc593 100644 --- 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 index 58e6f7f0..968e4b0d 100644 --- 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 index 74cbca9e..22fbc6ac 100644 --- 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 index eed46053..15e3204b 100644 --- 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.'); }