Merge branch hotfix/v2.7.10

Author: roadiz-ci

.github/workflows/run-test.yml

@@ -19,7 +19,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.1', '8.2', '8.3']
+                php-version: ['8.3', '8.4']
         steps:
             - uses: shivammathur/setup-php@v2
               with:
@@ -35,7 +35,5 @@ jobs:
                       ${{ runner.os }}-php-${{ matrix.php-version }}-
             - name: Install Dependencies
               run: composer install --no-scripts --no-ansi --no-interaction --no-progress
-            - name: Run PHP Code Sniffer
-              run: vendor/bin/phpcs -p ./src
             - name: Run PHPStan
               run: vendor/bin/phpstan analyse --no-progress -c phpstan.neon

.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:
 

Makefile

@@ -16,22 +16,22 @@
         }
     ],
     "type": "symfony-bundle",
-    "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.1",
-        "symfony/framework-bundle": "6.4.*",
-        "roadiz/core-bundle": "2.3.*",
-        "roadiz/rozier": "2.3.*",
-        "roadiz/compat-bundle": "2.3.*",
-        "roadiz/openid": "2.3.*"
+        "php": ">=8.3",
+        "roadiz/core-bundle": "2.7.*",
+        "roadiz/openid": "2.7.*",
+        "roadiz/doc-generator": "2.7.*",
+        "roadiz/dts-generator": "2.7.*",
+        "symfony/framework-bundle": "7.4.*",
+        "deeplcom/deepl-php": "^1.12"
     },
     "require-dev": {
         "php-coveralls/php-coveralls": "^2.4",
-        "phpstan/phpstan": "^1.5.3",
-        "phpstan/phpstan-symfony": "^1.1.8",
-        "phpstan/phpstan-doctrine": "^1.3",
-        "squizlabs/php_codesniffer": "^3.5"
+        "phpstan/phpstan": "^2.1.36",
+        "phpstan/phpdoc-parser": "<2",
+        "phpstan/phpstan-doctrine": "^2.0.13",
+        "phpstan/phpstan-symfony": "^2.0.12"
     },
     "config": {
         "optimize-autoloader": true,
@@ -48,15 +48,25 @@
     "autoload": {
         "psr-4": {
             "RZ\\Roadiz\\RozierBundle\\": "src/"
-        },
-        "files": [
-            "deprecated.php"
-        ]
+        }
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.3.x-dev",
-            "dev-develop": "2.4.x-dev"
+            "dev-main": "2.7.x-dev",
+            "dev-develop": "2.8.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"
+        ]
     }
 }

composer.json

@@ -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/asset_mapper.yaml

@@ -111,8 +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'
                 - 'ROLE_ACCESS_REALMS'
@@ -152,38 +150,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/packages/roadiz_rozier.yaml

@@ -1,48 +1,26 @@
-# Home page
-adminHomePage:
-    path:     /rz-admin
-    controller: Themes\Rozier\Controllers\DashboardController::indexAction
-
-loginRoutes:
-    prefix: /rz-admin
-    resource: "routing/login.yml"
-
-ajaxSessionMessages:
-    path:     /rz-admin/session/messages
-    methods: [GET]
-    controller: Themes\Rozier\AjaxControllers\AjaxSessionMessages::getMessagesAction
-
-#Ping
-ping:
-    path:     /rz-admin/ping
-    methods: [GET]
-    controller: RZ\Roadiz\RozierBundle\Controller\PingController::indexAction
-
-# CACHES
-deleteDoctrineCache:
-    path:     /rz-admin/cache/delete-doctrine-cache
-    controller: Themes\Rozier\Controllers\CacheController::deleteDoctrineCache
-deleteAssetsCache:
-    path:     /rz-admin/cache/delete-assets-cache
-    controller: Themes\Rozier\Controllers\CacheController::deleteAssetsCache
+# enable attribute routing for this bundle
+controllers:
+    resource:
+        path: ../src/Controller/
+        namespace: RZ\Roadiz\RozierBundle\Controller
+    type: attribute
+
+# enable attribute routing for TranslateAssistant sub-bundle
+translateAssistant:
+    resource:
+        path: ../src/TranslateAssistant/
+        namespace: RZ\Roadiz\RozierBundle\TranslateAssistant
+    type: attribute
 
 # NODES
-nodesHomePage:
-    path:     /rz-admin/nodes
-    controller: Themes\Rozier\Controllers\Nodes\NodesController::indexAction
 nodesRoutes:
     resource: "routing/nodes.yml"
     prefix: /rz-admin/nodes
 
-## Ajax
-ajaxRequestsRoutes:
-    resource: "routing/ajax.yml"
-    prefix: /rz-admin/ajax
-
 # 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
@@ -52,10 +30,15 @@ nodeTypeFieldsRoutes:
     resource: "routing/node-type-fields.yml"
     prefix: /rz-admin/node-types/fields
 
+# Node type DECORATORS
+nodeTypeDecoratorsRoutes:
+    resource: "routing/node-type-decorators.yml"
+    prefix: /rz-admin/node-types/decorators
+
 # 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
@@ -64,32 +47,23 @@ 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
 
-
-# TAGS
-tagsHomePage:
-    path:     /rz-admin/tags
-    controller: Themes\Rozier\Controllers\Tags\TagsController::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
@@ -98,7 +72,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
@@ -107,7 +81,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
@@ -134,7 +108,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
@@ -148,36 +122,18 @@ 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
 
-
-#LOGS
-historyHomePage:
-    path:     /rz-admin/history
-    controller: Themes\Rozier\Controllers\HistoryController::indexAction
-historyUserPage:
-    path:     /rz-admin/history/user/{userId}
-    requirements: { userId : "[0-9]+" }
-    controller: Themes\Rozier\Controllers\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
@@ -193,28 +149,9 @@ customFormFieldsRoutes:
     prefix: /rz-admin/custom-forms/fields
 
 
-# SEARCH
-searchNodePage:
-    path:     /rz-admin/search
-    controller: Themes\Rozier\Controllers\SearchController::searchNodeAction
-searchNodeSourcePage:
-    path:     /rz-admin/search/{nodetypeId}
-    controller: Themes\Rozier\Controllers\SearchController::searchNodeSourceAction
-    requirements: { nodetypeId : "[0-9]+" }
-
 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
-
-
-#
-# CSS to style with main color
-# NOT SECURED ROUTES
-#
-loginImagePage:
-    path: /css/login/image
-    controller: Themes\Rozier\Controllers\LoginController::imageAction
-