Skip to content

Commit 3a5a3ec

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

59 files changed

Lines changed: 1395 additions & 1067 deletions

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: 1 addition & 3 deletions
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.1', '8.2', '8.3']
22+
php-version: ['8.2', '8.3']
2323
steps:
2424
- uses: shivammathur/setup-php@v2
2525
with:
@@ -35,7 +35,5 @@ 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
4038
- name: Run PHPStan
4139
run: vendor/bin/phpstan analyse --no-progress -c phpstan.neon

Makefile

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

composer.json

Lines changed: 11 additions & 14 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.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.*"
22+
"php": ">=8.2",
23+
"roadiz/compat-bundle": "2.4.*",
24+
"roadiz/core-bundle": "2.4.*",
25+
"roadiz/openid": "2.4.*",
26+
"roadiz/rozier": "2.4.*",
27+
"symfony/framework-bundle": "6.4.*"
2828
},
2929
"require-dev": {
3030
"php-coveralls/php-coveralls": "^2.4",
3131
"phpstan/phpstan": "^1.5.3",
32-
"phpstan/phpstan-symfony": "^1.1.8",
32+
"phpstan/phpdoc-parser": "<2",
3333
"phpstan/phpstan-doctrine": "^1.3",
34-
"squizlabs/php_codesniffer": "^3.5"
34+
"phpstan/phpstan-symfony": "^1.1.8"
3535
},
3636
"config": {
3737
"optimize-autoloader": true,
@@ -48,15 +48,12 @@
4848
"autoload": {
4949
"psr-4": {
5050
"RZ\\Roadiz\\RozierBundle\\": "src/"
51-
},
52-
"files": [
53-
"deprecated.php"
54-
]
51+
}
5552
},
5653
"extra": {
5754
"branch-alias": {
58-
"dev-main": "2.3.x-dev",
59-
"dev-develop": "2.4.x-dev"
55+
"dev-main": "2.4.x-dev",
56+
"dev-develop": "2.5.x-dev"
6057
}
6158
}
6259
}

config/routing.yaml

Lines changed: 1 addition & 1 deletion
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::indexAction
19+
controller: RZ\Roadiz\RozierBundle\Controller\PingController::pingAction
2020

2121
# CACHES
2222
deleteDoctrineCache:

config/routing/ajax.yml

Lines changed: 3 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-
searchNodesSourcesAjax:
14-
path: /nodes-sources/search
13+
searchAjax:
14+
path: /search
1515
methods: [GET]
1616
defaults:
17-
_controller: Themes\Rozier\AjaxControllers\AjaxSearchNodesSourcesController::searchAction
17+
_controller: Themes\Rozier\AjaxControllers\AjaxSearchController::searchAction
1818
_format: json
1919
nodesStatusesAjax:
2020
path: /nodes/statuses

config/routing/login.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,16 @@ 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/nodes.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@ nodesUndeletePage:
130130
requirements: { nodeId : "[0-9]+" }
131131

132132
nodesExportAllCsvPage:
133-
path: /export/csv/{translationId}
133+
path: /export/all-{translationId}.csv
134134
defaults:
135135
_controller: Themes\Rozier\Controllers\Nodes\ExportController::exportAllAction
136136
requirements:
137137
translationId : "[0-9]+"
138138

139139
nodesExportNodeCsvPage:
140-
path: /export/{parentNodeId}/csv/{translationId}
140+
path: /export/node-{parentNodeId}-{translationId}.csv
141141
defaults:
142142
_controller: Themes\Rozier\Controllers\Nodes\ExportController::exportAllAction
143143
requirements:

config/services.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ services:
5858
Themes\Rozier\Explorer\UsersProvider:
5959
public: true
6060

61+
RZ\Roadiz\CoreBundle\Explorer\ExplorerItemFactoryInterface:
62+
class: Themes\Rozier\Explorer\ExplorerItemFactory
63+
autowire: true
64+
autoconfigure: true
65+
6166
# Since symfony/dependency-injection 5.1: The "Psr\Container\ContainerInterface" autowiring alias is deprecated.
6267
# Define it explicitly in your app if you want to keep using it.
6368
Themes\Rozier\Forms\NodeSource\NodeSourceProviderType:
@@ -87,6 +92,7 @@ services:
8792
arguments:
8893
- '@?roadiz_rozier.open_id.discovery'
8994
- '@security.csrf.token_manager'
95+
- '@RZ\Roadiz\Random\TokenGeneratorInterface'
9096
- '%roadiz_rozier.open_id.hosted_domain%'
9197
- '%roadiz_rozier.open_id.oauth_client_id%'
9298
- '%roadiz_rozier.open_id.scopes%'

deprecated.php

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

phpcs.xml.dist

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

0 commit comments

Comments
 (0)