1 Commits

Author SHA1 Message Date
d6723fb143 chore(symfony) #57 : bump symfony to version 6.4 and fix deprecations
Some checks failed
Cadoles/hydra-sql/pipeline/pr-develop There was a failure building this commit
2025-07-10 11:41:04 +02:00
8 changed files with 15 additions and 22 deletions

2
Jenkinsfile vendored
View File

@ -4,7 +4,7 @@
// Utilisation du pipeline partagé pour les applications Symfony de Cadoles // Utilisation du pipeline partagé pour les applications Symfony de Cadoles
// Le nom de l'image Docker passée en paramètre vous permet de préciser l'environnement de test // Le nom de l'image Docker passée en paramètre vous permet de préciser l'environnement de test
// de votre application Symfony // de votre application Symfony
symfonyAppPipeline('ubuntu:25.04', [ symfonyAppPipeline('ubuntu:22.04', [
'hooks': [ 'hooks': [
// Run docker image build, verification and publication stages // Run docker image build, verification and publication stages
'postSymfonyAppPipeline': { 'postSymfonyAppPipeline': {

View File

@ -26,6 +26,7 @@
"symfony/translation": "6.4.*", "symfony/translation": "6.4.*",
"symfony/twig-bundle": "6.4.*", "symfony/twig-bundle": "6.4.*",
"symfony/validator": "6.4.*", "symfony/validator": "6.4.*",
"symfony/web-profiler-bundle": "6.4.*",
"symfony/webpack-encore-bundle": "^1.16", "symfony/webpack-encore-bundle": "^1.16",
"symfony/yaml": "6.4.*" "symfony/yaml": "6.4.*"
}, },
@ -80,7 +81,6 @@
}, },
"require-dev": { "require-dev": {
"rector/rector": "^2.1", "rector/rector": "^2.1",
"symfony/debug-bundle": "6.4.*", "symfony/debug-bundle": "6.4.*"
"symfony/web-profiler-bundle": "6.4.*"
} }
} }

12
composer.lock generated
View File

@ -6206,16 +6206,16 @@
}, },
{ {
"name": "rector/rector", "name": "rector/rector",
"version": "2.1.1", "version": "2.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/rectorphp/rector.git", "url": "https://github.com/rectorphp/rector.git",
"reference": "d0917c069bb0d9bb06ed111cf052510f609015a4" "reference": "d513dea45a94394b660e15c155d1fa27826f8e30"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/rectorphp/rector/zipball/d0917c069bb0d9bb06ed111cf052510f609015a4", "url": "https://api.github.com/repos/rectorphp/rector/zipball/d513dea45a94394b660e15c155d1fa27826f8e30",
"reference": "d0917c069bb0d9bb06ed111cf052510f609015a4", "reference": "d513dea45a94394b660e15c155d1fa27826f8e30",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6254,7 +6254,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/rectorphp/rector/issues", "issues": "https://github.com/rectorphp/rector/issues",
"source": "https://github.com/rectorphp/rector/tree/2.1.1" "source": "https://github.com/rectorphp/rector/tree/2.1.0"
}, },
"funding": [ "funding": [
{ {
@ -6262,7 +6262,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2025-07-10T11:31:31+00:00" "time": "2025-06-24T20:26:57+00:00"
}, },
{ {
"name": "symfony/debug-bundle", "name": "symfony/debug-bundle",

View File

@ -3,7 +3,6 @@
declare(strict_types=1); declare(strict_types=1);
use Rector\Config\RectorConfig; use Rector\Config\RectorConfig;
use Rector\Renaming\Rector\Class_\RenameAttributeRector;
use Rector\Symfony\Set\SymfonySetList; use Rector\Symfony\Set\SymfonySetList;
return static function (RectorConfig $rectorConfig): void { return static function (RectorConfig $rectorConfig): void {
@ -16,13 +15,7 @@ return static function (RectorConfig $rectorConfig): void {
SymfonySetList::SYMFONY_61, SymfonySetList::SYMFONY_61,
SymfonySetList::SYMFONY_62, SymfonySetList::SYMFONY_62,
SymfonySetList::SYMFONY_63, SymfonySetList::SYMFONY_63,
SymfonySetList::SYMFONY_64,
SymfonySetList::SYMFONY_CODE_QUALITY, SymfonySetList::SYMFONY_CODE_QUALITY,
SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION, SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,
]); ]);
$rectorConfig->importShortClasses(false);
$rectorConfig->skip([
RenameAttributeRector::class
]);
}; };

View File

@ -20,8 +20,7 @@ class MainController extends AbstractController
public function __construct( public function __construct(
private readonly RequestStack $requestStack, private readonly RequestStack $requestStack,
private readonly HydraService $hydra, private readonly HydraService $hydra,
private readonly Client $client, private readonly Client $client
private readonly SQLLoginRequest $sqlLoginRequest
){ ){
} }
@ -41,7 +40,7 @@ class MainController extends AbstractController
} }
#[Route('/connect/login-accept', name: 'app_login_accept', methods: ['GET'])] #[Route('/connect/login-accept', name: 'app_login_accept', methods: ['GET'])]
public function loginAccept(): RedirectResponse public function loginAccept(SQLLoginRequest $sqlLoginRequest): RedirectResponse
{ {
$user = $this->getUser(); $user = $this->getUser();
@ -55,7 +54,7 @@ class MainController extends AbstractController
$subject = $user->getLogin(); $subject = $user->getLogin();
$subjectRewriteExpression = $this->sqlLoginRequest->getSubjectRewriteExpression(); $subjectRewriteExpression = $sqlLoginRequest->getSubjectRewriteExpression();
if (null != $subjectRewriteExpression) { if (null != $subjectRewriteExpression) {
$expressionLanguage = new ExpressionLanguage(); $expressionLanguage = new ExpressionLanguage();

View File

@ -39,7 +39,7 @@ class HydraService extends AbstractController
// si le challenge est validé par hydra, on le stocke en session pour l'utiliser par la suite et on redirige vers une route interne protégée qui va déclencher l'identification FranceConnect // si le challenge est validé par hydra, on le stocke en session pour l'utiliser par la suite et on redirige vers une route interne protégée qui va déclencher l'identification FranceConnect
$this->requestStack->getSession()->set('challenge', $loginRequestInfo['challenge']); $this->requestStack->getSession()->set('challenge', $loginRequestInfo['challenge']);
return new RedirectResponse($this->baseUrl.'/login'); return new RedirectResponse($this->baseUrl.'/connect/login-accept');
} }
public function handleConsentRequest(Request $request): RedirectResponse public function handleConsentRequest(Request $request): RedirectResponse

View File

@ -60,7 +60,7 @@ class SQLLoginUserAuthenticator extends AbstractLoginFormAuthenticator
public function authenticate(Request $request): SelfValidatingPassport public function authenticate(Request $request): SelfValidatingPassport
{ {
$form = $request->request->all(key: 'login'); $form = $request->request->all(key: 'login');
$login = \strtolower($form['login']); $login = $form['login'];
$plaintextPassword = $form['password']; $plaintextPassword = $form['password'];
$session = $request->getSession(); $session = $request->getSession();
try { try {

View File

@ -28,6 +28,7 @@ class SQLLoginService extends AbstractController
public function fetchPasswordAndDatas(string $login): array public function fetchPasswordAndDatas(string $login): array
{ {
$dataRequest = $this->sqlLoginRequest->getDatasRequest(); $dataRequest = $this->sqlLoginRequest->getDatasRequest();
$login = \strtolower($login);
$datas = $this->executeRequestWithLogin($dataRequest, $login); $datas = $this->executeRequestWithLogin($dataRequest, $login);
return $datas; return $datas;