[TASK] Update CGL

Author: derhansen

.github/workflows/CodeQuality.yml

@@ -12,11 +12,13 @@ jobs:
         env:
           - { php: 8.1}
           - { php: 8.2}
+          - { php: 8.3}
+          - { php: 8.4}
 
     env: ${{ matrix.env }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
 
       - name: Set up PHP Version
         uses: shivammathur/setup-php@v2

Classes/Controller/PasswordController.php

@@ -83,8 +83,8 @@ public function updateAction(ChangePassword $changePassword): ResponseInterface
 
         $this->eventDispatcher->dispatch(new AfterPasswordUpdatedEvent($changePassword, $this));
 
-        if (isset($this->settings['afterPasswordChangeAction']) &&
-            $this->settings['afterPasswordChangeAction'] === 'redirect') {
+        if (isset($this->settings['afterPasswordChangeAction'])
+            && $this->settings['afterPasswordChangeAction'] === 'redirect') {
             $this->addFlashMessage(
                 LocalizationUtility::translate('passwordUpdated', 'FeChangePwd'),
                 LocalizationUtility::translate('passwordUpdated.title', 'FeChangePwd')

Classes/Middleware/ForcePasswordChangeRedirect.php

@@ -51,9 +51,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $settings = $this->settingsService->getSettings($request);
 
         // Early return if page is excluded from redirect or user is not forced to change the password
-        if (!$this->frontendUserService->mustChangePassword($frontendUser->user) ||
-            $this->pageAccessService->isExcludePage($pageUid, $settings) ||
-            ($request->getQueryParams()['tx_felogin_login']['action'] ?? '') === 'login'
+        if (!$this->frontendUserService->mustChangePassword($frontendUser->user)
+            || $this->pageAccessService->isExcludePage($pageUid, $settings)
+            || ($request->getQueryParams()['tx_felogin_login']['action'] ?? '') === 'login'
         ) {
             return $handler->handle($request);
         }
@@ -72,8 +72,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         if ($mustRedirect) {
             $typoScriptFrontendController->calculateLinkVars($request->getQueryParams());
             $parameter = $this->pageAccessService->getRedirectPid($settings);
-            if (MathUtility::canBeInterpretedAsInteger($pageUid) &&
-                $typoScriptFrontendController->getPageArguments()->getPageType()
+            if (MathUtility::canBeInterpretedAsInteger($pageUid)
+                && $typoScriptFrontendController->getPageArguments()->getPageType()
             ) {
                 $parameter .= ',' . $typoScriptFrontendController->getPageArguments()->getPageType();
             }

Classes/Validation/Validator/ChangePasswordValidator.php

@@ -54,9 +54,9 @@ protected function isValid($value): void
         $settings = $this->settingsService->getSettings($this->getRequest());
 
         // Early return if old password is required, but either empty or not valid
-        if (isset($settings['requireCurrentPassword']['enabled']) &&
-            (bool)$settings['requireCurrentPassword']['enabled'] &&
-            !$value->getSkipCurrentPasswordCheck()
+        if (isset($settings['requireCurrentPassword']['enabled'])
+            && (bool)$settings['requireCurrentPassword']['enabled']
+            && !$value->getSkipCurrentPasswordCheck()
         ) {
             $requireCurrentPasswordResult = $this->evaluateRequireCurrentPassword($value);
             if ($requireCurrentPasswordResult === false) {
@@ -65,9 +65,9 @@ protected function isValid($value): void
         }
 
         // Early return if change password code is required, but either empty or not valid
-        if (isset($settings['requireChangePasswordCode']['enabled']) &&
-            (bool)$settings['requireChangePasswordCode']['enabled'] &&
-            $this->evaluateChangePasswordCode($value) === false
+        if (isset($settings['requireChangePasswordCode']['enabled'])
+            && (bool)$settings['requireChangePasswordCode']['enabled']
+            && $this->evaluateChangePasswordCode($value) === false
         ) {
             return;
         }
@@ -136,8 +136,8 @@ protected function evaluateRequireCurrentPassword(ChangePassword $changePassword
             );
         }
 
-        if ($oldPasswordEmpty === false &&
-            !$this->oldPasswordService->checkEqualsOldPassword(
+        if ($oldPasswordEmpty === false
+            && !$this->oldPasswordService->checkEqualsOldPassword(
                 $changePassword->getCurrentPassword(),
                 $this->getFrontendUser()->user['password']
             )
@@ -168,10 +168,10 @@ protected function evaluateChangePasswordCode(ChangePassword $changePassword): b
             return false;
         }
 
-        if ($currentHash === '' ||
-            $expirationTime === 0 ||
-            $expirationTime < time() ||
-            !hash_equals($currentHash, $calculatedHash)
+        if ($currentHash === ''
+            || $expirationTime === 0
+            || $expirationTime < time()
+            || !hash_equals($currentHash, $calculatedHash)
         ) {
             $this->addError(
                 $this->localizationService->translate('changePasswordCode.invalidOrExpired'),

Configuration/TCA/Overrides/tt_content.php

@@ -18,8 +18,8 @@
 /**
  * Remove unused fields
  */
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['fechangepwd_pi1'] =
-    'layout,recursive,pages';
+$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['fechangepwd_pi1']
+    = 'layout,recursive,pages';
 
 /**
  * Default TypoScript