echavaillaz
diff --git a/‎Classes/Backend/ItemsProcFuncs/AbstractItemsProcFunc.php‎
Lines changed: 0 additions & 3 deletions b/‎Classes/Backend/ItemsProcFuncs/AbstractItemsProcFunc.php‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎Classes/Backend/ItemsProcFuncs/CTypeList.php‎
Lines changed: 17 additions & 9 deletions b/‎Classes/Backend/ItemsProcFuncs/CTypeList.php‎
Lines changed: 17 additions & 9 deletions
diff --git a/‎Classes/Backend/ItemsProcFuncs/ColPosList.php‎
Lines changed: 21 additions & 9 deletions b/‎Classes/Backend/ItemsProcFuncs/ColPosList.php‎
Lines changed: 21 additions & 9 deletions
diff --git a/‎Classes/Backend/ItemsProcFuncs/ListTypeList.php‎
Lines changed: 17 additions & 9 deletions b/‎Classes/Backend/ItemsProcFuncs/ListTypeList.php‎
Lines changed: 17 additions & 9 deletions
diff --git a/‎Classes/Backend/ItemsProcFuncs/SysLanguageUidList.php‎
Lines changed: 1 addition & 3 deletions b/‎Classes/Backend/ItemsProcFuncs/SysLanguageUidList.php‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎Classes/Backend/LayoutSetup.php‎
Lines changed: 28 additions & 22 deletions b/‎Classes/Backend/LayoutSetup.php‎
Lines changed: 28 additions & 22 deletions
diff --git a/‎Classes/Backend/TtContent.php‎
Lines changed: 14 additions & 10 deletions b/‎Classes/Backend/TtContent.php‎
Lines changed: 14 additions & 10 deletions
@@ -31,8 +31,6 @@
  * Class/Function which offers TCE main hook functions.
  *
  * @author Jo Hasenau <[email protected]>
- * @package TYPO3
- * @subpackage tx_gridelements
  */
 abstract class AbstractItemsProcFunc implements SingletonInterface
 {
@@ -109,5 +107,4 @@ public function getBackendUser()
     {
         return $GLOBALS['BE_USER'];
     }
-
 }
@@ -28,8 +28,6 @@
  * Class/Function which manipulates the item-array for table/field tt_content CType.
  *
  * @author Jo Hasenau <[email protected]>
- * @package TYPO3
- * @subpackage tx_gridelements
  */
 class CTypeList extends AbstractItemsProcFunc
 {
@@ -48,16 +46,26 @@ public function itemsProcFunc(array &$params)
     {
         if ((int)$params['row']['pid'] > 0) {
             $colPos = is_array($params['row']['colPos']) ? $params['row']['colPos'][0] : $params['row']['colPos'];
-            $this->checkForAllowedCTypes($params['items'], $params['row']['pid'], $colPos,
-                $params['row']['tx_gridelements_container'], $params['row']['tx_gridelements_columns']);
+            $this->checkForAllowedCTypes(
+                $params['items'],
+                $params['row']['pid'],
+                $colPos,
+                $params['row']['tx_gridelements_container'],
+                $params['row']['tx_gridelements_columns']
+            );
         } else {
             $this->init((int)$params['row']['pid']);
             // negative uid_pid values indicate that the element has been inserted after an existing element
             // so there is no pid to get the backendLayout for and we have to get that first
             $existingElement = BackendUtility::getRecordWSOL('tt_content', -((int)$params['row']['pid']), 'pid,CType,colPos,tx_gridelements_container,tx_gridelements_columns');
             if ((int)$existingElement['pid'] > 0) {
-                $this->checkForAllowedCTypes($params['items'], $existingElement['pid'], $existingElement['colPos'],
-                    $existingElement['tx_gridelements_container'], $existingElement['tx_gridelements_columns']);
+                $this->checkForAllowedCTypes(
+                    $params['items'],
+                    $existingElement['pid'],
+                    $existingElement['colPos'],
+                    $existingElement['tx_gridelements_container'],
+                    $existingElement['tx_gridelements_columns']
+                );
             }
         }
     }
@@ -73,8 +81,8 @@ public function itemsProcFunc(array &$params)
      */
     public function checkForAllowedCTypes(array &$items, $pageId, $pageColumn, $gridContainerId, $gridColumn)
     {
-        $allowed = '';
-        $disallowed = '';
+        $allowed = [];
+        $disallowed = [];
         if ((int)$pageColumn >= 0 || (int)$pageColumn === -2) {
             $column = $pageColumn ? $pageColumn : 0;
             $layout = $this->getSelectedBackendLayout($pageId);
@@ -88,7 +96,7 @@ public function checkForAllowedCTypes(array &$items, $pageId, $pageColumn, $grid
             if (is_array($layout['allowed']) && is_array($layout['allowed'][$column]) && !empty($layout['allowed'][$column]['CType'])) {
                 $allowed = $layout['allowed'][$column]['CType'];
             }
-            if (is_array($layout['disallowed']) && is_array($layout['disallowed'][$column]) && !empty($layout['disallowed'][$column]['CType'])){
+            if (is_array($layout['disallowed']) && is_array($layout['disallowed'][$column]) && !empty($layout['disallowed'][$column]['CType'])) {
                 $disallowed = $layout['disallowed'][$column]['CType'];
             }
         }
 
@@ -26,8 +26,6 @@
  * Class/Function which manipulates the item-array for table/field tt_content colPos.
  *
  * @author Jo Hasenau <[email protected]>
- * @package TYPO3
- * @subpackage tx_gridelements
  */
 class ColPosList extends AbstractItemsProcFunc
 {
@@ -43,17 +41,31 @@ public function itemsProcFunc(array &$params)
             $contentType = is_array($params['row']['CType']) ? $params['row']['CType'][0] : $params['row']['CType'];
             $listType = is_array($params['row']['list_type']) ? $params['row']['list_type'][0] : $params['row']['list_type'];
             $gridType = is_array($params['row']['tx_gridelements_backend_layout']) ? $params['row']['tx_gridelements_backend_layout'][0] : $params['row']['tx_gridelements_backend_layout'];
-            $params['items'] = $this->addColPosListLayoutItems($params['row']['pid'], $params['items'], $contentType,
-                $listType, $gridType, $params['row']['tx_gridelements_container']);
+            $params['items'] = $this->addColPosListLayoutItems(
+                $params['row']['pid'],
+                $params['items'],
+                $contentType,
+                $listType,
+                $gridType,
+                $params['row']['tx_gridelements_container']
+            );
         } else {
             // negative uid_pid values indicate that the element has been inserted after an existing element
             // so there is no pid to get the backendLayout for and we have to get that first
-            $existingElement = BackendUtility::getRecordWSOL('tt_content', -((int)$params['row']['pid']),
-                'pid,CType,tx_gridelements_container');
+            $existingElement = BackendUtility::getRecordWSOL(
+                'tt_content',
+                -((int)$params['row']['pid']),
+                'pid,CType,tx_gridelements_container'
+            );
             if ($existingElement['pid'] > 0) {
-                $params['items'] = $this->addColPosListLayoutItems($existingElement['pid'], $params['items'],
-                    $existingElement['CType'], $existingElement['list_type'],
-                    $existingElement['tx_gridelements_backend_layout'], $existingElement['tx_gridelements_container']);
+                $params['items'] = $this->addColPosListLayoutItems(
+                    $existingElement['pid'],
+                    $params['items'],
+                    $existingElement['CType'],
+                    $existingElement['list_type'],
+                    $existingElement['tx_gridelements_backend_layout'],
+                    $existingElement['tx_gridelements_container']
+                );
             }
         }
     }
 
@@ -28,8 +28,6 @@
  * Class/Function which manipulates the item-array for table/field tt_content CType.
  *
  * @author Jo Hasenau <[email protected]>
- * @package TYPO3
- * @subpackage tx_gridelements
  */
 class ListTypeList extends AbstractItemsProcFunc
 {
@@ -48,16 +46,26 @@ public function itemsProcFunc(array &$params)
     {
         if ((int)$params['row']['pid'] > 0) {
             $colPos = is_array($params['row']['colPos']) ? $params['row']['colPos'][0] : $params['row']['colPos'];
-            $this->checkForAllowedListTypes($params['items'], $params['row']['pid'], $colPos,
-                $params['row']['tx_gridelements_container'], $params['row']['tx_gridelements_columns']);
+            $this->checkForAllowedListTypes(
+                $params['items'],
+                $params['row']['pid'],
+                $colPos,
+                $params['row']['tx_gridelements_container'],
+                $params['row']['tx_gridelements_columns']
+            );
         } else {
             $this->init((int)$params['row']['pid']);
             // negative uid_pid values indicate that the element has been inserted after an existing element
             // so there is no pid to get the backendLayout for and we have to get that first
             $existingElement = BackendUtility::getRecordWSOL('tt_content', -((int)$params['row']['pid']), 'pid,list_type,colPos,tx_gridelements_container,tx_gridelements_columns');
             if ((int)$existingElement['pid'] > 0) {
-                $this->checkForAllowedListTypes($params['items'], $existingElement['pid'], $existingElement['colPos'],
-                    $existingElement['tx_gridelements_container'], $existingElement['tx_gridelements_columns']);
+                $this->checkForAllowedListTypes(
+                    $params['items'],
+                    $existingElement['pid'],
+                    $existingElement['colPos'],
+                    $existingElement['tx_gridelements_container'],
+                    $existingElement['tx_gridelements_columns']
+                );
             }
         }
     }
@@ -73,8 +81,8 @@ public function itemsProcFunc(array &$params)
      */
     public function checkForAllowedListTypes(array &$items, $pageId, $pageColumn, $gridContainerId, $gridColumn)
     {
-        $allowed = '';
-        $disallowed = '';
+        $allowed = [];
+        $disallowed = [];
         if ((int)$pageColumn >= 0 || (int)$pageColumn === -2) {
             $column = $pageColumn ? $pageColumn : 0;
             $layout = $this->getSelectedBackendLayout($pageId);
@@ -88,7 +96,7 @@ public function checkForAllowedListTypes(array &$items, $pageId, $pageColumn, $g
             if (is_array($layout['allowed']) && is_array($layout['allowed'][$column]) && !empty($layout['allowed'][$column]['list_type'])) {
                 $allowed = $layout['allowed'][$column]['list_type'];
             }
-            if (is_array($layout['disallowed']) && is_array($layout['disallowed'][$column]) && !empty($layout['disallowed'][$column]['list_type'])){
+            if (is_array($layout['disallowed']) && is_array($layout['disallowed'][$column]) && !empty($layout['disallowed'][$column]['list_type'])) {
                 $disallowed = $layout['disallowed'][$column]['list_type'];
             }
         }
 
@@ -26,8 +26,6 @@
  * Class/Function which manipulates the item-array for table/field tt_content CType.
  *
  * @author Jo Hasenau <[email protected]>
- * @package TYPO3
- * @subpackage tx_gridelements
  */
 class SysLanguageUidList extends AbstractItemsProcFunc
 {
@@ -61,6 +59,6 @@ public function checkForAllowedLanguages(array &$items, $gridContainerId)
                     unset($items[$item]);
                 }
             }
-        };
+        }
     }
 }
@@ -37,8 +37,6 @@
  * Utilities for gridelements.
  *
  * @author Arno Dudek <[email protected]>
- * @package TYPO3
- * @subpackage tx_gridelements
  */
 class LayoutSetup
 {
@@ -112,7 +110,7 @@ public function init($pageId, array $typoScriptSetup = [])
     protected function loadLayoutSetup($pageId)
     {
         // Load page TSconfig.
-        if(\TYPO3_MODE === 'FE') {
+        if (\TYPO3_MODE === 'FE') {
             $pageTSconfig = $GLOBALS['TSFE']->getPagesTSconfig();
         } else {
             $pageTSconfig = BackendUtility::getPagesTSconfig($pageId);
@@ -173,8 +171,10 @@ protected function loadLayoutSetup($pageId)
             ? (int)$pageTSconfig['TCEFORM.']['pages.']['_STORAGE_PID']
             : 0;
         $pageTSconfigId = isset($pageTSconfig['TCEFORM.']['tt_content.']['tx_gridelements_backend_layout.']['PAGE_TSCONFIG_ID'])
-            ? implode(',', GeneralUtility::intExplode(',',
-                $pageTSconfig['TCEFORM.']['tt_content.']['tx_gridelements_backend_layout.']['PAGE_TSCONFIG_ID']))
+            ? implode(',', GeneralUtility::intExplode(
+                ',',
+                $pageTSconfig['TCEFORM.']['tt_content.']['tx_gridelements_backend_layout.']['PAGE_TSCONFIG_ID']
+            ))
             : 0;
 
         // Load records.
@@ -189,15 +189,21 @@ protected function loadLayoutSetup($pageId)
                         $queryBuilder->expr()->comparison($storagePid, '=', 0)
                     ),
                     $queryBuilder->expr()->orX(
-                        $queryBuilder->expr()->eq('pid',
-                            $queryBuilder->createNamedParameter((int)$pageTSconfigId, \PDO::PARAM_INT)),
-                        $queryBuilder->expr()->eq('pid',
-                            $queryBuilder->createNamedParameter((int)$storagePid, \PDO::PARAM_INT))
+                        $queryBuilder->expr()->eq(
+                            'pid',
+                            $queryBuilder->createNamedParameter((int)$pageTSconfigId, \PDO::PARAM_INT)
+                        ),
+                        $queryBuilder->expr()->eq(
+                            'pid',
+                            $queryBuilder->createNamedParameter((int)$storagePid, \PDO::PARAM_INT)
+                        )
                     ),
                     $queryBuilder->expr()->andX(
                         $queryBuilder->expr()->comparison($pageTSconfigId, '=', 0),
-                        $queryBuilder->expr()->eq('pid',
-                            $queryBuilder->createNamedParameter((int)$pageId, \PDO::PARAM_INT))
+                        $queryBuilder->expr()->eq(
+                            'pid',
+                            $queryBuilder->createNamedParameter((int)$pageId, \PDO::PARAM_INT)
+                        )
                     )
                 )
             )
@@ -237,7 +243,6 @@ protected function loadLayoutSetup($pageId)
             }
 
             $gridLayoutRecords[$layoutId] = $item;
-
         }
 
         if ($overruleRecords === true) {
@@ -478,19 +483,21 @@ public function getLayoutSelectItems($colPos, $gridColPos = 0, $containerId = 0,
      * @param int $gridContainerId The ID of the current grid container
      * @param bool $doReturn
      *
-     * @return null|array
+     * @return array|null
      */
     public function cacheCurrentParent($gridContainerId = 0, $doReturn = false)
     {
         if ($gridContainerId > 0) {
             if (empty($GLOBALS['tx_gridelements']['parentElement'][$gridContainerId])) {
-                $GLOBALS['tx_gridelements']['parentElement'][$gridContainerId] = BackendUtility::getRecordWSOL('tt_content',
-                    $gridContainerId);
+                $GLOBALS['tx_gridelements']['parentElement'][$gridContainerId] = BackendUtility::getRecordWSOL(
+                    'tt_content',
+                    $gridContainerId
+                );
             }
         }
         if ($doReturn) {
             return $GLOBALS['tx_gridelements']['parentElement'][$gridContainerId];
-        };
+        }
 
         return null;
     }
@@ -604,7 +611,6 @@ public function getLayoutWizardItems(
                 'iconIdentifier' => $item['iconIdentifier'],
                 'tll'            => $item['top_level_layout'],
             ];
-
         }
 
         return $wizardItems;
@@ -624,8 +630,10 @@ public function getFlexformConfiguration($layoutId)
         if ($layoutSetup['pi_flexform_ds_file']) {
             $flexformConfiguration = GeneralUtility::getUrl(GeneralUtility::getFileAbsFileName($layoutSetup['pi_flexform_ds_file']));
         } elseif (strpos($layoutSetup['pi_flexform_ds'], 'FILE:') === 0) {
-            $flexformConfiguration = GeneralUtility::getUrl(GeneralUtility::getFileAbsFileName(substr($layoutSetup['pi_flexform_ds'],
-                5)));
+            $flexformConfiguration = GeneralUtility::getUrl(GeneralUtility::getFileAbsFileName(substr(
+                $layoutSetup['pi_flexform_ds'],
+                5
+            )));
         } elseif ($layoutSetup['pi_flexform_ds']) {
             $flexformConfiguration = $layoutSetup['pi_flexform_ds'];
         } else {
@@ -638,7 +646,7 @@ public function getFlexformConfiguration($layoutId)
     /**
      * getter for restrictions
      *
-     * @return DefaultRestrictionContainer restrictions
+     * @return object|DefaultRestrictionContainer restrictions
      */
     public function getRestrictions()
     {
@@ -678,7 +686,6 @@ public function getBackendUser()
         return $GLOBALS['BE_USER'];
     }
 
-
     /**
      * Gets the current real pid.
      *
@@ -688,5 +695,4 @@ public function getRealPid()
     {
         return $this->realPid;
     }
-
 }
@@ -31,8 +31,6 @@
  * Class/Function which manipulates the item-array for table/field tt_content_tx_gridelements_columns.
  *
  * @author Jo Hasenau <[email protected]>
- * @package TYPO3
- * @subpackage tx_gridelements
  */
 class TtContent
 {
@@ -166,8 +164,10 @@ public function lookForChildContainersRecursively($containerIds, array &$possibl
             ->where(
                 $queryBuilder->expr()->andX(
                     $queryBuilder->expr()->eq('CType', $queryBuilder->createNamedParameter('gridelements_pi1')),
-                    $queryBuilder->expr()->in('tx_gridelements_container',
-                        $queryBuilder->createNamedParameter($containerIds, Connection::PARAM_INT_ARRAY))
+                    $queryBuilder->expr()->in(
+                        'tx_gridelements_container',
+                        $queryBuilder->createNamedParameter($containerIds, Connection::PARAM_INT_ARRAY)
+                    )
                 )
             )
             ->execute()
@@ -227,8 +227,10 @@ public function deleteDisallowedContainers(array &$params, $itemUidList = '')
                 ->select('uid', 'tx_gridelements_backend_layout')
                 ->from('tt_content')
                 ->where(
-                    $queryBuilder->expr()->in('uid',
-                        $queryBuilder->createNamedParameter($itemUidList, Connection::PARAM_INT_ARRAY))
+                    $queryBuilder->expr()->in(
+                        'uid',
+                        $queryBuilder->createNamedParameter($itemUidList, Connection::PARAM_INT_ARRAY)
+                    )
                 )
                 ->execute();
             $containers = [];
@@ -290,10 +292,12 @@ public function deleteDisallowedContainers(array &$params, $itemUidList = '')
     public function layoutItemsProcFunc(array &$params)
     {
         $this->init($params['row']['pid']);
-        $layoutSelectItems = $this->layoutSetup->getLayoutSelectItems(isset($params['row']['colPos'][0]) ? $params['row']['colPos'][0] : $params['row']['colPos'],
-            $params['row']['tx_gridelements_columns'], $params['row']['tx_gridelements_container'], $this->layoutSetup->getRealPid());
+        $layoutSelectItems = $this->layoutSetup->getLayoutSelectItems(
+            isset($params['row']['colPos'][0]) ? $params['row']['colPos'][0] : $params['row']['colPos'],
+            $params['row']['tx_gridelements_columns'],
+            $params['row']['tx_gridelements_container'],
+            $this->layoutSetup->getRealPid()
+        );
         $params['items'] = ArrayUtility::keepItemsInArray($layoutSelectItems, $params['items'], true);
     }
-
-
 }
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@`
`31`	`31`	`* Class/Function which offers TCE main hook functions.`
`32`	`32`	`*`
`33`	`33`	`* @author Jo Hasenau <[email protected]>`
`34`		`- * @package TYPO3`
`35`		`- * @subpackage tx_gridelements`
`36`	`34`	`*/`
`37`	`35`	`abstract class AbstractItemsProcFunc implements SingletonInterface`
`38`	`36`	`{`
`@@ -109,5 +107,4 @@ public function getBackendUser()`
`109`	`107`	`{`
`110`	`108`	`return $GLOBALS['BE_USER'];`
`111`	`109`	`}`
`112`		`-`
`113`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@`
`26`	`26`	`* Class/Function which manipulates the item-array for table/field tt_content CType.`
`27`	`27`	`*`
`28`	`28`	`* @author Jo Hasenau <[email protected]>`
`29`		`- * @package TYPO3`
`30`		`- * @subpackage tx_gridelements`
`31`	`29`	`*/`
`32`	`30`	`class SysLanguageUidList extends AbstractItemsProcFunc`
`33`	`31`	`{`
`@@ -61,6 +59,6 @@ public function checkForAllowedLanguages(array &$items, $gridContainerId)`
`61`	`59`	`unset($items[$item]);`
`62`	`60`	`}`
`63`	`61`	`}`
`64`		`- };`
	`62`	`+ }`
`65`	`63`	`}`
`66`	`64`	`}`