From 5d9a11bf611dc2ffb1efed9842f4f5261c8cdde5 Mon Sep 17 00:00:00 2001
From: Matthias Adrowski <matthias.adrowski@sgalinski.de>
Date: Fri, 1 Apr 2022 13:35:34 +0200
Subject: [PATCH] [TASK] Fix a bunch of phpstan issues
---
Classes/Controller/JoblistController.php | 5 +++--
Classes/Domain/Model/Job.php | 2 +-
Classes/Hooks/PageLayoutView/PluginRenderer.php | 4 ++--
Classes/Paginator/QueryResultRawPaginator.php | 2 +-
Classes/Service/BackendService.php | 4 ++--
Classes/Service/SitemapService.php | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Classes/Controller/JoblistController.php b/Classes/Controller/JoblistController.php
index 5666b370..4b1bd2b3 100644
--- a/Classes/Controller/JoblistController.php
+++ b/Classes/Controller/JoblistController.php
@@ -26,6 +26,7 @@ namespace SGalinski\SgJobs\Controller;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+use Psr\Http\Message\ResponseInterface;
use SGalinski\ProjectBase\Domain\Repository\CountryRepository;
use SGalinski\SgJobs\Domain\Model\Job;
use SGalinski\SgJobs\Domain\Model\JobApplication;
@@ -686,7 +687,7 @@ class JoblistController extends ActionController {
/**
* If for any reason something goes wrong, delete the tmp upload folder
*
- * @return void
+ * @return mixed
* @throws NoSuchArgumentException
*/
public function errorAction() {
@@ -695,7 +696,7 @@ class JoblistController extends ActionController {
$this->deleteTmpFolder($folderName);
}
- parent::errorAction();
+ return parent::errorAction();
}
/**
diff --git a/Classes/Domain/Model/Job.php b/Classes/Domain/Model/Job.php
index 994c3933..a5ba2aaa 100644
--- a/Classes/Domain/Model/Job.php
+++ b/Classes/Domain/Model/Job.php
@@ -108,7 +108,7 @@ class Job extends AbstractEntity {
/**
* @var \SGalinski\SgJobs\Domain\Model\Company $company
*/
- protected $company = '';
+ protected $company;
/**
* @var string $description
diff --git a/Classes/Hooks/PageLayoutView/PluginRenderer.php b/Classes/Hooks/PageLayoutView/PluginRenderer.php
index ac9cae73..226dc649 100644
--- a/Classes/Hooks/PageLayoutView/PluginRenderer.php
+++ b/Classes/Hooks/PageLayoutView/PluginRenderer.php
@@ -87,8 +87,8 @@ class PluginRenderer implements \TYPO3\CMS\Backend\View\PageLayoutViewDrawItemHo
* 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/Paginator/QueryResultRawPaginator.php b/Classes/Paginator/QueryResultRawPaginator.php
index 5452162c..b255a54a 100644
--- a/Classes/Paginator/QueryResultRawPaginator.php
+++ b/Classes/Paginator/QueryResultRawPaginator.php
@@ -31,7 +31,7 @@ final class QueryResultRawPaginator extends AbstractPaginator {
private $queryResult;
/**
- * @var QueryResultInterface
+ * @var \TYPO3\CMS\Extbase\Persistence\QueryResultInterface|object[]
*/
private $paginatedQueryResult;
diff --git a/Classes/Service/BackendService.php b/Classes/Service/BackendService.php
index 073debe0..c107a90e 100644
--- a/Classes/Service/BackendService.php
+++ b/Classes/Service/BackendService.php
@@ -55,7 +55,7 @@ class BackendService {
->from('pages')
->where(
$queryBuilder->expr()->eq('is_siteroot', $queryBuilder->createNamedParameter(1, \PDO::PARAM_INT))
- )->execute()->fetchAll();
+ )->execute()->fetchAllAssociative();
foreach ($rows as $row) {
$pageInfo = BackendUtility::readPageAccess($row['uid'], $GLOBALS['BE_USER']->getPagePermsClause(1));
@@ -129,7 +129,7 @@ class BackendService {
$rows = $queryBuilder->select('pid')
->from('tx_sgjobs_domain_model_job')
->groupBy('pid')
- ->execute()->fetchAll();
+ ->execute()->fetchAllAssociative();
foreach ($rows as $row) {
$pageInfo = BackendUtility::readPageAccess($row['pid'], $GLOBALS['BE_USER']->getPagePermsClause(1));
if ($pageInfo) {
diff --git a/Classes/Service/SitemapService.php b/Classes/Service/SitemapService.php
index ed0d6a8f..b7975206 100644
--- a/Classes/Service/SitemapService.php
+++ b/Classes/Service/SitemapService.php
@@ -60,7 +60,7 @@ class SitemapService {
->execute();
$context = GeneralUtility::makeInstance(Context::class);
- while ($row = $databaseResource->fetch()) {
+ while ($row = $databaseResource->fetchAssociative()) {
try {
$site = GeneralUtility::makeInstance(SiteFinder::class)->getSiteByPageId($row['pid']);
if ($rootPageId > 0 && $site->getRootPageId() !== $rootPageId) {
--
GitLab