From d715b775656533df1a9bc51393d081dde09e5c5b Mon Sep 17 00:00:00 2001
From: Matthias Adrowski <matthias.adrowski@sgalinski.de>
Date: Mon, 4 Apr 2022 13:35:35 +0200
Subject: [PATCH] [TASK] More phpstan errors fixed
---
Classes/Hooks/PageLayoutView/PluginRenderer.php | 4 ++--
Classes/Service/HeaderMetaDataService.php | 4 ++--
Classes/TCA/TcaProvider.php | 4 ++--
Classes/Updates/MigrateSchedulerTasks.php | 4 ++--
Classes/Updates/UpdateAuthors.php | 6 ++++--
Classes/Utility/BackendNewsUtility.php | 8 ++++----
6 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/Classes/Hooks/PageLayoutView/PluginRenderer.php b/Classes/Hooks/PageLayoutView/PluginRenderer.php
index c06d930..8c55e9f 100644
--- a/Classes/Hooks/PageLayoutView/PluginRenderer.php
+++ b/Classes/Hooks/PageLayoutView/PluginRenderer.php
@@ -107,8 +107,8 @@ class PluginRenderer implements PageLayoutViewDrawItemHookInterface {
* Adapts the given $headerContent.
* To be used in all plugin previews so the Header Contents appear similarly.
*
- * @param $headerContent
- * @param $row
+ * @param string $headerContent
+ * @param array $row
*/
protected function adaptPluginHeaderContent(&$headerContent, $row): void {
$headerContent = '<h4>' . $this->getPluginNameForHeaderContent(
diff --git a/Classes/Service/HeaderMetaDataService.php b/Classes/Service/HeaderMetaDataService.php
index 885f07b..ddf5d53 100644
--- a/Classes/Service/HeaderMetaDataService.php
+++ b/Classes/Service/HeaderMetaDataService.php
@@ -40,7 +40,7 @@ class HeaderMetaDataService {
* @return void
*/
public static function addOgImageToHeader($path): void {
- /** @var $typoScriptController TypoScriptFrontendController */
+ /** @var TypoScriptFrontendController $typoScriptController */
$typoScriptController = $GLOBALS['TSFE'];
$typoScriptController->page['og_image_path_by_extension'] = $path;
}
@@ -52,7 +52,7 @@ class HeaderMetaDataService {
* @return void
*/
public static function addOgImageObjectToHeader($file): void {
- /** @var $typoScriptController TypoScriptFrontendController */
+ /** @var TypoScriptFrontendController $typoScriptController */
$typoScriptController = $GLOBALS['TSFE'];
$typoScriptController->page['og_image_path_by_extension'] = $file;
}
diff --git a/Classes/TCA/TcaProvider.php b/Classes/TCA/TcaProvider.php
index 5092cbb..6594390 100644
--- a/Classes/TCA/TcaProvider.php
+++ b/Classes/TCA/TcaProvider.php
@@ -78,13 +78,13 @@ class TcaProvider implements SingletonInterface {
->where(
$queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($pagesIdentity, \PDO::PARAM_INT))
)
- ->execute()->fetch();
+ ->execute()->fetchAssociative();
$workspaceOriginalId = (int) $row['t3ver_oid'];
if ($workspaceOriginalId > 0) {
$row = $queryBuilder->where(
$queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($workspaceOriginalId, \PDO::PARAM_INT))
- )->execute()->fetch();
+ )->execute()->fetchAssociative();
}
// only articles
diff --git a/Classes/Updates/MigrateSchedulerTasks.php b/Classes/Updates/MigrateSchedulerTasks.php
index a8b9f85..2add1c0 100644
--- a/Classes/Updates/MigrateSchedulerTasks.php
+++ b/Classes/Updates/MigrateSchedulerTasks.php
@@ -75,7 +75,7 @@ class MigrateSchedulerTasks implements UpgradeWizardInterface {
->from('tx_scheduler_task')
->where(
$queryBuilder->expr()->eq('disable', 0)
- )->execute()->fetchAll();
+ )->execute()->fetchAllAssociative();
foreach ($tasks as $_task) {
$task = unserialize($_task['serialized_task_object'], [\__PHP_Incomplete_Class::class]);
$taskVars = $this->cleanArrayKeys((array)$task);
@@ -131,7 +131,7 @@ class MigrateSchedulerTasks implements UpgradeWizardInterface {
->from('tx_scheduler_task')
->where(
$queryBuilder->expr()->eq('disable', 0)
- )->execute()->fetchAll();
+ )->execute()->fetchAllAssociative();
foreach ($tasks as $_task) {
$task = unserialize($_task['serialized_task_object'], [\__PHP_Incomplete_Class::class]);
$taskVars = $this->cleanArrayKeys((array)$task);
diff --git a/Classes/Updates/UpdateAuthors.php b/Classes/Updates/UpdateAuthors.php
index 05e7b27..f87a04d 100644
--- a/Classes/Updates/UpdateAuthors.php
+++ b/Classes/Updates/UpdateAuthors.php
@@ -86,6 +86,8 @@ class UpdateAuthors implements UpgradeWizardInterface {
/**
* @return bool
+ * @throws \Doctrine\DBAL\DBALException
+ * @throws \Doctrine\DBAL\Driver\Exception
*/
public function executeUpdate(): bool {
$newsQueryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
@@ -98,7 +100,7 @@ class UpdateAuthors implements UpgradeWizardInterface {
$newsQueryBuilder->expr()->neq('author', $newsQueryBuilder->quote(''))
)
)
- ->execute()->fetchAll();
+ ->execute()->fetchAllAssociative();
if (count($newsEntries) <= 0) {
return TRUE;
}
@@ -122,7 +124,7 @@ class UpdateAuthors implements UpgradeWizardInterface {
)
)
->setMaxResults(1)
- ->execute()->fetchAll();
+ ->execute()->fetchAllAssociative();
if (!$author) {
$authorQueryBuilder->insert('tx_sgnews_domain_model_author')
->values([
diff --git a/Classes/Utility/BackendNewsUtility.php b/Classes/Utility/BackendNewsUtility.php
index b1b5184..9e58093 100644
--- a/Classes/Utility/BackendNewsUtility.php
+++ b/Classes/Utility/BackendNewsUtility.php
@@ -175,7 +175,7 @@ class BackendNewsUtility {
$queryBuilder->expr()->in('uid', $queryBuilder->createNamedParameter(explode(',', $childPids), Connection::PARAM_INT_ARRAY))
)
)
- ->execute()->fetchAll();
+ ->execute()->fetchAllAssociative();
$categories = [];
foreach ($result as $page) {
$categoryPageInfo = BackendUtility::readPageAccess(
@@ -433,7 +433,7 @@ class BackendNewsUtility {
$authorQueryBuilder->expr()->like('author.name', $authorSearchParameter),
$authorQueryBuilder->expr()->like('author.email', $authorSearchParameter)
)
- )->execute()->fetchAll();
+ )->execute()->fetchAllAssociative();
if (count($authors) > 0) {
foreach (array_column($authors, 'uid') as $authorUid) {
@@ -482,7 +482,7 @@ class BackendNewsUtility {
$languageRows = $queryBuilder->select('uid', 'title', 'flag')
->from('sys_language')
->orderBy('sorting')
- ->execute()->fetchAll();
+ ->execute()->fetchAllAssociative();
if ($languageRows) {
/** @var BackendUserAuthentication $backendUser */
$backendUser = $GLOBALS['BE_USER'];
@@ -567,7 +567,7 @@ class BackendNewsUtility {
}
}
- return $queryBuilder->execute()->fetchAll();
+ return $queryBuilder->execute()->fetchAllAssociative();
}
return NULL;
--
GitLab