Skip to content

Commit

Permalink
Merge tag v2.3.0 into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
roadiz-ci committed May 15, 2024
1 parent 040512b commit 85b81b6
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# default env file
20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@
"rezozero/intervention-request-bundle": "~3.0.0",
"rezozero/liform-bundle": "^0.19",
"rezozero/tree-walker": "^1.3.0",
"roadiz/doc-generator": "2.3.x-dev",
"roadiz/documents": "2.3.x-dev",
"roadiz/dts-generator": "2.3.x-dev",
"roadiz/entity-generator": "2.3.x-dev",
"roadiz/jwt": "2.3.x-dev",
"roadiz/markdown": "2.3.x-dev",
"roadiz/models": "2.3.x-dev",
"roadiz/doc-generator": "2.3.*",
"roadiz/documents": "2.3.*",
"roadiz/dts-generator": "2.3.*",
"roadiz/entity-generator": "2.3.*",
"roadiz/jwt": "2.3.*",
"roadiz/markdown": "2.3.*",
"roadiz/models": "2.3.*",
"roadiz/nodetype-contracts": "~1.1.2",
"roadiz/random": "2.3.x-dev",
"roadiz/random": "2.3.*",
"rollerworks/password-common-list": "^0.2.0",
"rollerworks/password-strength-bundle": "^2.2",
"scienta/doctrine-json-functions": "^4.2",
Expand Down Expand Up @@ -131,8 +131,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"
}
}
}
4 changes: 2 additions & 2 deletions config/services.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
parameters:
roadiz_core.cms_version: '2.3.x'
roadiz_core.cms_version_prefix: 'develop'
roadiz_core.cms_version: '2.3.0'
roadiz_core.cms_version_prefix: 'main'
env(APP_NAMESPACE): "roadiz"
env(APP_VERSION): "0.1.0"
env(APP_USE_ACCEPT_LANGUAGE_HEADER): 'false'
Expand Down
4 changes: 2 additions & 2 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ parameters:
repositoryClass: RZ\Roadiz\CoreBundle\Repository\EntityRepository
objectManagerLoader: ./tests/object-manager.php
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#'
Expand All @@ -33,8 +35,6 @@ parameters:
- '#does not accept Doctrine\\Common\\Collections\\ReadableCollection<int, [^\>]+>#'

reportUnmatchedIgnoredErrors: false
checkGenericClassInNonGenericObjectType: false
checkMissingIterableValueType: false
treatPhpDocTypesAsCertain: false
includes:
- vendor/phpstan/phpstan-doctrine/extension.neon
Expand Down

0 comments on commit 85b81b6

Please sign in to comment.