[TASK] Make core/Tests/Unit/Database/ notice free

Releases: master Resolves: #84723 Change-Id: I4ed49cd7002fa8a0c002222c54249d714e91a379 Reviewed-on: https://review.typo3.org/56660 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Mathias Schreiber <mathias.schreiber@typo3.com> Tested-by: Mathias Schreiber <mathias.schreiber@typo3.com> Reviewed-by: Susanne Moog <susanne.moog@typo3.org> Tested-by: Susanne Moog <susanne.moog@typo3.org>
TYPO3 · Apr 29, 2018 · a61bbcc · a61bbcc
1 parent 48adc7a
commit a61bbcc
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 95 deletions.
diff --git a/typo3/sysext/core/Classes/Database/Query/QueryBuilder.php b/typo3/sysext/core/Classes/Database/Query/QueryBuilder.php
@@ -981,7 +981,7 @@ public function quoteIdentifiersForSelect(array $input): array
             );
             if (!empty($suffix)) {
                 throw new \InvalidArgumentException(
-                    'QueryBuilder::quoteIdentifiersForSelect() could not parse the input "' . $input . '"',
+                    'QueryBuilder::quoteIdentifiersForSelect() could not parse the select ' . $select . '.',
                     1461170686
                 );
             }

diff --git a/typo3/sysext/core/Classes/Database/Query/QueryHelper.php b/typo3/sysext/core/Classes/Database/Query/QueryHelper.php
@@ -74,7 +74,7 @@ public static function parseTableList(string $input): array
 
         return array_map(
             function ($expression) {
-                list($tableName, $as, $alias) = GeneralUtility::trimExplode(' ', $expression, true);
+                [$tableName, $as, $alias] = array_pad(GeneralUtility::trimExplode(' ', $expression, true), 3, null);
 
                 if (!empty($as) && strtolower($as) === 'as' && !empty($alias)) {
                     return [$tableName, $alias];

diff --git a/typo3/sysext/core/Classes/Database/QueryGenerator.php b/typo3/sysext/core/Classes/Database/QueryGenerator.php
@@ -1209,14 +1209,18 @@ public function mkCompSelect($name, $comparison, $neg)
      * @param array $arr
      * @return array
      */
-    public function getSubscript($arr)
+    public function getSubscript($arr): array
     {
         $retArr = [];
-        while (is_array($arr)) {
+        while (\is_array($arr)) {
             reset($arr);
             $key = key($arr);
             $retArr[] = $key;
-            $arr = $arr[$key];
+            if (isset($arr[$key])) {
+                $arr = $arr[$key];
+            } else {
+                break;
+            }
         }
         return $retArr;
     }