diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/JsonEncodeViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/JsonEncodeViewHelper.php deleted file mode 100644 index 88b47199d481084f00ada8576de43d692faa02f6..0000000000000000000000000000000000000000 --- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/JsonEncodeViewHelper.php +++ /dev/null @@ -1,60 +0,0 @@ -<?php -namespace TYPO3\CMS\Extensionmanager\ViewHelpers\Format; - -/* - * This file is part of the TYPO3 CMS project. - * - * It is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License, either version 2 - * of the License, or any later version. - * - * For the full copyright and license information, please read the - * LICENSE.txt file that was distributed with this source code. - * - * The TYPO3 project - inspiring people to share! - */ - -use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; -use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; -use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic; - -/** - * Wrapper for PHPs json_encode function. - * - * @see http://www.php.net/manual/en/function.json-encode.php - * @internal - */ -class JsonEncodeViewHelper extends AbstractViewHelper -{ - use CompileWithContentArgumentAndRenderStatic; - - /** - * Rendered children is expected to be an array or object, which cannot be passed through htmlspecialchars. - * - * @var bool - */ - protected $escapeChildren = false; - - /** - * Initialize arguments - */ - public function initializeArguments() - { - parent::initializeArguments(); - $this->registerArgument('additionalAttributes', 'array', 'Additional tag attributes. They will be added directly to the resulting HTML tag.'); - } - - /** - * Replaces newline characters by HTML line breaks. - * - * @param array $arguments - * @param \Closure $renderChildrenClosure - * @param RenderingContextInterface $renderingContext - * - * @return string the altered string. - */ - public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext) - { - return json_encode((array) $renderChildrenClosure()); - } -} diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/Download/InstallFromTer.json b/typo3/sysext/extensionmanager/Resources/Private/Templates/Download/InstallFromTer.json index eae0355e2f832d721844fc63522c9826c4ab9ff5..5767379e66af126d1e423679bc513d62d0a08dc9 100644 --- a/typo3/sysext/extensionmanager/Resources/Private/Templates/Download/InstallFromTer.json +++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/Download/InstallFromTer.json @@ -1,10 +1 @@ -{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers} -<f:format.raw><em:format.jsonEncode additionalAttributes="{ - result: result, - extension: extension.extensionKey, - installationTypeLanguageKey: installationTypeLanguageKey, - errorCount: '{f:count(subject: unresolvedDependencies)}', - errorTitle: '{f:translate(key: \'downloadExtension.dependencies.errorTitle\')}', - errorMessage: '{f:render(partial: \'List/UnresolvedDependencies\', arguments: \'{_all}\')}', - skipDependencyUri: '{f:uri.action(action: \'installExtensionWithoutSystemDependencyCheck\', format: \'json\', arguments: \'{extension: extension}\')}' -}" /></f:format.raw> \ No newline at end of file +{result -> f:format.json() -> f:format.raw()} \ No newline at end of file