Skip to content

Commit aebc7e5

Browse files
author
roadiz-ci
committed
chore: bumped
1 parent 8bce8c0 commit aebc7e5

75 files changed

Lines changed: 1320 additions & 2286 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.2', '8.3']
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

‎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: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
"minimum-stability": "dev",
2020
"prefer-stable": true,
2121
"require": {
22-
"php": ">=8.2",
23-
"roadiz/compat-bundle": "2.5.*",
24-
"roadiz/core-bundle": "2.5.*",
25-
"roadiz/openid": "2.5.*",
26-
"roadiz/rozier": "2.5.*",
27-
"symfony/framework-bundle": "6.4.*"
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.*"
2828
},
2929
"require-dev": {
3030
"php-coveralls/php-coveralls": "^2.4",
3131
"phpstan/phpstan": "^1.5.3",
32-
"phpstan/phpdoc-parser": "<2",
32+
"phpstan/phpstan-symfony": "^1.1.8",
3333
"phpstan/phpstan-doctrine": "^1.3",
34-
"phpstan/phpstan-symfony": "^1.1.8"
34+
"squizlabs/php_codesniffer": "^3.5"
3535
},
3636
"config": {
3737
"optimize-autoloader": true,
@@ -48,12 +48,15 @@
4848
"autoload": {
4949
"psr-4": {
5050
"RZ\\Roadiz\\RozierBundle\\": "src/"
51-
}
51+
},
52+
"files": [
53+
"deprecated.php"
54+
]
5255
},
5356
"extra": {
5457
"branch-alias": {
55-
"dev-main": "2.5.x-dev",
56-
"dev-develop": "2.6.x-dev"
58+
"dev-main": "2.3.x-dev",
59+
"dev-develop": "2.4.x-dev"
5760
}
5861
}
5962
}

‎config/routing.yaml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ajaxSessionMessages:
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:
@@ -52,11 +52,6 @@ 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
@@ -203,9 +198,9 @@ searchNodePage:
203198
path: /rz-admin/search
204199
controller: Themes\Rozier\Controllers\SearchController::searchNodeAction
205200
searchNodeSourcePage:
206-
path: /rz-admin/search/{nodeTypeName}
201+
path: /rz-admin/search/{nodetypeId}
207202
controller: Themes\Rozier\Controllers\SearchController::searchNodeSourceAction
208-
requirements: { nodeTypeName : "[a-zA-Z]+" }
203+
requirements: { nodetypeId : "[0-9]+" }
209204

210205
webhooksHomePage:
211206
path: /rz-admin/webhooks
@@ -221,5 +216,5 @@ webhooksRoutes:
221216
#
222217
loginImagePage:
223218
path: /css/login/image
224-
controller: RZ\Roadiz\RozierBundle\Controller\Login\LoginImageController::imageAction
219+
controller: Themes\Rozier\Controllers\LoginController::imageAction
225220

‎config/routing/ajax.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ nodeAjaxEdit:
1010
controller: Themes\Rozier\AjaxControllers\AjaxNodesController::editAction
1111
format: json
1212
requirements: { nodeId : "[0-9]+" }
13-
searchAjax:
14-
path: /search
13+
searchNodesSourcesAjax:
14+
path: /nodes-sources/search
1515
methods: [GET]
1616
defaults:
17-
_controller: Themes\Rozier\AjaxControllers\AjaxSearchController::searchAction
17+
_controller: Themes\Rozier\AjaxControllers\AjaxSearchNodesSourcesController::searchAction
1818
_format: json
1919
nodesStatusesAjax:
2020
path: /nodes/statuses
@@ -50,6 +50,12 @@ nodesAjaxExplorerPage:
5050
defaults:
5151
_controller: Themes\Rozier\AjaxControllers\AjaxNodesExplorerController::indexAction
5252
_format: json
53+
nodeTypesFieldAjaxEdit:
54+
path: /node-types/fields/edit/{nodeTypeFieldId}
55+
defaults:
56+
_controller: Themes\Rozier\AjaxControllers\AjaxNodeTypeFieldsController::editAction
57+
_format: json
58+
requirements: { nodeTypeFieldId : "[0-9]+" }
5359
nodeTypesAjaxByArray:
5460
path: /node-types/list
5561
methods: [GET]

‎config/routing/documents.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
documentsAdjustPage:
22
path: /adjust/{documentId}
33
defaults:
4-
_controller: RZ\Roadiz\RozierBundle\Controller\Document\DocumentAdjustController::adjustAction
4+
_controller: Themes\Rozier\Controllers\Documents\DocumentsController::adjustAction
55
requirements: { documentId : "[0-9]+" }
66
documentsEditPage:
77
path: /edit/{documentId}
88
defaults:
9-
_controller: RZ\Roadiz\RozierBundle\Controller\Document\DocumentEditController::editAction
9+
_controller: Themes\Rozier\Controllers\Documents\DocumentsController::editAction
1010
requirements: { documentId : "[0-9]+" }
1111
documentsLimitationsPage:
1212
path: /limitations/{id}
@@ -37,7 +37,7 @@ documentsDownloadInlinePage:
3737
documentsUsagePage:
3838
path: /usage/{documentId}
3939
defaults:
40-
_controller: RZ\Roadiz\RozierBundle\Controller\Document\DocumentUsageController::usageAction
40+
_controller: Themes\Rozier\Controllers\Documents\DocumentsController::usageAction
4141
requirements: { documentId : "[0-9]+" }
4242
documentsUploadPage:
4343
path: /upload/{_format}/{folderId}
@@ -51,13 +51,13 @@ documentsUploadPage:
5151
documentsRandomPage:
5252
path: /random/{folderId}
5353
defaults:
54-
_controller: RZ\Roadiz\RozierBundle\Controller\Document\DocumentEmbedController::randomAction
54+
_controller: Themes\Rozier\Controllers\Documents\DocumentsController::randomAction
5555
folderId: null
5656
requirements: { folderId : "[0-9]+" }
5757
documentsEmbedPage:
5858
path: /embed/{folderId}
5959
defaults:
60-
_controller: RZ\Roadiz\RozierBundle\Controller\Document\DocumentEmbedController::embedAction
60+
_controller: Themes\Rozier\Controllers\Documents\DocumentsController::embedAction
6161
folderId: null
6262
requirements: { folderId : "[0-9]+" }
6363
documentsDeletePage:

‎config/routing/login.yml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ loginRequestConfirmPage:
77
controller: RZ\Roadiz\RozierBundle\Controller\Login\LoginRequestController::confirmAction
88
loginResetConfirmPage:
99
path: /login/reset/confirm
10-
controller: RZ\Roadiz\RozierBundle\Controller\Login\LoginResetController::confirmAction
10+
controller: Themes\Rozier\Controllers\LoginResetController::confirmAction
1111
loginResetPage:
1212
path: /login/reset/{token}
13-
controller: RZ\Roadiz\RozierBundle\Controller\Login\LoginResetController::resetAction
13+
controller: Themes\Rozier\Controllers\LoginResetController::resetAction
1414
requirements: { token : "[^\\/]+" }
1515

1616
# Override legacy Rozier routes for security
@@ -21,16 +21,3 @@ loginPage:
2121
logoutPage:
2222
path: /logout
2323
controller: RZ\Roadiz\RozierBundle\Controller\SecurityController::logout
24-
25-
roadiz_rozier_login_link:
26-
path: /login_link
27-
controller: RZ\Roadiz\RozierBundle\Controller\SecurityController::requestLoginLink
28-
29-
roadiz_rozier_login_link_sent:
30-
methods: [GET]
31-
path: /login_link_sent
32-
controller: RZ\Roadiz\RozierBundle\Controller\SecurityController::loginLinkSent
33-
34-
login_link_check:
35-
path: /login_link_check
36-
controller: RZ\Roadiz\RozierBundle\Controller\SecurityController::check

‎config/routing/node-type-decorators.yml‎

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

‎config/routing/node-type-fields.yml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
---
22
nodeTypeFieldsListPage:
3-
path: /{nodeTypeName}
3+
path: /{nodeTypeId}
44
defaults:
55
_controller: Themes\Rozier\Controllers\NodeTypeFieldsController::listAction
6-
requirements: { nodeTypeName : "[a-zA-Z]+" }
6+
requirements: { nodeTypeId : "[0-9]+" }
7+
nodeTypeFieldsEditPage:
8+
path: /edit/{nodeTypeFieldId}
9+
defaults:
10+
_controller: Themes\Rozier\Controllers\NodeTypeFieldsController::editAction
11+
requirements: { nodeTypeFieldId : "[0-9]+" }
12+
nodeTypeFieldsAddPage:
13+
path: /add/{nodeTypeId}
14+
defaults:
15+
_controller: Themes\Rozier\Controllers\NodeTypeFieldsController::addAction
16+
requirements: { nodeTypeId : "[0-9]+" }
17+
nodeTypeFieldsDeletePage:
18+
path: /delete/{nodeTypeFieldId}
19+
defaults:
20+
_controller: Themes\Rozier\Controllers\NodeTypeFieldsController::deleteAction
21+
requirements: { nodeTypeFieldId : "[0-9]+" }
22+

‎config/routing/node-types.yml‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,38 @@
22
# Node-types admin pages
33
# These routes are prefixed with /rz-admin/node-types
44
#
5+
nodeTypesEditPage:
6+
path: /edit/{nodeTypeId}
7+
defaults:
8+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesController::editAction
9+
requirements: { nodeTypeId : "[0-9]+" }
10+
nodeTypesAddPage:
11+
path: /add
12+
defaults:
13+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesController::addAction
14+
nodeTypesImportPage:
15+
path: /import
16+
defaults:
17+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesUtilsController::importJsonFileAction
18+
nodeTypesDeletePage:
19+
path: /delete/{nodeTypeId}
20+
defaults:
21+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesController::deleteAction
22+
requirements: { nodeTypeId : "[0-9]+" }
23+
nodesTypesExportPage:
24+
path: /export/{nodeTypeId}
25+
defaults:
26+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesUtilsController::exportJsonFileAction
27+
requirements: { nodeTypeId : "[0-9]+" }
28+
nodesTypesExportAllPage:
29+
path: /export/all
30+
defaults:
31+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesUtilsController::exportAllAction
532
nodesTypesExportDocumentationPage:
633
path: /export/documentation
734
defaults:
8-
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesExportController::exportDocumentationAction
35+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesUtilsController::exportDocumentationAction
936
nodesTypesExportTypeScriptPage:
1037
path: /export/typescript
1138
defaults:
12-
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesExportController::exportTypeScriptDeclarationAction
39+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesUtilsController::exportTypeScriptDeclarationAction

0 commit comments

Comments
 (0)