Skip to content

Commit 20e9a19

Browse files
author
roadiz-ci
committed
Merge branch release/v2.7.0
1 parent 6f6550a commit 20e9a19

278 files changed

Lines changed: 6064 additions & 3139 deletions

File tree

Some content is hidden

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

composer.json

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,19 @@
1919
"prefer-stable": true,
2020
"require": {
2121
"php": ">=8.3",
22-
"roadiz/core-bundle": "2.6.*",
23-
"roadiz/openid": "2.6.*",
24-
"symfony/framework-bundle": "7.3.*"
22+
"roadiz/core-bundle": "2.7.*",
23+
"roadiz/openid": "2.7.*",
24+
"roadiz/doc-generator": "2.7.*",
25+
"roadiz/dts-generator": "2.7.*",
26+
"symfony/framework-bundle": "7.4.*",
27+
"deeplcom/deepl-php": "^1.12"
2528
},
2629
"require-dev": {
2730
"php-coveralls/php-coveralls": "^2.4",
28-
"phpstan/phpstan": "^1.5.3",
31+
"phpstan/phpstan": "^2.1.36",
2932
"phpstan/phpdoc-parser": "<2",
30-
"phpstan/phpstan-doctrine": "^1.3",
31-
"phpstan/phpstan-symfony": "^1.1.8"
33+
"phpstan/phpstan-doctrine": "^2.0.13",
34+
"phpstan/phpstan-symfony": "^2.0.12"
3235
},
3336
"config": {
3437
"optimize-autoloader": true,
@@ -49,8 +52,8 @@
4952
},
5053
"extra": {
5154
"branch-alias": {
52-
"dev-main": "2.6.x-dev",
53-
"dev-develop": "2.7.x-dev"
55+
"dev-main": "2.7.x-dev",
56+
"dev-develop": "2.8.x-dev"
5457
}
5558
},
5659
"scripts": {

config/packages/roadiz_rozier.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ roadiz_rozier:
111111
- 'ROLE_ACCESS_NODETYPES'
112112
- 'ROLE_ACCESS_ATTRIBUTES'
113113
- 'ROLE_ACCESS_TRANSLATIONS'
114-
- 'ROLE_ACCESS_FONTS'
115114
- 'ROLE_ACCESS_REDIRECTIONS'
116115
- 'ROLE_ACCESS_WEBHOOKS'
117116
- 'ROLE_ACCESS_REALMS'

config/routing.yaml

Lines changed: 13 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,22 @@
1-
# Home page
2-
adminHomePage:
3-
path: /rz-admin
4-
controller: RZ\Roadiz\RozierBundle\Controller\DashboardController::indexAction
5-
6-
loginRoutes:
7-
prefix: /rz-admin
8-
resource: "routing/login.yml"
9-
10-
ajaxSessionMessages:
11-
path: /rz-admin/session/messages
12-
methods: [GET]
13-
controller: RZ\Roadiz\RozierBundle\Controller\Ajax\AjaxSessionMessages::getMessagesAction
14-
15-
#Ping
16-
ping:
17-
path: /rz-admin/ping
18-
methods: [GET]
19-
controller: RZ\Roadiz\RozierBundle\Controller\PingController::pingAction
20-
21-
# CACHES
22-
deleteDoctrineCache:
23-
path: /rz-admin/cache/delete-doctrine-cache
24-
controller: RZ\Roadiz\RozierBundle\Controller\CacheController::deleteDoctrineCache
25-
deleteAssetsCache:
26-
path: /rz-admin/cache/delete-assets-cache
27-
controller: RZ\Roadiz\RozierBundle\Controller\CacheController::deleteAssetsCache
1+
# enable attribute routing for this bundle
2+
controllers:
3+
resource:
4+
path: ../src/Controller/
5+
namespace: RZ\Roadiz\RozierBundle\Controller
6+
type: attribute
7+
8+
# enable attribute routing for TranslateAssistant sub-bundle
9+
translateAssistant:
10+
resource:
11+
path: ../src/TranslateAssistant/
12+
namespace: RZ\Roadiz\RozierBundle\TranslateAssistant
13+
type: attribute
2814

2915
# NODES
30-
nodesHomePage:
31-
path: /rz-admin/nodes
32-
controller: RZ\Roadiz\RozierBundle\Controller\Node\NodeController::indexAction
3316
nodesRoutes:
3417
resource: "routing/nodes.yml"
3518
prefix: /rz-admin/nodes
3619

37-
## Ajax
38-
ajaxRequestsRoutes:
39-
resource: "routing/ajax.yml"
40-
prefix: /rz-admin/ajax
41-
4220
# Node TYPES
4321
nodeTypesHomePage:
4422
path: /rz-admin/node-types
@@ -74,15 +52,6 @@ settingGroupsRoutes:
7452
resource: "routing/setting-groups.yml"
7553
prefix: /rz-admin/setting-groups
7654

77-
78-
# TAGS
79-
tagsHomePage:
80-
path: /rz-admin/tags
81-
controller: RZ\Roadiz\RozierBundle\Controller\Tag\TagController::indexAction
82-
tagsRoutes:
83-
resource: "routing/tags.yml"
84-
prefix: /rz-admin/tags
85-
8655
# USERS
8756
usersHomePage:
8857
path: /rz-admin/users
@@ -161,16 +130,6 @@ groupsRoutes:
161130
resource: "routing/groups.yml"
162131
prefix: /rz-admin/groups
163132

164-
165-
#LOGS
166-
historyHomePage:
167-
path: /rz-admin/history
168-
controller: RZ\Roadiz\RozierBundle\Controller\HistoryController::indexAction
169-
historyUserPage:
170-
path: /rz-admin/history/user/{userId}
171-
requirements: { userId : "[0-9]+" }
172-
controller: RZ\Roadiz\RozierBundle\Controller\HistoryController::userAction
173-
174133
# Custom Form
175134
customFormsHomePage:
176135
path: /rz-admin/custom-forms
@@ -190,28 +149,9 @@ customFormFieldsRoutes:
190149
prefix: /rz-admin/custom-forms/fields
191150

192151

193-
# SEARCH
194-
searchNodePage:
195-
path: /rz-admin/search
196-
controller: RZ\Roadiz\RozierBundle\Controller\SearchController::searchNodeAction
197-
searchNodeSourcePage:
198-
path: /rz-admin/search/{nodeTypeName}
199-
controller: RZ\Roadiz\RozierBundle\Controller\SearchController::searchNodeSourceAction
200-
requirements: { nodeTypeName : "[a-zA-Z]+" }
201-
202152
webhooksHomePage:
203153
path: /rz-admin/webhooks
204154
controller: RZ\Roadiz\RozierBundle\Controller\WebhookController::defaultAction
205155
webhooksRoutes:
206156
resource: "routing/webhooks.yml"
207157
prefix: /rz-admin/webhooks
208-
209-
210-
#
211-
# CSS to style with main color
212-
# NOT SECURED ROUTES
213-
#
214-
loginImagePage:
215-
path: /css/login/image
216-
controller: RZ\Roadiz\RozierBundle\Controller\Login\LoginImageController::imageAction
217-

config/routing/ajax.yml

Lines changed: 0 additions & 202 deletions
This file was deleted.

0 commit comments

Comments
 (0)