Merge branch hotfix/v2.6.13

Author: roadiz-ci

.github/workflows/run-test.yml

@@ -19,7 +19,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.2', '8.3']
+                php-version: ['8.3', '8.4']
         steps:
             - uses: shivammathur/setup-php@v2
               with:

.gitignore

@@ -125,3 +125,7 @@ modules.xml
 /report.txt
 /composer.lock
 /symfony.lock
+
+# Vite
+# Ignore Vite dev manifest file
+/public/manifest.dev.json

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2024 Ambroise Maupate, Julien Blanchet
+Copyright © 2025 Ambroise Maupate, Julien Blanchet
 
 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:
 

composer.json

@@ -16,15 +16,12 @@
         }
     ],
     "type": "symfony-bundle",
-    "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.2",
-        "roadiz/compat-bundle": "2.5.*",
-        "roadiz/core-bundle": "2.5.*",
-        "roadiz/openid": "2.5.*",
-        "roadiz/rozier": "2.5.*",
-        "symfony/framework-bundle": "6.4.*"
+        "php": ">=8.3",
+        "roadiz/core-bundle": "2.6.*",
+        "roadiz/openid": "2.6.*",
+        "symfony/framework-bundle": "7.3.*"
     },
     "require-dev": {
         "php-coveralls/php-coveralls": "^2.4",
@@ -52,8 +49,21 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.5.x-dev",
-            "dev-develop": "2.6.x-dev"
+            "dev-main": "2.6.x-dev",
+            "dev-develop": "2.7.x-dev"
         }
+    },
+    "scripts": {
+        "auto-scripts": {
+            "cache:clear": "symfony-cmd",
+            "assets:install %PUBLIC_DIR%": "symfony-cmd",
+            "requirements-checker": "script"
+        },
+        "post-install-cmd": [
+            "@auto-scripts"
+        ],
+        "post-update-cmd": [
+            "@auto-scripts"
+        ]
     }
 }

config/packages/asset_mapper.yaml

@@ -0,0 +1,12 @@
+framework:
+    asset_mapper:
+        # The paths to make available to the asset mapper.
+        paths:
+            vendor/roadiz/rozier-bundle/static/: 'bundles/roadizrozier'
+        missing_import_mode: strict
+        public_prefix: '/static/'
+
+when@prod:
+    framework:
+        asset_mapper:
+            missing_import_mode: warn

config/packages/roadiz_rozier.yaml

@@ -111,7 +111,6 @@ roadiz_rozier:
                 - 'ROLE_ACCESS_NODETYPES'
                 - 'ROLE_ACCESS_ATTRIBUTES'
                 - 'ROLE_ACCESS_TRANSLATIONS'
-                - 'ROLE_ACCESS_THEMES'
                 - 'ROLE_ACCESS_FONTS'
                 - 'ROLE_ACCESS_REDIRECTIONS'
                 - 'ROLE_ACCESS_WEBHOOKS'
@@ -152,38 +151,24 @@ roadiz_rozier:
             name: 'user.system'
             route: ~
             icon: uk-icon-rz-users
-            roles: ['ROLE_ACCESS_USERS', 'ROLE_ACCESS_ROLES', 'ROLE_ACCESS_GROUPS']
+            roles: ['ROLE_ACCESS_USERS', 'ROLE_ACCESS_GROUPS']
             subentries:
                 manage_users:
                     name: 'manage.users'
                     route: usersHomePage
                     icon: uk-icon-rz-user
                     roles: ['ROLE_ACCESS_USERS']
-                manage_roles:
-                    name: 'manage.roles'
-                    route: rolesHomePage
-                    icon: uk-icon-rz-roles
-                    roles: ['ROLE_ACCESS_ROLES']
                 manage_groups:
                     name: 'manage.groups'
                     route: groupsHomePage
                     icon: uk-icon-rz-groups
                     roles: ['ROLE_ACCESS_GROUPS']
 
-        interactions:
-            name: 'interactions'
-            route: ~
-            icon: uk-icon-rz-interactions
-            roles:
-                - 'ROLE_ACCESS_CUSTOMFORMS'
-                - 'ROLE_ACCESS_MANAGE_SUBSCRIBERS'
-                - 'ROLE_ACCESS_COMMENTS'
-            subentries:
-                manage_customForms:
-                    name: 'manage.customForms'
-                    route: customFormsHomePage
-                    icon: uk-icon-rz-surveys
-                    roles: ['ROLE_ACCESS_CUSTOMFORMS']
+        manage_customForms:
+            name: 'manage.customForms'
+            route: customFormsHomePage
+            icon: uk-icon-rz-surveys
+            roles: ['ROLE_ACCESS_CUSTOMFORMS']
 
         settings:
             name: 'settings'

config/routing.yaml

@@ -1,7 +1,7 @@
 # Home page
 adminHomePage:
     path:     /rz-admin
-    controller: Themes\Rozier\Controllers\DashboardController::indexAction
+    controller: RZ\Roadiz\RozierBundle\Controller\DashboardController::indexAction
 
 loginRoutes:
     prefix: /rz-admin
@@ -10,7 +10,7 @@ loginRoutes:
 ajaxSessionMessages:
     path:     /rz-admin/session/messages
     methods: [GET]
-    controller: Themes\Rozier\AjaxControllers\AjaxSessionMessages::getMessagesAction
+    controller: RZ\Roadiz\RozierBundle\Controller\Ajax\AjaxSessionMessages::getMessagesAction
 
 #Ping
 ping:
@@ -21,15 +21,15 @@ ping:
 # CACHES
 deleteDoctrineCache:
     path:     /rz-admin/cache/delete-doctrine-cache
-    controller: Themes\Rozier\Controllers\CacheController::deleteDoctrineCache
+    controller: RZ\Roadiz\RozierBundle\Controller\CacheController::deleteDoctrineCache
 deleteAssetsCache:
     path:     /rz-admin/cache/delete-assets-cache
-    controller: Themes\Rozier\Controllers\CacheController::deleteAssetsCache
+    controller: RZ\Roadiz\RozierBundle\Controller\CacheController::deleteAssetsCache
 
 # NODES
 nodesHomePage:
     path:     /rz-admin/nodes
-    controller: Themes\Rozier\Controllers\Nodes\NodesController::indexAction
+    controller: RZ\Roadiz\RozierBundle\Controller\Node\NodeController::indexAction
 nodesRoutes:
     resource: "routing/nodes.yml"
     prefix: /rz-admin/nodes
@@ -42,7 +42,7 @@ ajaxRequestsRoutes:
 # Node TYPES
 nodeTypesHomePage:
     path:     /rz-admin/node-types
-    controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesController::indexAction
+    controller: RZ\Roadiz\RozierBundle\Controller\NodeType\NodeTypeController::indexAction
 nodeTypesRoutes:
     resource: "routing/node-types.yml"
     prefix: /rz-admin/node-types
@@ -60,7 +60,7 @@ nodeTypeDecoratorsRoutes:
 # SETTINGS
 settingsHomePage:
     path:     /rz-admin/settings
-    controller: Themes\Rozier\Controllers\SettingsController::indexAction
+    controller: RZ\Roadiz\RozierBundle\Controller\SettingController::indexAction
 settingsRoutes:
     resource: "routing/settings.yml"
     prefix: /rz-admin/settings
@@ -69,7 +69,7 @@ settingsRoutes:
 # SETTINGS GROUPS
 settingGroupsHomePage:
     path:     /rz-admin/setting-groups
-    controller: Themes\Rozier\Controllers\SettingGroupsController::defaultAction
+    controller: RZ\Roadiz\RozierBundle\Controller\SettingGroupController::defaultAction
 settingGroupsRoutes:
     resource: "routing/setting-groups.yml"
     prefix: /rz-admin/setting-groups
@@ -78,23 +78,23 @@ settingGroupsRoutes:
 # TAGS
 tagsHomePage:
     path:     /rz-admin/tags
-    controller: Themes\Rozier\Controllers\Tags\TagsController::indexAction
+    controller: RZ\Roadiz\RozierBundle\Controller\Tag\TagController::indexAction
 tagsRoutes:
     resource: "routing/tags.yml"
     prefix: /rz-admin/tags
 
 # USERS
 usersHomePage:
     path:     /rz-admin/users
-    controller: Themes\Rozier\Controllers\Users\UsersController::defaultAction
+    controller: RZ\Roadiz\RozierBundle\Controller\User\UserController::defaultAction
 usersRoutes:
     resource: "routing/users.yml"
     prefix: /rz-admin/users
 
 # ATTRIBUTES
 attributesHomePage:
     path:     /rz-admin/attributes
-    controller: Themes\Rozier\Controllers\Attributes\AttributeController::defaultAction
+    controller: RZ\Roadiz\RozierBundle\Controller\Attribute\AttributeController::defaultAction
 attributesRoutes:
     resource: "routing/attributes.yml"
     prefix: /rz-admin/attributes
@@ -103,7 +103,7 @@ attributesRoutes:
 # FOLDERS
 foldersHomePage:
     path:     /rz-admin/folders
-    controller: Themes\Rozier\Controllers\FoldersController::indexAction
+    controller: RZ\Roadiz\RozierBundle\Controller\FolderController::indexAction
 foldersRoutes:
     resource: "routing/folders.yml"
     prefix: /rz-admin/folders
@@ -112,7 +112,7 @@ foldersRoutes:
 # TRANSLATIONS
 translationsHomePage:
     path:     /rz-admin/translations
-    controller: Themes\Rozier\Controllers\TranslationsController::indexAction
+    controller: RZ\Roadiz\RozierBundle\Controller\TranslationController::indexAction
 translationsRoutes:
     resource: "routing/translations.yml"
     prefix: /rz-admin/translations
@@ -139,7 +139,7 @@ documentsRoutes:
 # DOCUMENTS
 redirectionsHomePage:
     path:     /rz-admin/redirections
-    controller: Themes\Rozier\Controllers\RedirectionsController::defaultAction
+    controller: RZ\Roadiz\RozierBundle\Controller\RedirectionController::defaultAction
 redirectionsRoutes:
     resource: "routing/redirections.yml"
     prefix: /rz-admin/redirections
@@ -153,18 +153,10 @@ realmsRoutes:
     resource: "routing/realms.yml"
     prefix: /rz-admin/realms
 
-# ROLES
-rolesHomePage:
-    path:     /rz-admin/roles
-    controller: Themes\Rozier\Controllers\RolesController::defaultAction
-rolesRoutes:
-    resource: "routing/roles.yml"
-    prefix: /rz-admin/roles
-
 # GROUPS
 groupsHomePage:
     path:     /rz-admin/groups
-    controller: Themes\Rozier\Controllers\GroupsController::defaultAction
+    controller: RZ\Roadiz\RozierBundle\Controller\GroupController::defaultAction
 groupsRoutes:
     resource: "routing/groups.yml"
     prefix: /rz-admin/groups
@@ -173,16 +165,16 @@ groupsRoutes:
 #LOGS
 historyHomePage:
     path:     /rz-admin/history
-    controller: Themes\Rozier\Controllers\HistoryController::indexAction
+    controller: RZ\Roadiz\RozierBundle\Controller\HistoryController::indexAction
 historyUserPage:
     path:     /rz-admin/history/user/{userId}
     requirements: { userId : "[0-9]+" }
-    controller: Themes\Rozier\Controllers\HistoryController::userAction
+    controller: RZ\Roadiz\RozierBundle\Controller\HistoryController::userAction
 
 # Custom Form
 customFormsHomePage:
     path:     /rz-admin/custom-forms
-    controller: Themes\Rozier\Controllers\CustomForms\CustomFormsController::defaultAction
+    controller: RZ\Roadiz\RozierBundle\Controller\CustomForm\CustomFormController::defaultAction
 customFormsRoutes:
     resource: "routing/custom-forms.yml"
     prefix: /rz-admin/custom-forms
@@ -201,15 +193,15 @@ customFormFieldsRoutes:
 # SEARCH
 searchNodePage:
     path:     /rz-admin/search
-    controller: Themes\Rozier\Controllers\SearchController::searchNodeAction
+    controller: RZ\Roadiz\RozierBundle\Controller\SearchController::searchNodeAction
 searchNodeSourcePage:
     path:     /rz-admin/search/{nodeTypeName}
-    controller: Themes\Rozier\Controllers\SearchController::searchNodeSourceAction
+    controller: RZ\Roadiz\RozierBundle\Controller\SearchController::searchNodeSourceAction
     requirements: { nodeTypeName : "[a-zA-Z]+" }
 
 webhooksHomePage:
     path:     /rz-admin/webhooks
-    controller: Themes\Rozier\Controllers\WebhookController::defaultAction
+    controller: RZ\Roadiz\RozierBundle\Controller\WebhookController::defaultAction
 webhooksRoutes:
     resource: "routing/webhooks.yml"
     prefix: /rz-admin/webhooks