Skip to content

Commit c0c7bf9

Browse files
authored
[TASK] Use register attribute in Collector (#686)
TYPO3 v14 remodels TypoScript 'register' handling. The patch adds this to the FE testing related Collector class with a fallback layer for earlier TYPO3 versions. Related: https://forge.typo3.org/issues/107625
1 parent 350c6ae commit c0c7bf9

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Classes/Core/Functional/Framework/Frontend/Collector.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,13 @@ private function getTableFields(string $tableName, ServerRequestInterface $reque
142142

143143
private function getCurrentWatcherValue(ServerRequestInterface $request): ?string
144144
{
145-
$watcherValue = null;
146-
$tsfe = $request->getAttribute('frontend.controller');
147-
if (isset($tsfe->register['watcher'])) {
148-
$watcherValue = $tsfe->register['watcher'];
145+
$registerStack = $request->getAttribute('frontend.register.stack');
146+
if ($registerStack !== null) {
147+
return $registerStack->current()->get('watcher');
149148
}
150-
return $watcherValue;
149+
// @deprecated: TYPO3 <v14 b/w compat. Remove $tsfe fallback and if clause above when v13 compat is removed.
150+
$tsfe = $request->getAttribute('frontend.controller');
151+
return $tsfe->register['watcher'] ?? null;
151152
}
152153

153154
private function getRenderer(): Renderer

0 commit comments

Comments
 (0)