Skip to content

Commit 21fd924

Browse files
author
roadiz-ci
committed
chore: Bumped
1 parent 1461250 commit 21fd924

552 files changed

Lines changed: 3030 additions & 75712 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.

.github/workflows/run-test.yml

Lines changed: 3 additions & 1 deletion
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.3', '8.4']
22+
php-version: ['8.1', '8.2', '8.3']
2323
steps:
2424
- uses: shivammathur/setup-php@v2
2525
with:
@@ -35,5 +35,7 @@ jobs:
3535
${{ runner.os }}-php-${{ matrix.php-version }}-
3636
- name: Install Dependencies
3737
run: composer install --no-scripts --no-ansi --no-interaction --no-progress
38+
- name: Run PHP Code Sniffer
39+
run: vendor/bin/phpcs -p ./src
3840
- name: Run PHPStan
3941
run: vendor/bin/phpstan analyse --no-progress -c phpstan.neon

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,3 @@ modules.xml
125125
/report.txt
126126
/composer.lock
127127
/symfony.lock
128-
129-
# Vite
130-
# Ignore Vite dev manifest file
131-
/public/manifest.dev.json

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright © 2025 Ambroise Maupate, Julien Blanchet
3+
Copyright © 2024 Ambroise Maupate, Julien Blanchet
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
test:
2+
php -d "memory_limit=-1" vendor/bin/phpcbf --report=full --report-file=./report.txt -p ./src
3+
php -d "memory_limit=-1" vendor/bin/phpstan analyse -c phpstan.neon

composer.json

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,22 @@
1616
}
1717
],
1818
"type": "symfony-bundle",
19+
"minimum-stability": "dev",
1920
"prefer-stable": true,
2021
"require": {
21-
"php": ">=8.3",
22-
"roadiz/core-bundle": "2.6.*",
23-
"roadiz/openid": "2.6.*",
24-
"symfony/framework-bundle": "7.3.*"
22+
"php": ">=8.1",
23+
"symfony/framework-bundle": "6.4.*",
24+
"roadiz/core-bundle": "2.3.*",
25+
"roadiz/rozier": "2.3.*",
26+
"roadiz/compat-bundle": "2.3.*",
27+
"roadiz/openid": "2.3.*"
2528
},
2629
"require-dev": {
2730
"php-coveralls/php-coveralls": "^2.4",
2831
"phpstan/phpstan": "^1.5.3",
29-
"phpstan/phpdoc-parser": "<2",
32+
"phpstan/phpstan-symfony": "^1.1.8",
3033
"phpstan/phpstan-doctrine": "^1.3",
31-
"phpstan/phpstan-symfony": "^1.1.8"
34+
"squizlabs/php_codesniffer": "^3.5"
3235
},
3336
"config": {
3437
"optimize-autoloader": true,
@@ -45,25 +48,15 @@
4548
"autoload": {
4649
"psr-4": {
4750
"RZ\\Roadiz\\RozierBundle\\": "src/"
48-
}
51+
},
52+
"files": [
53+
"deprecated.php"
54+
]
4955
},
5056
"extra": {
5157
"branch-alias": {
52-
"dev-main": "2.6.x-dev",
53-
"dev-develop": "2.7.x-dev"
58+
"dev-main": "2.3.x-dev",
59+
"dev-develop": "2.4.x-dev"
5460
}
55-
},
56-
"scripts": {
57-
"auto-scripts": {
58-
"cache:clear": "symfony-cmd",
59-
"assets:install %PUBLIC_DIR%": "symfony-cmd",
60-
"requirements-checker": "script"
61-
},
62-
"post-install-cmd": [
63-
"@auto-scripts"
64-
],
65-
"post-update-cmd": [
66-
"@auto-scripts"
67-
]
6861
}
6962
}

config/packages/asset_mapper.yaml

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

config/packages/roadiz_rozier.yaml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ roadiz_rozier:
111111
- 'ROLE_ACCESS_NODETYPES'
112112
- 'ROLE_ACCESS_ATTRIBUTES'
113113
- 'ROLE_ACCESS_TRANSLATIONS'
114+
- 'ROLE_ACCESS_THEMES'
114115
- 'ROLE_ACCESS_FONTS'
115116
- 'ROLE_ACCESS_REDIRECTIONS'
116117
- 'ROLE_ACCESS_WEBHOOKS'
@@ -151,24 +152,38 @@ roadiz_rozier:
151152
name: 'user.system'
152153
route: ~
153154
icon: uk-icon-rz-users
154-
roles: ['ROLE_ACCESS_USERS', 'ROLE_ACCESS_GROUPS']
155+
roles: ['ROLE_ACCESS_USERS', 'ROLE_ACCESS_ROLES', 'ROLE_ACCESS_GROUPS']
155156
subentries:
156157
manage_users:
157158
name: 'manage.users'
158159
route: usersHomePage
159160
icon: uk-icon-rz-user
160161
roles: ['ROLE_ACCESS_USERS']
162+
manage_roles:
163+
name: 'manage.roles'
164+
route: rolesHomePage
165+
icon: uk-icon-rz-roles
166+
roles: ['ROLE_ACCESS_ROLES']
161167
manage_groups:
162168
name: 'manage.groups'
163169
route: groupsHomePage
164170
icon: uk-icon-rz-groups
165171
roles: ['ROLE_ACCESS_GROUPS']
166172

167-
manage_customForms:
168-
name: 'manage.customForms'
169-
route: customFormsHomePage
170-
icon: uk-icon-rz-surveys
171-
roles: ['ROLE_ACCESS_CUSTOMFORMS']
173+
interactions:
174+
name: 'interactions'
175+
route: ~
176+
icon: uk-icon-rz-interactions
177+
roles:
178+
- 'ROLE_ACCESS_CUSTOMFORMS'
179+
- 'ROLE_ACCESS_MANAGE_SUBSCRIBERS'
180+
- 'ROLE_ACCESS_COMMENTS'
181+
subentries:
182+
manage_customForms:
183+
name: 'manage.customForms'
184+
route: customFormsHomePage
185+
icon: uk-icon-rz-surveys
186+
roles: ['ROLE_ACCESS_CUSTOMFORMS']
172187

173188
settings:
174189
name: 'settings'

config/routing.yaml

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Home page
22
adminHomePage:
33
path: /rz-admin
4-
controller: RZ\Roadiz\RozierBundle\Controller\DashboardController::indexAction
4+
controller: Themes\Rozier\Controllers\DashboardController::indexAction
55

66
loginRoutes:
77
prefix: /rz-admin
@@ -10,26 +10,26 @@ loginRoutes:
1010
ajaxSessionMessages:
1111
path: /rz-admin/session/messages
1212
methods: [GET]
13-
controller: RZ\Roadiz\RozierBundle\Controller\Ajax\AjaxSessionMessages::getMessagesAction
13+
controller: Themes\Rozier\AjaxControllers\AjaxSessionMessages::getMessagesAction
1414

1515
#Ping
1616
ping:
1717
path: /rz-admin/ping
1818
methods: [GET]
19-
controller: RZ\Roadiz\RozierBundle\Controller\PingController::pingAction
19+
controller: RZ\Roadiz\RozierBundle\Controller\PingController::indexAction
2020

2121
# CACHES
2222
deleteDoctrineCache:
2323
path: /rz-admin/cache/delete-doctrine-cache
24-
controller: RZ\Roadiz\RozierBundle\Controller\CacheController::deleteDoctrineCache
24+
controller: Themes\Rozier\Controllers\CacheController::deleteDoctrineCache
2525
deleteAssetsCache:
2626
path: /rz-admin/cache/delete-assets-cache
27-
controller: RZ\Roadiz\RozierBundle\Controller\CacheController::deleteAssetsCache
27+
controller: Themes\Rozier\Controllers\CacheController::deleteAssetsCache
2828

2929
# NODES
3030
nodesHomePage:
3131
path: /rz-admin/nodes
32-
controller: RZ\Roadiz\RozierBundle\Controller\Node\NodeController::indexAction
32+
controller: Themes\Rozier\Controllers\Nodes\NodesController::indexAction
3333
nodesRoutes:
3434
resource: "routing/nodes.yml"
3535
prefix: /rz-admin/nodes
@@ -42,7 +42,7 @@ ajaxRequestsRoutes:
4242
# Node TYPES
4343
nodeTypesHomePage:
4444
path: /rz-admin/node-types
45-
controller: RZ\Roadiz\RozierBundle\Controller\NodeType\NodeTypeController::indexAction
45+
controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesController::indexAction
4646
nodeTypesRoutes:
4747
resource: "routing/node-types.yml"
4848
prefix: /rz-admin/node-types
@@ -52,15 +52,10 @@ nodeTypeFieldsRoutes:
5252
resource: "routing/node-type-fields.yml"
5353
prefix: /rz-admin/node-types/fields
5454

55-
# Node type DECORATORS
56-
nodeTypeDecoratorsRoutes:
57-
resource: "routing/node-type-decorators.yml"
58-
prefix: /rz-admin/node-types/decorators
59-
6055
# SETTINGS
6156
settingsHomePage:
6257
path: /rz-admin/settings
63-
controller: RZ\Roadiz\RozierBundle\Controller\SettingController::indexAction
58+
controller: Themes\Rozier\Controllers\SettingsController::indexAction
6459
settingsRoutes:
6560
resource: "routing/settings.yml"
6661
prefix: /rz-admin/settings
@@ -69,7 +64,7 @@ settingsRoutes:
6964
# SETTINGS GROUPS
7065
settingGroupsHomePage:
7166
path: /rz-admin/setting-groups
72-
controller: RZ\Roadiz\RozierBundle\Controller\SettingGroupController::defaultAction
67+
controller: Themes\Rozier\Controllers\SettingGroupsController::defaultAction
7368
settingGroupsRoutes:
7469
resource: "routing/setting-groups.yml"
7570
prefix: /rz-admin/setting-groups
@@ -78,23 +73,23 @@ settingGroupsRoutes:
7873
# TAGS
7974
tagsHomePage:
8075
path: /rz-admin/tags
81-
controller: RZ\Roadiz\RozierBundle\Controller\Tag\TagController::indexAction
76+
controller: Themes\Rozier\Controllers\Tags\TagsController::indexAction
8277
tagsRoutes:
8378
resource: "routing/tags.yml"
8479
prefix: /rz-admin/tags
8580

8681
# USERS
8782
usersHomePage:
8883
path: /rz-admin/users
89-
controller: RZ\Roadiz\RozierBundle\Controller\User\UserController::defaultAction
84+
controller: Themes\Rozier\Controllers\Users\UsersController::defaultAction
9085
usersRoutes:
9186
resource: "routing/users.yml"
9287
prefix: /rz-admin/users
9388

9489
# ATTRIBUTES
9590
attributesHomePage:
9691
path: /rz-admin/attributes
97-
controller: RZ\Roadiz\RozierBundle\Controller\Attribute\AttributeController::defaultAction
92+
controller: Themes\Rozier\Controllers\Attributes\AttributeController::defaultAction
9893
attributesRoutes:
9994
resource: "routing/attributes.yml"
10095
prefix: /rz-admin/attributes
@@ -103,7 +98,7 @@ attributesRoutes:
10398
# FOLDERS
10499
foldersHomePage:
105100
path: /rz-admin/folders
106-
controller: RZ\Roadiz\RozierBundle\Controller\FolderController::indexAction
101+
controller: Themes\Rozier\Controllers\FoldersController::indexAction
107102
foldersRoutes:
108103
resource: "routing/folders.yml"
109104
prefix: /rz-admin/folders
@@ -112,7 +107,7 @@ foldersRoutes:
112107
# TRANSLATIONS
113108
translationsHomePage:
114109
path: /rz-admin/translations
115-
controller: RZ\Roadiz\RozierBundle\Controller\TranslationController::indexAction
110+
controller: Themes\Rozier\Controllers\TranslationsController::indexAction
116111
translationsRoutes:
117112
resource: "routing/translations.yml"
118113
prefix: /rz-admin/translations
@@ -139,7 +134,7 @@ documentsRoutes:
139134
# DOCUMENTS
140135
redirectionsHomePage:
141136
path: /rz-admin/redirections
142-
controller: RZ\Roadiz\RozierBundle\Controller\RedirectionController::defaultAction
137+
controller: Themes\Rozier\Controllers\RedirectionsController::defaultAction
143138
redirectionsRoutes:
144139
resource: "routing/redirections.yml"
145140
prefix: /rz-admin/redirections
@@ -153,10 +148,18 @@ realmsRoutes:
153148
resource: "routing/realms.yml"
154149
prefix: /rz-admin/realms
155150

151+
# ROLES
152+
rolesHomePage:
153+
path: /rz-admin/roles
154+
controller: Themes\Rozier\Controllers\RolesController::defaultAction
155+
rolesRoutes:
156+
resource: "routing/roles.yml"
157+
prefix: /rz-admin/roles
158+
156159
# GROUPS
157160
groupsHomePage:
158161
path: /rz-admin/groups
159-
controller: RZ\Roadiz\RozierBundle\Controller\GroupController::defaultAction
162+
controller: Themes\Rozier\Controllers\GroupsController::defaultAction
160163
groupsRoutes:
161164
resource: "routing/groups.yml"
162165
prefix: /rz-admin/groups
@@ -165,16 +168,16 @@ groupsRoutes:
165168
#LOGS
166169
historyHomePage:
167170
path: /rz-admin/history
168-
controller: RZ\Roadiz\RozierBundle\Controller\HistoryController::indexAction
171+
controller: Themes\Rozier\Controllers\HistoryController::indexAction
169172
historyUserPage:
170173
path: /rz-admin/history/user/{userId}
171174
requirements: { userId : "[0-9]+" }
172-
controller: RZ\Roadiz\RozierBundle\Controller\HistoryController::userAction
175+
controller: Themes\Rozier\Controllers\HistoryController::userAction
173176

174177
# Custom Form
175178
customFormsHomePage:
176179
path: /rz-admin/custom-forms
177-
controller: RZ\Roadiz\RozierBundle\Controller\CustomForm\CustomFormController::defaultAction
180+
controller: Themes\Rozier\Controllers\CustomForms\CustomFormsController::defaultAction
178181
customFormsRoutes:
179182
resource: "routing/custom-forms.yml"
180183
prefix: /rz-admin/custom-forms
@@ -193,15 +196,15 @@ customFormFieldsRoutes:
193196
# SEARCH
194197
searchNodePage:
195198
path: /rz-admin/search
196-
controller: RZ\Roadiz\RozierBundle\Controller\SearchController::searchNodeAction
199+
controller: Themes\Rozier\Controllers\SearchController::searchNodeAction
197200
searchNodeSourcePage:
198-
path: /rz-admin/search/{nodeTypeName}
199-
controller: RZ\Roadiz\RozierBundle\Controller\SearchController::searchNodeSourceAction
200-
requirements: { nodeTypeName : "[a-zA-Z]+" }
201+
path: /rz-admin/search/{nodetypeId}
202+
controller: Themes\Rozier\Controllers\SearchController::searchNodeSourceAction
203+
requirements: { nodetypeId : "[0-9]+" }
201204

202205
webhooksHomePage:
203206
path: /rz-admin/webhooks
204-
controller: RZ\Roadiz\RozierBundle\Controller\WebhookController::defaultAction
207+
controller: Themes\Rozier\Controllers\WebhookController::defaultAction
205208
webhooksRoutes:
206209
resource: "routing/webhooks.yml"
207210
prefix: /rz-admin/webhooks
@@ -213,5 +216,5 @@ webhooksRoutes:
213216
#
214217
loginImagePage:
215218
path: /css/login/image
216-
controller: RZ\Roadiz\RozierBundle\Controller\Login\LoginImageController::imageAction
219+
controller: Themes\Rozier\Controllers\LoginController::imageAction
217220

0 commit comments

Comments
 (0)