Skip to content

Commit a24e9db

Browse files
author
roadiz-ci
committed
Merge branch release/v2.5.0
1 parent 74c3d93 commit a24e9db

File tree

715 files changed

+12484
-15089
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

715 files changed

+12484
-15089
lines changed

.github/workflows/run-test.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
php-version: ['8.1', '8.2', '8.3']
22+
php-version: ['8.2', '8.3']
2323
steps:
2424
- uses: shivammathur/setup-php@v2
2525
with:
@@ -34,9 +34,7 @@ jobs:
3434
restore-keys: |
3535
${{ runner.os }}-php-${{ matrix.php-version }}-
3636
- name: Install Dependencies
37-
run: composer install --no-scripts --no-ansi --no-interaction --no-progress
38-
- name: Run PHP Code Sniffer
39-
run: vendor/bin/phpcs -p ./src
37+
run: composer install --no-ansi --no-interaction --no-progress
4038
- name: Run PHPStan
4139
run: vendor/bin/phpstan analyse --no-progress -c phpstan.neon
4240
- name: Run PHP Unit

composer.json

+35-31
Original file line numberDiff line numberDiff line change
@@ -18,54 +18,55 @@
1818
"type": "symfony-bundle",
1919
"prefer-stable": true,
2020
"require": {
21-
"php": ">=8.1",
21+
"php": ">=8.2",
2222
"ext-ctype": "*",
2323
"ext-iconv": "*",
2424
"ext-zip": "*",
2525
"ext-json": "*",
26-
"api-platform/core": "~3.2.14",
27-
"doctrine/annotations": "^1.0",
26+
"ext-mbstring": "*",
27+
"api-platform/core": "~3.3.11",
28+
"doctrine/annotations": "^2.0",
2829
"doctrine/doctrine-bundle": "^2.8.1",
2930
"doctrine/doctrine-migrations-bundle": "^3.1",
30-
"doctrine/orm": "~2.19.0",
31-
"gedmo/doctrine-extensions": "^3.10.0",
31+
"doctrine/orm": "~2.20.0",
32+
"gedmo/doctrine-extensions": "^3.19.0",
3233
"inlinestyle/inlinestyle": "~1.2.7",
3334
"james-heinrich/getid3": "^1.9",
34-
"jms/serializer": "^3.9.0",
35-
"jms/serializer-bundle": "^4.2.0",
35+
"jms/serializer": "^3.32.3",
36+
"jms/serializer-bundle": "^5.5.1",
3637
"league/flysystem": "^3.0",
3738
"league/flysystem-bundle": "^3.0",
38-
"lexik/jwt-authentication-bundle": "^2.19",
39+
"lexik/jwt-authentication-bundle": "^3.1.0",
3940
"phpdocumentor/reflection-docblock": "^5.2",
4041
"phpoffice/phpspreadsheet": "^1.15",
4142
"ramsey/uuid": "^4.7",
42-
"rezozero/intervention-request-bundle": "~3.0.0",
43-
"rezozero/liform-bundle": "^0.19",
43+
"rezozero/intervention-request-bundle": "~4.0.0",
44+
"rezozero/liform-bundle": "^0.20.1",
4445
"rezozero/tree-walker": "^1.5.0",
45-
"roadiz/doc-generator": "2.3.*",
46-
"roadiz/documents": "2.3.*",
47-
"roadiz/dts-generator": "2.3.*",
48-
"roadiz/entity-generator": "2.3.*",
49-
"roadiz/jwt": "2.3.*",
50-
"roadiz/markdown": "2.3.*",
51-
"roadiz/models": "2.3.*",
52-
"roadiz/nodetype-contracts": "~1.1.2",
53-
"roadiz/random": "2.3.*",
54-
"rollerworks/password-common-list": "^0.2.0",
55-
"rollerworks/password-strength-bundle": "^2.2",
46+
"roadiz/doc-generator": "2.5.*",
47+
"roadiz/documents": "2.5.*",
48+
"roadiz/dts-generator": "2.5.*",
49+
"roadiz/entity-generator": "2.5.*",
50+
"roadiz/jwt": "2.5.*",
51+
"roadiz/markdown": "2.5.*",
52+
"roadiz/models": "2.5.*",
53+
"roadiz/nodetype-contracts": "^2.0.0",
54+
"roadiz/random": "2.5.*",
55+
"rollerworks/password-common-list": "^0.3.0",
56+
"rollerworks/password-strength-bundle": "^3.0",
5657
"scienta/doctrine-json-functions": "^4.2",
57-
"sensio/framework-extra-bundle": "^6.1",
58-
"solarium/solarium": "^6.0.4",
59-
"symfony-cmf/routing-bundle": "^3.0.2",
58+
"solarium/solarium": "^6.3.6",
59+
"symfony-cmf/routing-bundle": "^3.1.0",
6060
"symfony/asset": "6.4.*",
6161
"symfony/cache": "6.4.*",
6262
"symfony/console": "6.4.*",
6363
"symfony/dotenv": "6.4.*",
6464
"symfony/expression-language": "6.4.*",
65-
"symfony/flex": "^2.2.3",
65+
"symfony/flex": "^2.4.7",
6666
"symfony/form": "6.4.*",
6767
"symfony/framework-bundle": "6.4.*",
6868
"symfony/http-client": "6.4.*",
69+
"symfony/http-client-contracts": "^3.5",
6970
"symfony/intl": "6.4.*",
7071
"symfony/lock": "6.4.*",
7172
"symfony/mailer": "6.4.*",
@@ -88,20 +89,20 @@
8889
"symfony/web-link": "6.4.*",
8990
"symfony/workflow": "6.4.*",
9091
"symfony/yaml": "6.4.*",
91-
"twig/extra-bundle": "^3.0",
92+
"twig/extra-bundle": "^3.16",
9293
"twig/intl-extra": "*",
9394
"twig/string-extra": "*",
94-
"twig/twig": "^3.1"
95+
"twig/twig": "^3.16"
9596
},
9697
"replace": {
9798
"roadiz/roadiz": "*"
9899
},
99100
"require-dev": {
100101
"php-coveralls/php-coveralls": "^2.4",
101102
"phpstan/phpstan": "^1.5.3",
103+
"phpstan/phpdoc-parser": "<2",
102104
"phpstan/phpstan-doctrine": "^1.3",
103105
"phpunit/phpunit": "^9.5",
104-
"squizlabs/php_codesniffer": "^3.5",
105106
"symfony/browser-kit": "6.4.*",
106107
"symfony/phpunit-bridge": "^7.0",
107108
"symfony/stopwatch": "6.4.*"
@@ -121,7 +122,10 @@
121122
"autoload": {
122123
"psr-4": {
123124
"RZ\\Roadiz\\CoreBundle\\": "src/"
124-
}
125+
},
126+
"files": [
127+
"deprecated.php"
128+
]
125129
},
126130
"autoload-dev": {
127131
"psr-4": {
@@ -136,8 +140,8 @@
136140
},
137141
"extra": {
138142
"branch-alias": {
139-
"dev-main": "2.3.x-dev",
140-
"dev-develop": "2.4.x-dev"
143+
"dev-main": "2.5.x-dev",
144+
"dev-develop": "2.6.x-dev"
141145
}
142146
}
143147
}

config/fixtures.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
importFiles:
22
roles:
33
- fixtures/roles.json
4-
groups: []
54
settings:
65
- fixtures/settings.json
7-
nodetypes: []

0 commit comments

Comments
 (0)