Skip to content
Snippets Groups Projects
Commit f43979e7 authored by Benni Mack's avatar Benni Mack Committed by Christian Kuhn
Browse files

[!!!][TASK] Remove TypoScript option page.includeCSS/includeCSSLibs.import 

The option to use the @import syntax in TypoScript
"page.includeCSS" and "page.includeCSSLibs"
(.import subproperty per CSS file) will not work anymore.

Resolves: #96118
Related: #95349
Releases: master
Change-Id: Ibcbcf091eca00d061cc79b551f87995ddf47c1a0
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72338


Tested-by: default avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: default avatarcore-ci <typo3@b13.com>
Tested-by: default avatarStefan Bürk <stefan@buerk.tech>
Tested-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: default avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: default avatarStefan Bürk <stefan@buerk.tech>
Reviewed-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
parent 139d92bd
No related merge requests found
Hide whitespace changes
Inline Side-by-side
typo3/sysext/core/Documentation/Changelog/12.0/Breaking-96107-DeprecatedFunctionalityRemoved.rst
+ 3
− 2
View file @ f43979e7
......@@ -73,9 +73,10 @@ The following ViewHelpers have been changed or removed:
- :html:`<be:moduleLayout.button.linkButton>` removed
- :html:`<be:moduleLayout.button.shortcutButton>` removed
The following TypoScript options have been dropped or adapted:
The following TypoScript options have been removed or adapted:
- `typo.script.option`
- `page.includeCSS.myfile*.import`
- `page.includeCSSLibs.myfile*.import`
The following constants have been dropped:
......
typo3/sysext/frontend/Classes/Http/RequestHandler.php
+ 26
− 48
View file @ f43979e7
......@@ -443,31 +443,20 @@ class RequestHandler implements RequestHandlerInterface
}
}
if ($ss) {
if ($cssFileConfig['import'] ?? false) {
// @deprecated will be removed in TYPO3 v12.0.
if (!($cssFileConfig['external'] ?? false) && $ss[0] !== '/') {
// To fix MSIE 6 that cannot handle these as relative paths (according to Ben v Ende)
$ss = GeneralUtility::dirname(GeneralUtility::getIndpEnv('SCRIPT_NAME')) . '/' . $ss;
}
trigger_error('Using @import via "page.includeCSS.my-identifier.import = 1" within TypoScript will be removed in TYPO3 v12.0.', E_USER_DEPRECATED);
$cssMedia = !empty($cssFileConfig['media']) ? ' ' . htmlspecialchars($cssFileConfig['media']) : '';
$pageRenderer->addCssInlineBlock('import_' . $key, '@import url("' . htmlspecialchars($ss) . '")' . $cssMedia . ';', empty($cssFileConfig['disableCompression']), (bool)($cssFileConfig['forceOnTop'] ?? false));
} else {
$pageRenderer->addCssFile(
$ss,
($cssFileConfig['alternate'] ?? false) ? 'alternate stylesheet' : 'stylesheet',
($cssFileConfig['media'] ?? false) ?: 'all',
($cssFileConfig['title'] ?? false) ?: '',
empty($cssFileConfig['external']) && empty($cssFileConfig['inline']) && empty($cssFileConfig['disableCompression']),
(bool)($cssFileConfig['forceOnTop'] ?? false),
$cssFileConfig['allWrap'] ?? '',
($cssFileConfig['excludeFromConcatenation'] ?? false) || ($cssFileConfig['inline'] ?? false),
$cssFileConfig['allWrap.']['splitChar'] ?? '|',
(bool)($cssFileConfig['inline'] ?? false)
);
unset($cssFileConfig);
}
$pageRenderer->addCssFile(
$ss,
($cssFileConfig['alternate'] ?? false) ? 'alternate stylesheet' : 'stylesheet',
($cssFileConfig['media'] ?? false) ?: 'all',
($cssFileConfig['title'] ?? false) ?: '',
empty($cssFileConfig['external']) && empty($cssFileConfig['inline']) && empty($cssFileConfig['disableCompression']),
(bool)($cssFileConfig['forceOnTop'] ?? false),
$cssFileConfig['allWrap'] ?? '',
($cssFileConfig['excludeFromConcatenation'] ?? false) || ($cssFileConfig['inline'] ?? false),
$cssFileConfig['allWrap.']['splitChar'] ?? '|',
(bool)($cssFileConfig['inline'] ?? false)
);
}
unset($cssFileConfig);
}
}
}
......@@ -488,31 +477,20 @@ class RequestHandler implements RequestHandlerInterface
}
}
if ($ss) {
if ($cssFileConfig['import'] ?? false) {
// @deprecated will be removed in TYPO3 v12.0.
if (!($cssFileConfig['external'] ?? false) && $ss[0] !== '/') {
// To fix MSIE 6 that cannot handle these as relative paths (according to Ben v Ende)
$ss = GeneralUtility::dirname(GeneralUtility::getIndpEnv('SCRIPT_NAME')) . '/' . $ss;
}
trigger_error('Using @import via "page.includeCSSLibs.my-identifier.import = 1" within TypoScript will be removed in TYPO3 v12.0.', E_USER_DEPRECATED);
$cssMedia = !empty($cssFileConfig['media']) ? ' ' . htmlspecialchars($cssFileConfig['media']) : '';
$pageRenderer->addCssInlineBlock('import_' . $key, '@import url("' . htmlspecialchars($ss) . '")' . $cssMedia . ';', empty($cssFileConfig['disableCompression']), (bool)($cssFileConfig['forceOnTop'] ?? false));
} else {
$pageRenderer->addCssLibrary(
$ss,
($cssFileConfig['alternate'] ?? false) ? 'alternate stylesheet' : 'stylesheet',
($cssFileConfig['media'] ?? false) ?: 'all',
($cssFileConfig['title'] ?? false) ?: '',
empty($cssFileConfig['external']) && empty($cssFileConfig['inline']) && empty($cssFileConfig['disableCompression']),
(bool)($cssFileConfig['forceOnTop'] ?? false),
$cssFileConfig['allWrap'] ?? '',
($cssFileConfig['excludeFromConcatenation'] ?? false) || ($cssFileConfig['inline'] ?? false),
$cssFileConfig['allWrap.']['splitChar'] ?? '|',
(bool)($cssFileConfig['inline'] ?? false)
);
unset($cssFileConfig);
}
$pageRenderer->addCssLibrary(
$ss,
($cssFileConfig['alternate'] ?? false) ? 'alternate stylesheet' : 'stylesheet',
($cssFileConfig['media'] ?? false) ?: 'all',
($cssFileConfig['title'] ?? false) ?: '',
empty($cssFileConfig['external']) && empty($cssFileConfig['inline']) && empty($cssFileConfig['disableCompression']),
(bool)($cssFileConfig['forceOnTop'] ?? false),
$cssFileConfig['allWrap'] ?? '',
($cssFileConfig['excludeFromConcatenation'] ?? false) || ($cssFileConfig['inline'] ?? false),
$cssFileConfig['allWrap.']['splitChar'] ?? '|',
(bool)($cssFileConfig['inline'] ?? false)
);
}
unset($cssFileConfig);
}
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment