Merge branch 'staging'

MohsinQK · Jan 9, 2019 · 6ccd453 · 6ccd453
2 parents 54143df + d678a3b
commit 6ccd453
Show file tree

Hide file tree

Showing 27 changed files with 244 additions and 100 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
-Latest release: 5.1.0 (2018/10/02)
+Latest release: 5.1.1 (2019/01/09)
 
 All previous release change logs:
 
+* [5.1.1 (2019/01/09)](Documentation/Changelog/5.1.1.md) [Full list of changes](https://github.com/FluidTYPO3/vhs/compare/5.1.0...5.1.1)
 * [5.1.0 (2018/10/02)](Documentation/Changelog/5.1.0.md) [Full list of changes](https://github.com/FluidTYPO3/vhs/compare/5.0.1...5.1.0)
 * [5.0.1 (2018/06/21)](Documentation/Changelog/5.0.1.md) [Full list of changes](https://github.com/FluidTYPO3/vhs/compare/5.0.0...5.0.1)
 * [5.0.0 (2018/06/19)](Documentation/Changelog/5.0.0.md) [Full list of changes](https://github.com/FluidTYPO3/vhs/compare/4.4.0...5.0.0)

diff --git a/Classes/Traits/TagViewHelperTrait.php b/Classes/Traits/TagViewHelperTrait.php
@@ -127,7 +127,7 @@ protected function renderTag(
         $this->tag->addAttributes($attributes);
         $this->tag->forceClosingTag($forceClosingTag);
         if (null !== $content) {
-            $this->tag->setContent($content);
+            $this->tag->setContent($trimmedContent);
         }
         // process some attributes differently - if empty, remove the property:
         foreach ($nonEmptyAttributes as $propertyName) {

diff --git a/Classes/Traits/TemplateVariableViewHelperTrait.php b/Classes/Traits/TemplateVariableViewHelperTrait.php
@@ -87,7 +87,7 @@ protected static function renderChildrenWithVariableOrReturnInputStatic(
             $variables = [$as => $variable];
             $content = static::renderChildrenWithVariablesStatic(
                 $variables,
-                $renderingContext->getTemplateVariableContainer(),
+                $renderingContext->getVariableProvider(),
                 $renderChildrenClosure
             );
         }

diff --git a/Classes/Utility/CoreUtility.php b/Classes/Utility/CoreUtility.php
@@ -25,7 +25,10 @@ class CoreUtility
      */
     public static function getLanguageFlagIconPath()
     {
-        return ExtensionManagementUtility::extPath('core') . 'Resources/Public/Icons/Flags/SVG/';
+        if (version_compare(self::getCurrentCoreVersion(), 9.0, '<')) {
+            return ExtensionManagementUtility::extPath('core') . 'Resources/Public/Icons/Flags/PNG/';
+        }
+        return ExtensionManagementUtility::extPath('core') . 'Resources/Public/Icons/Flags/';
     }
 
     /**

diff --git a/Classes/Utility/ViewHelperUtility.php b/Classes/Utility/ViewHelperUtility.php
@@ -26,9 +26,6 @@ class ViewHelperUtility
      */
     public static function getVariableProviderFromRenderingContext(RenderingContextInterface $renderingContext)
     {
-        if (method_exists($renderingContext, 'getVariableProvider')) {
-            return $renderingContext->getVariableProvider();
-        }
-        return $renderingContext->getTemplateVariableContainer();
+        return $renderingContext->getVariableProvider();
     }
 }
diff --git a/Classes/ViewHelpers/Condition/Context/IsCliViewHelper.php b/Classes/ViewHelpers/Condition/Context/IsCliViewHelper.php
@@ -40,6 +40,6 @@ class IsCliViewHelper extends AbstractConditionViewHelper
      */
     protected static function evaluateCondition($arguments = null)
     {
-        return defined('TYPO3_climode');
+        return (bool) (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI);
     }
 }
diff --git a/Classes/ViewHelpers/Condition/Page/IsLanguageViewHelper.php b/Classes/ViewHelpers/Condition/Page/IsLanguageViewHelper.php
@@ -8,6 +8,9 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Database\Query\QueryBuilder;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper;
 
 /**
@@ -44,7 +47,20 @@ protected static function evaluateCondition($arguments = null)
         if (true === is_numeric($language)) {
             $languageUid = intval($language);
         } else {
-            $row = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('uid', 'sys_language', "title='" . $language . "'");
+            /** @var QueryBuilder $queryBuilder */
+            $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_language');
+
+            $queryBuilder->createNamedParameter($language, \PDO::PARAM_STR, ':title');
+
+            $row = $queryBuilder
+                ->select('uid')
+                ->from('sys_language')
+                ->where(
+                    $queryBuilder->expr()->eq('title', ':title')
+                )
+                ->execute()
+                ->fetch();
+
             if (false !== $row) {
                 $languageUid = intval($row['uid']);
             } else {

diff --git a/Classes/ViewHelpers/Condition/Variable/IssetViewHelper.php b/Classes/ViewHelpers/Condition/Variable/IssetViewHelper.php
@@ -73,7 +73,7 @@ public function render()
     protected static function evaluateCondition($arguments = null)
     {
         $renderingContext = static::$staticRenderingContext;
-        $variableProvider = method_exists($renderingContext, 'getVariableProvider') ? $renderingContext->getVariableProvider() : $renderingContext->getTemplateVariableContainer();
+        $variableProvider = $renderingContext->getVariableProvider();
         return $variableProvider->exists($arguments['name']);
     }
 

diff --git a/Classes/ViewHelpers/Content/AbstractContentViewHelper.php b/Classes/ViewHelpers/Content/AbstractContentViewHelper.php
@@ -251,19 +251,16 @@ protected static function renderRecord(array $row)
      */
     protected function executeSelectQuery($fields, $condition, $order, $limit)
     {
-        if (class_exists(ConnectionPool::class)) {
-            $queryBuilder = (new ConnectionPool())->getConnectionForTable('tt_content')->createQueryBuilder();
-            $queryBuilder->select($fields)->from('tt_content')->where($condition);
-            if ($order) {
-                $orderings = explode(' ', $order);
-                $queryBuilder->orderBy($orderings[0], $orderings[1]);
-            }
-            if ($limit) {
-                $queryBuilder->setMaxResults((integer) $limit);
-            }
-            return $queryBuilder->execute()->fetchAll();
+        $queryBuilder = (new ConnectionPool())->getConnectionForTable('tt_content')->createQueryBuilder();
+        $queryBuilder->select($fields)->from('tt_content')->where($condition);
+        if ($order) {
+            $orderings = explode(' ', $order);
+            $queryBuilder->orderBy($orderings[0], $orderings[1]);
         }
-        return $GLOBALS['TYPO3_DB']->exec_SELECTgetRows($fields, 'tt_content', $condition, '', $order, $limit);
+        if ($limit) {
+            $queryBuilder->setMaxResults((integer) $limit);
+        }
+        return $queryBuilder->execute()->fetchAll();
     }
 
     /**
@@ -273,11 +270,8 @@ protected function executeSelectQuery($fields, $condition, $order, $limit)
      */
     protected function generateSelectQuery($fields, $condition)
     {
-        if (class_exists(ConnectionPool::class)) {
-            $queryBuilder = (new ConnectionPool())->getConnectionForTable('tt_content')->createQueryBuilder();
-            $queryBuilder->select($fields)->from('tt_content')->where($condition);
-            return $queryBuilder->getSQL();
-        }
-        return $GLOBALS['TYPO3_DB']->SELECTquery($fields, 'tt_content', $condition);
+        $queryBuilder = (new ConnectionPool())->getConnectionForTable('tt_content')->createQueryBuilder();
+        $queryBuilder->select($fields)->from('tt_content')->where($condition);
+        return $queryBuilder->getSQL();
     }
 }
diff --git a/Classes/ViewHelpers/Content/InfoViewHelper.php b/Classes/ViewHelpers/Content/InfoViewHelper.php
@@ -9,6 +9,9 @@
  */
 
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
+use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Database\Query\QueryBuilder;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
 
@@ -80,11 +83,19 @@ public function render()
             } else {
                 $selectFields = '*';
             }
-            $record = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
-                $selectFields,
-                'tt_content',
-                sprintf('uid=%d', $contentUid)
-            );
+
+            /** @var QueryBuilder $queryBuilder */
+            $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tt_content');
+            $queryBuilder->createNamedParameter($contentUid, \PDO::PARAM_INT, ':uid');
+
+            $record = $queryBuilder
+                ->select($selectFields)
+                ->from('tt_content')
+                ->where(
+                    $queryBuilder->expr()->eq('uid', ':uid')
+                )
+                ->execute()
+                ->fetch();
 
             // Add the page overlay
             $languageUid = (integer) $GLOBALS['TSFE']->sys_language_uid;

diff --git a/Classes/ViewHelpers/Format/TidyViewHelper.php b/Classes/ViewHelpers/Format/TidyViewHelper.php
@@ -20,6 +20,11 @@ class TidyViewHelper extends AbstractViewHelper
 {
     use CompileWithContentArgumentAndRenderStatic;
 
+    /**
+     * @var boolean
+     */
+    protected $escapeOutput = false;
+
     /**
      * @return void
      */

diff --git a/Classes/ViewHelpers/Math/DivisionViewHelper.php b/Classes/ViewHelpers/Math/DivisionViewHelper.php
@@ -33,6 +33,9 @@ protected static function calculateAction($a, $b, array $arguments)
     {
         $aIsIterable = static::assertIsArrayOrIterator($a);
         $bIsIterable = static::assertIsArrayOrIterator($b);
+        if (false === $aIsIterable && $b === null && (boolean) $arguments['fail']) {
+            ErrorUtility::throwViewHelperException('Required argument "b" was not supplied', 1237823699);
+        }
         if (true === $aIsIterable && null === $b) {
             $a = static::arrayFromArrayOrTraversableOrCSVStatic($a);
             $sum = array_sum($a);
@@ -49,9 +52,6 @@ protected static function calculateAction($a, $b, array $arguments)
             }
             return $a;
         }
-        if ($b === null && (boolean) $arguments['fail']) {
-            ErrorUtility::throwViewHelperException('Required argument "b" was not supplied', 1237823699);
-        }
         return (0 <> $b ? $a / $b : $a);
     }
 }
diff --git a/Classes/ViewHelpers/Math/MaximumViewHelper.php b/Classes/ViewHelpers/Math/MaximumViewHelper.php
@@ -41,13 +41,13 @@ public function initializeArguments()
     protected static function calculateAction($a, $b, array $arguments)
     {
         $aIsIterable = static::assertIsArrayOrIterator($a);
+        if (false === $aIsIterable && $b === null && (boolean) $arguments['fail']) {
+            ErrorUtility::throwViewHelperException('Required argument "b" was not supplied', 1237823699);
+        }
         if (true === $aIsIterable && null === $b) {
             $a = static::arrayFromArrayOrTraversableOrCSVStatic($a);
             return max($a);
         }
-        if ($b === null && (boolean) $arguments['fail']) {
-            ErrorUtility::throwViewHelperException('Required argument "b" was not supplied', 1237823699);
-        }
         return max($a, $b);
     }
 }
diff --git a/Classes/ViewHelpers/Math/MinimumViewHelper.php b/Classes/ViewHelpers/Math/MinimumViewHelper.php
@@ -41,13 +41,13 @@ public function initializeArguments()
     protected static function calculateAction($a, $b, array $arguments)
     {
         $aIsIterable = static::assertIsArrayOrIterator($a);
+        if (false === $aIsIterable && $b === null && (boolean) $arguments['fail']) {
+            ErrorUtility::throwViewHelperException('Required argument "b" was not supplied', 1237823699);
+        }
         if (true === $aIsIterable && null === $b) {
             $a = static::arrayFromArrayOrTraversableOrCSVStatic($a);
             return min($a);
         }
-        if ($b === null && (boolean) $arguments['fail']) {
-            ErrorUtility::throwViewHelperException('Required argument "b" was not supplied', 1237823699);
-        }
         return min($a, $b);
     }
 }
diff --git a/Classes/ViewHelpers/Math/ProductViewHelper.php b/Classes/ViewHelpers/Math/ProductViewHelper.php
@@ -36,13 +36,13 @@ class ProductViewHelper extends AbstractMultipleMathViewHelper
     protected static function calculateAction($a, $b, array $arguments)
     {
         $aIsIterable = static::assertIsArrayOrIterator($a);
+        if (false === $aIsIterable && $b === null && (boolean) $arguments['fail']) {
+            ErrorUtility::throwViewHelperException('Required argument "b" was not supplied', 1237823699);
+        }
         if (true === $aIsIterable && null === $b) {
             $a = static::arrayFromArrayOrTraversableOrCSVStatic($a);
             return array_product($a);
         }
-        if ($b === null && (boolean) $arguments['fail']) {
-            ErrorUtility::throwViewHelperException('Required argument "b" was not supplied', 1237823699);
-        }
         return $a * $b;
     }
 }
diff --git a/Classes/ViewHelpers/Math/SubtractViewHelper.php b/Classes/ViewHelpers/Math/SubtractViewHelper.php
@@ -44,13 +44,13 @@ public function initializeArguments()
     protected static function calculateAction($a, $b, array $arguments)
     {
         $aIsIterable = static::assertIsArrayOrIterator($a);
+        if (false === $aIsIterable && $b === null && (boolean) $arguments['fail']) {
+            ErrorUtility::throwViewHelperException('Required argument "b" was not supplied', 1237823699);
+        }
         if (true === $aIsIterable && null === $b) {
             $a = static::arrayFromArrayOrTraversableOrCSVStatic($a);
             return -array_sum($a);
         }
-        if ($b === null && (boolean) $arguments['fail']) {
-            ErrorUtility::throwViewHelperException('Required argument "b" was not supplied', 1237823699);
-        }
         return $a - $b;
     }
 }
diff --git a/Classes/ViewHelpers/Math/SumViewHelper.php b/Classes/ViewHelpers/Math/SumViewHelper.php
@@ -44,10 +44,10 @@ public function initializeArguments()
      */
     protected static function calculateAction($a, $b, array $arguments)
     {
-        if ($b === null && (boolean) $arguments['fail']) {
+        $aIsIterable = static::assertIsArrayOrIterator($a);
+        if (false === $aIsIterable && $b === null && (boolean) $arguments['fail']) {
             ErrorUtility::throwViewHelperException('Required argument "b" was not supplied', 1237823699);
         }
-        $aIsIterable = static::assertIsArrayOrIterator($a);
         if (true === $aIsIterable) {
             if (null === $b) {
                 $a = static::arrayFromArrayOrTraversableOrCSVStatic($a);

diff --git a/Classes/ViewHelpers/Media/AudioViewHelper.php b/Classes/ViewHelpers/Media/AudioViewHelper.php
@@ -180,7 +180,7 @@ public function render()
             $tagAttributes['muted'] = 'muted';
         }
         if (true === in_array($this->arguments['preload'], $this->validPreloadModes)) {
-            $tagAttributes['preload'] = 'preload';
+            $tagAttributes['preload'] = $this->arguments['preload'];
         }
         if (null !== $this->arguments['poster']) {
             $tagAttributes['poster'] = $this->arguments['poster'];

diff --git a/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php b/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php
@@ -10,6 +10,7 @@
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\CoreUtility;
+use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
@@ -313,10 +314,7 @@ protected function parseLanguageMenu()
             }
         }
 
-        // Select all pages_language_overlay records on the current page. Each represents a possibility for a language.
-        $table = 'pages_language_overlay';
-        $sysLang = $GLOBALS['TSFE']->cObj->getRecords($table, ['selectFields' => 'sys_language_uid', 'pidInList' => $this->getPageUid(), 'languageField' => 0]);
-        $languageUids = array_column($sysLang, 'sys_language_uid');
+        $languageUids = $this->getSystemLanguageUids();
 
         foreach ($languageMenu as $key => $value) {
             $current = $GLOBALS['TSFE']->sys_language_uid === (integer) $key ? 1 : 0;
@@ -377,4 +375,34 @@ protected function getPageUid()
 
         return (integer) $pageUid;
     }
+
+    /**
+     * Fetches system languages depending on the TYPO3 version.
+     *
+     * @return int[]
+     * @see https://docs.typo3.org/typo3cms/extensions/core/Changelog/9.0/Important-82445-MigratePagesLanguageOverlayIntoPages.html
+     */
+    protected function getSystemLanguageUids()
+    {
+        if (version_compare(TYPO3_branch, '9.0', '<')) {
+            $table = 'pages_language_overlay';
+            $parentField = 'pid';
+        } else {
+            $table = 'pages';
+            $parentField = 'l10n_parent';
+        }
+
+        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+        $connection = $connectionPool->getConnectionForTable($table);
+        $queryBuilder = $connection->createQueryBuilder();
+        $result = $queryBuilder->select('sys_language_uid')
+            ->from($table)
+            ->where(
+                $queryBuilder->expr()->eq($parentField, $this->getPageUid())
+            )
+            ->execute()
+        ;
+
+        return array_column($result->fetchAll(), 'sys_language_uid');
+    }
 }
diff --git a/Classes/ViewHelpers/Render/AbstractRenderViewHelper.php b/Classes/ViewHelpers/Render/AbstractRenderViewHelper.php
@@ -109,6 +109,7 @@ protected static function getPreparedClonedView(RenderingContextInterface $rende
             $controllerContext = clone $renderingContext->getControllerContext();
             $view->setControllerContext($controllerContext);
             $view->setFormat($controllerContext->getRequest()->getFormat());
+            $view->getRenderingContext()->setViewHelperVariableContainer($renderingContext->getViewHelperVariableContainer());
         }
         $view->assignMultiple(ViewHelperUtility::getVariableProviderFromRenderingContext($renderingContext)->getAll());
         return $view;

diff --git a/Classes/ViewHelpers/Render/UncacheViewHelper.php b/Classes/ViewHelpers/Render/UncacheViewHelper.php
@@ -54,7 +54,7 @@ public static function renderStatic(
         \Closure $renderChildrenClosure,
         RenderingContextInterface $renderingContext
     ) {
-        $templateVariableContainer = $renderingContext->getTemplateVariableContainer();
+        $templateVariableContainer = $renderingContext->getVariableProvider();
         $partialArguments = $arguments['arguments'];
         if (false === is_array($partialArguments)) {
             $partialArguments = [];