From 247da0fad6777977bdaa4efde261fd1f38c5933f Mon Sep 17 00:00:00 2001
From: Alexander Schnitzler <git@alexanderschnitzler.de>
Date: Fri, 28 Feb 2020 17:20:17 +0100
Subject: [PATCH] [TASK] Avoid possibly undefined variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
phpstan identified a bunch of possibly undefined
variables which is fixed with this patch.
Releases: master
Resolves: #90581
Change-Id: If41bee3dcd972d26f8eff18dbcbc61ad1fe79e7f
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/63483
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Frank Nägler <frank.naegler@typo3.org>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Guido Schmechel <guido.schmechel@brandung.de>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Frank Nägler <frank.naegler@typo3.org>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
---
.../sysext/backend/Classes/Controller/PageLayoutController.php | 2 +-
.../backend/Classes/Form/FormDataProvider/TcaFlexPrepare.php | 1 +
typo3/sysext/backend/Classes/View/PageLayoutView.php | 2 ++
.../core/Classes/Authentication/BackendUserAuthentication.php | 1 +
typo3/sysext/core/Classes/DataHandling/DataHandler.php | 1 +
typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php | 1 +
typo3/sysext/indexed_search/Classes/Indexer.php | 1 +
7 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
index 60b3f7c3ead0..5cff6102b605 100644
--- a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
@@ -703,8 +703,8 @@ class PageLayoutController
}
$this->pageRenderer->addInlineLanguageLabelFile('EXT:backend/Resources/Private/Language/locallang_layout.xlf');
+ $h_func_b = '';
if ($this->getBackendUser()->check('tables_select', 'tt_content')) {
- $h_func_b = '';
// Toggle hidden ContentElements
if ($numberOfHiddenElements > 0) {
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexPrepare.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexPrepare.php
index fa0a5d4ad4af..42c46ef0e1b8 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexPrepare.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexPrepare.php
@@ -83,6 +83,7 @@ class TcaFlexPrepare implements FormDataProviderInterface
);
$dataStructureArray = $flexFormTools->parseDataStructureByIdentifier($dataStructureIdentifier);
} catch (InvalidParentRowException|InvalidParentRowLoopException|InvalidParentRowRootException|InvalidPointerFieldValueException|InvalidIdentifierException $e) {
+ $dataStructureIdentifier = null;
} finally {
// Add the identifier to TCA to use it later during rendering
$result['processedTca']['columns'][$fieldName]['config']['dataStructureIdentifier'] = $dataStructureIdentifier;
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index bc87af86bebc..5e8c13a9c3b9 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -521,6 +521,8 @@ class PageLayoutView implements LoggerAwareInterface
// Add colgroups
$colCount = (int)$backendLayout['__config']['backend_layout.']['colCount'];
$rowCount = (int)$backendLayout['__config']['backend_layout.']['rowCount'];
+ $colSpan = 0;
+ $rowSpan = 0;
$grid .= '<colgroup>';
for ($i = 0; $i < $colCount; $i++) {
$grid .= '<col />';
diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
index 9cb8a2b9d27c..0c63d25e503e 100644
--- a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -375,6 +375,7 @@ class BackendUserAuthentication extends AbstractUserAuthentication
if (!$GLOBALS['TYPO3_CONF_VARS']['BE']['lockBeUserToDBmounts'] || $this->isAdmin()) {
return 1;
}
+ $checkRec = [];
$fetchPageFromDatabase = true;
if (is_array($idOrRow)) {
if (empty($idOrRow['uid'])) {
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index ca79781e3903..47bcd1b85216 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -5655,6 +5655,7 @@ class DataHandler implements LoggerAwareInterface
$remapFlexForms = [];
$hookPayload = [];
+ $newValue = null;
foreach ($this->remapStack as $remapAction) {
// If no position index for the arguments was set, skip this remap action:
if (!is_array($remapAction['pos'])) {
diff --git a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
index 3c377b1fdc73..7faf6cdfa080 100644
--- a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
+++ b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
@@ -668,6 +668,7 @@ class CrawlerHook
$indexerObj->backend_setFreeIndexUid($cfgRec['uid'], $cfgRec['set_id']);
$indexerObj->forceIndexing = true;
$theContent = '';
+ $theTitle = '';
foreach ($fieldList as $k => $v) {
if (!$k) {
$theTitle = $r[$v];
diff --git a/typo3/sysext/indexed_search/Classes/Indexer.php b/typo3/sysext/indexed_search/Classes/Indexer.php
index c5bd05535cf7..74c42863fb0a 100644
--- a/typo3/sysext/indexed_search/Classes/Indexer.php
+++ b/typo3/sysext/indexed_search/Classes/Indexer.php
@@ -706,6 +706,7 @@ class Indexer
$expBody = preg_split('/\\<\\!\\-\\-[\\s]?TYPO3SEARCH_/', $body);
if (count($expBody) > 1) {
$body = '';
+ $prev = '';
foreach ($expBody as $val) {
$part = explode('-->', $val, 2);
if (trim($part[0]) === 'begin') {
--
GitLab