@@ -60,14 +60,12 @@ class PageRenderer implements SingletonInterface
6060 */
6161 protected Locale $ locale ;
6262
63- // Arrays containing associative array for the included files
63+ // Arrays containing associative arrays for the included files
6464 /**
6565 * @var array<string, array>
6666 */
6767 protected array $ jsFiles = [];
68- protected array $ jsFooterFiles = [];
6968 protected array $ jsLibs = [];
70- protected array $ jsFooterLibs = [];
7169
7270 /**
7371 * @var array<string, array>
@@ -101,7 +99,6 @@ class PageRenderer implements SingletonInterface
10199 * @var array<string, array>
102100 */
103101 protected array $ jsInline = [];
104- protected array $ jsFooterInline = [];
105102
106103 /**
107104 * @var array<string, array>
@@ -227,9 +224,7 @@ protected function reset(): void
227224 $ this ->templateFile = 'EXT:core/Resources/Private/Templates/PageRenderer.html ' ;
228225 $ this ->bodyContent = '' ;
229226 $ this ->jsFiles = [];
230- $ this ->jsFooterFiles = [];
231227 $ this ->jsInline = [];
232- $ this ->jsFooterInline = [];
233228 $ this ->jsLibs = [];
234229 $ this ->cssFiles = [];
235230 $ this ->cssInline = [];
@@ -1888,18 +1883,19 @@ protected function doConcatenateJavaScript()
18881883 }
18891884 if (!empty ($ GLOBALS ['TYPO3_CONF_VARS ' ]['FE ' ]['jsConcatenateHandler ' ])) {
18901885 // use external concatenation routine
1886+ // @todo: $jsFooterFiles can be removed once the hook is adapted / replaced
1887+ $ jsFooterFiles = [];
18911888 $ params = [
18921889 'jsLibs ' => &$ this ->jsLibs ,
18931890 'jsFiles ' => &$ this ->jsFiles ,
1894- 'jsFooterFiles ' => &$ this -> jsFooterFiles ,
1891+ 'jsFooterFiles ' => &$ jsFooterFiles ,
18951892 'headerData ' => &$ this ->headerData ,
18961893 'footerData ' => &$ this ->footerData ,
18971894 ];
18981895 GeneralUtility::callUserFunction ($ GLOBALS ['TYPO3_CONF_VARS ' ]['FE ' ]['jsConcatenateHandler ' ], $ params , $ this );
18991896 } else {
19001897 $ this ->jsLibs = $ this ->resourceCompressor ->concatenateJsFiles ($ this ->jsLibs );
19011898 $ this ->jsFiles = $ this ->resourceCompressor ->concatenateJsFiles ($ this ->jsFiles );
1902- $ this ->jsFooterFiles = $ this ->resourceCompressor ->concatenateJsFiles ($ this ->jsFooterFiles );
19031899 }
19041900 }
19051901
@@ -1978,12 +1974,14 @@ protected function doCompressJavaScript()
19781974 }
19791975 if (!empty ($ GLOBALS ['TYPO3_CONF_VARS ' ]['FE ' ]['jsCompressHandler ' ])) {
19801976 // Use external compression routine
1977+ // @todo: $jsFooterFiles and $jsFooterInline and $jsFooterLibs can be removed once the hook is adapted / replaced
1978+ $ jsFooterFiles = $ jsFooterInline = [];
19811979 $ params = [
19821980 'jsInline ' => &$ this ->jsInline ,
1983- 'jsFooterInline ' => &$ this -> jsFooterInline ,
1981+ 'jsFooterInline ' => &$ jsFooterInline ,
19841982 'jsLibs ' => &$ this ->jsLibs ,
19851983 'jsFiles ' => &$ this ->jsFiles ,
1986- 'jsFooterFiles ' => &$ this -> jsFooterFiles ,
1984+ 'jsFooterFiles ' => &$ jsFooterFiles ,
19871985 'headerData ' => &$ this ->headerData ,
19881986 'footerData ' => &$ this ->footerData ,
19891987 ];
@@ -1997,7 +1995,6 @@ protected function doCompressJavaScript()
19971995 }
19981996 $ this ->jsLibs = $ this ->resourceCompressor ->compressJsFiles ($ this ->jsLibs );
19991997 $ this ->jsFiles = $ this ->resourceCompressor ->compressJsFiles ($ this ->jsFiles );
2000- $ this ->jsFooterFiles = $ this ->resourceCompressor ->compressJsFiles ($ this ->jsFooterFiles );
20011998 }
20021999 }
20032000
@@ -2043,17 +2040,19 @@ protected function executePreRenderHook()
20432040 if (!$ hooks ) {
20442041 return ;
20452042 }
2043+ // @todo: $jsFooterFiles and $jsFooterInline and $jsFooterLibs can be removed once the hook is adapted / replaced
2044+ $ jsFooterFiles = $ jsFooterLibs = $ jsFooterInline = [];
20462045 $ params = [
20472046 'jsLibs ' => &$ this ->jsLibs ,
2048- 'jsFooterLibs ' => &$ this -> jsFooterLibs ,
2047+ 'jsFooterLibs ' => &$ jsFooterLibs ,
20492048 'jsFiles ' => &$ this ->jsFiles ,
2050- 'jsFooterFiles ' => &$ this -> jsFooterFiles ,
2049+ 'jsFooterFiles ' => &$ jsFooterFiles ,
20512050 'cssLibs ' => &$ this ->cssLibs ,
20522051 'cssFiles ' => &$ this ->cssFiles ,
20532052 'headerData ' => &$ this ->headerData ,
20542053 'footerData ' => &$ this ->footerData ,
20552054 'jsInline ' => &$ this ->jsInline ,
2056- 'jsFooterInline ' => &$ this -> jsFooterInline ,
2055+ 'jsFooterInline ' => &$ jsFooterInline ,
20572056 'cssInline ' => &$ this ->cssInline ,
20582057 ];
20592058 foreach ($ hooks as $ hook ) {
@@ -2070,17 +2069,19 @@ protected function executeRenderPostTransformHook()
20702069 if (!$ hooks ) {
20712070 return ;
20722071 }
2072+ // @todo: $jsFooterFiles and $jsFooterInline and $jsFooterLibs can be removed once the hook is adapted / replaced
2073+ $ jsFooterFiles = $ jsFooterLibs = $ jsFooterInline = [];
20732074 $ params = [
20742075 'jsLibs ' => &$ this ->jsLibs ,
2075- 'jsFooterLibs ' => &$ this -> jsFooterLibs ,
2076+ 'jsFooterLibs ' => &$ jsFooterLibs ,
20762077 'jsFiles ' => &$ this ->jsFiles ,
2077- 'jsFooterFiles ' => &$ this -> jsFooterFiles ,
2078+ 'jsFooterFiles ' => &$ jsFooterFiles ,
20782079 'cssLibs ' => &$ this ->cssLibs ,
20792080 'cssFiles ' => &$ this ->cssFiles ,
20802081 'headerData ' => &$ this ->headerData ,
20812082 'footerData ' => &$ this ->footerData ,
20822083 'jsInline ' => &$ this ->jsInline ,
2083- 'jsFooterInline ' => &$ this -> jsFooterInline ,
2084+ 'jsFooterInline ' => &$ jsFooterInline ,
20842085 'cssInline ' => &$ this ->cssInline ,
20852086 ];
20862087 foreach ($ hooks as $ hook ) {
0 commit comments