Skip to content

[TASK] TYPO3 9 compatibility #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhuf wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[TASK] TYPO3 9 compatibility #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fc6424
[TASK] TYPO3 9 compatibility
SomeBdyElse Sep 2, 2019
1728238
[TASK] Fix HBS ViewHelper for v9
dhuf Sep 3, 2019
ba6b9cb
[TASK] Avoid php warnings for array_merge_recursive
SomeBdyElse Nov 7, 2019
92a6ce4
[TASK] Replace deprecated PATH_site
dhuf Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions Classes/Engine/HandlebarsEngine.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
use JFB\Handlebars\HelperRegistry;
use LightnCandy\LightnCandy;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Utility\GeneralUtility;

/**
Expand Down Expand Up @@ -84,16 +85,16 @@ class HandlebarsEngine
*
* @param $settings array
*/
public function __construct($settings)
public function __construct(array $settings)
{
$this->settings = $settings;
$this->settings = $settings ?: [];
$this->extensionKey = $settings['extensionKey'];
$this->controllerName = $settings['controllerName'];
$this->actionName = $settings['actionName'];
$this->templatePath = $settings['templatePath'];
$this->dataProviders = $settings['dataProviders'];
$this->additionalData = $settings['additionalData'];
$this->tempPath = PATH_site . $settings['tempPath'];
$this->dataProviders = $settings['dataProviders'] ?: [];
$this->additionalData = $settings['additionalData'] ?: [];
$this->tempPath = Environment::getPublicPath() . '/' . $settings['tempPath'];
}

/**
Expand Down Expand Up @@ -121,6 +122,10 @@ public function getData()
$data = array_merge_recursive($data, $dataProvider->provide());
}

if (! is_array($this->additionalData)) {
return $data;
}

return array_merge_recursive($data, $this->additionalData);
}

Expand Down
30 changes: 23 additions & 7 deletions Classes/ViewHelpers/RenderViewHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,30 +50,46 @@
* }" />
* </html>
* </code>
*
*/


class RenderViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
{
/**
* As this ViewHelper renders HTML, the output must not be escaped.
*
* @var boolean
* @var bool
*/
protected $escapeOutput = false;


public function initializeArguments()
{
parent::initializeArguments();
$this->registerArgument('template', 'string', 'template path', true);
$this->registerArgument('settings', 'string', 'extension settings', true);
$this->registerArgument('data', 'array', 'Passed data array');
}

/**
* @param string $template
* @param array $settings
* @param array $data
* @return string
*/
public function render($template, array $settings, array $data = []): string
public function render(): string
{
$template = $this->arguments['template'];
$settings = $this->arguments['settings'];
$data = $this->arguments['data'];

/** @var HandlebarsView $handlebarsView */
$handlebarsView = GeneralUtility::makeInstance(HandlebarsView::class);
$handlebarsView->setControllerContext($this->controllerContext);

// @todo fix for TYPO3 v8 can be removed later
if ($this->controllerContext !== null) {
$controllerContext = $this->controllerContext;
} elseif (method_exists($this->renderingContext, 'getControllerContext')) {
$controllerContext = $this->renderingContext->getControllerContext();
}
$handlebarsView->setControllerContext($controllerContext);

if (
isset($settings['handlebars'])
Expand Down
5 changes: 3 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "JFB/Handlebars",
"name": "jfb/handlebars",
"description": "",
"type": "typo3-cms-extension",
"version": "1.0.0",
"version": "1.0.1",
"homepage": "",
"license": "GPL-2.0+",
"preferred-install": "dist",
Expand All @@ -19,6 +19,7 @@
},
"require": {
"php": "^7.0",
"typo3/cms-core": "^8.7.13|| ^9.5.0",
"zordius/lightncandy": "^1.1",
"sinso/translationapi": "^2.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
'constraints' => [
'depends' => [
'php' => '7.0.0-0.0.0',
'typo3' => '7.6.*',
'typo3' => '7.6.*-9.5.99',
'extbase' => '',
],
'conflicts' => [
Expand Down