From 555e116f405295edf63394b647d680a9d46de0f7 Mon Sep 17 00:00:00 2001
From: Alexander Schnitzler <git@alexanderschnitzler.de>
Date: Mon, 30 Mar 2020 18:09:37 +0200
Subject: [PATCH] [TASK] Enable phpstan
DefaultValueTypesAssignedToPropertiesRule
Releases: master
Resolves: #90893
Change-Id: Icc339442cded9a268fb66fe932b0f13de292e3b7
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64018
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Benni Mack <benni@typo3.org>
---
Build/phpstan.level3.neon | 2 +-
.../Classes/Controller/EditDocumentController.php | 2 +-
.../backend/Classes/Tree/View/AbstractTreeView.php | 2 +-
.../Tree/View/ContentCreationPagePositionMap.php | 2 +-
.../Classes/View/BackendLayout/BackendLayout.php | 2 +-
.../sysext/belog/Classes/Domain/Model/LogEntry.php | 4 ++--
.../core/Classes/DataHandling/DataHandler.php | 2 +-
.../Restriction/DefaultRestrictionContainer.php | 2 +-
.../Restriction/FrontendRestrictionContainer.php | 2 +-
.../Messaging/Renderer/BootstrapRenderer.php | 4 ++--
.../Classes/Messaging/Renderer/ListRenderer.php | 4 ++--
.../extbase/Classes/Persistence/Generic/Query.php | 2 +-
typo3/sysext/extbase/Classes/Validation/Error.php | 2 +-
.../Classes/Controller/DownloadController.php | 2 +-
.../Classes/Controller/UpdateFromTerController.php | 2 +-
.../Classes/Controller/FileListController.php | 2 +-
.../Classes/Controller/FormEditorController.php | 2 +-
.../Classes/Controller/FormManagerController.php | 2 +-
.../Controller/TypoScriptFrontendController.php | 14 +++++++-------
.../Controller/AdministrationController.php | 2 +-
.../Classes/FolderStructure/DirectoryNode.php | 2 +-
.../install/Classes/FolderStructure/FileNode.php | 2 +-
.../Classes/Linktype/ExternalLinktype.php | 2 +-
.../redirects/Classes/Service/SlugService.php | 4 ++--
24 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/Build/phpstan.level3.neon b/Build/phpstan.level3.neon
index e5f9b3234e0b..d07dd93948d2 100644
--- a/Build/phpstan.level3.neon
+++ b/Build/phpstan.level3.neon
@@ -13,7 +13,7 @@ rules:
- PHPStan\Rules\Functions\ReturnTypeRule
- PHPStan\Rules\Generators\YieldTypeRule
# - PHPStan\Rules\Methods\ReturnTypeRule
-# - PHPStan\Rules\Properties\DefaultValueTypesAssignedToPropertiesRule
+ - PHPStan\Rules\Properties\DefaultValueTypesAssignedToPropertiesRule
# - PHPStan\Rules\Properties\TypesAssignedToPropertiesRule
- PHPStan\Rules\Variables\ThrowTypeRule
- PHPStan\Rules\Variables\VariableCloningRule
diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index f745cdad984a..d8d044812984 100644
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -345,7 +345,7 @@ class EditDocumentController
/**
* Used internally to disable the storage of the document reference (eg. new records)
*
- * @var bool
+ * @var int
*/
protected $dontStoreDocumentRef = 0;
diff --git a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
index ec2870658fc3..328a2104526e 100644
--- a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
@@ -92,7 +92,7 @@ abstract class AbstractTreeView
* Needs to be initialized with $GLOBALS['BE_USER']
* Done by default in init()
*
- * @var \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+ * @var \TYPO3\CMS\Core\Authentication\BackendUserAuthentication|string
*/
public $BE_USER = '';
diff --git a/typo3/sysext/backend/Classes/Tree/View/ContentCreationPagePositionMap.php b/typo3/sysext/backend/Classes/Tree/View/ContentCreationPagePositionMap.php
index 34b983e57b10..91e41e7b6450 100644
--- a/typo3/sysext/backend/Classes/Tree/View/ContentCreationPagePositionMap.php
+++ b/typo3/sysext/backend/Classes/Tree/View/ContentCreationPagePositionMap.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
class ContentCreationPagePositionMap extends PagePositionMap
{
/**
- * @var bool
+ * @var int
*/
public $dontPrintPageInsertIcons = 1;
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/BackendLayout.php b/typo3/sysext/backend/Classes/View/BackendLayout/BackendLayout.php
index 053273c9cfc4..e317fcb65b88 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/BackendLayout.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/BackendLayout.php
@@ -77,7 +77,7 @@ class BackendLayout
protected $contentFetcher;
/**
- * @var LanguageColumn
+ * @var LanguageColumn[]
*/
protected $languageColumns = [];
diff --git a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
index 7115b8f9ed40..937acc34bb9c 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
@@ -58,7 +58,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
/**
* Table name
*
- * @var string
+ * @var string|int
*/
protected $tableName = 0;
@@ -135,7 +135,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
/**
* New ID
*
- * @var string
+ * @var string|int
*/
protected $newId = 0;
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index 66c7f7b32515..2a31af7018d2 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -557,7 +557,7 @@ class DataHandler implements LoggerAwareInterface
* Tells, that this DataHandler instance was called from \TYPO3\CMS\Impext\ImportExport.
* This variable is set by \TYPO3\CMS\Impext\ImportExport
*
- * @var array
+ * @var bool
*/
public $callFromImpExp = false;
diff --git a/typo3/sysext/core/Classes/Database/Query/Restriction/DefaultRestrictionContainer.php b/typo3/sysext/core/Classes/Database/Query/Restriction/DefaultRestrictionContainer.php
index 3fa0808b3df2..7d249dc7aa9b 100644
--- a/typo3/sysext/core/Classes/Database/Query/Restriction/DefaultRestrictionContainer.php
+++ b/typo3/sysext/core/Classes/Database/Query/Restriction/DefaultRestrictionContainer.php
@@ -23,7 +23,7 @@ class DefaultRestrictionContainer extends AbstractRestrictionContainer
/**
* Default restriction classes.
*
- * @var QueryRestrictionInterface[]
+ * @var string[]
*/
protected $defaultRestrictionTypes = [
DeletedRestriction::class,
diff --git a/typo3/sysext/core/Classes/Database/Query/Restriction/FrontendRestrictionContainer.php b/typo3/sysext/core/Classes/Database/Query/Restriction/FrontendRestrictionContainer.php
index bcfbedaf0c1c..2f918969271d 100644
--- a/typo3/sysext/core/Classes/Database/Query/Restriction/FrontendRestrictionContainer.php
+++ b/typo3/sysext/core/Classes/Database/Query/Restriction/FrontendRestrictionContainer.php
@@ -28,7 +28,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
class FrontendRestrictionContainer extends AbstractRestrictionContainer
{
/**
- * @var QueryRestrictionInterface[]
+ * @var string[]
*/
protected $defaultRestrictionTypes = [
DeletedRestriction::class,
diff --git a/typo3/sysext/core/Classes/Messaging/Renderer/BootstrapRenderer.php b/typo3/sysext/core/Classes/Messaging/Renderer/BootstrapRenderer.php
index d58edb32e91b..d0166f978579 100644
--- a/typo3/sysext/core/Classes/Messaging/Renderer/BootstrapRenderer.php
+++ b/typo3/sysext/core/Classes/Messaging/Renderer/BootstrapRenderer.php
@@ -27,7 +27,7 @@ use TYPO3\CMS\Core\Messaging\FlashMessage;
class BootstrapRenderer implements FlashMessageRendererInterface
{
/**
- * @var string The message severity class names
+ * @var string[] The message severity class names
*/
protected static $classes = [
FlashMessage::NOTICE => 'notice',
@@ -38,7 +38,7 @@ class BootstrapRenderer implements FlashMessageRendererInterface
];
/**
- * @var string The message severity icon names
+ * @var string[] The message severity icon names
*/
protected static $icons = [
FlashMessage::NOTICE => 'lightbulb-o',
diff --git a/typo3/sysext/core/Classes/Messaging/Renderer/ListRenderer.php b/typo3/sysext/core/Classes/Messaging/Renderer/ListRenderer.php
index afc66508a037..319c25276d3f 100644
--- a/typo3/sysext/core/Classes/Messaging/Renderer/ListRenderer.php
+++ b/typo3/sysext/core/Classes/Messaging/Renderer/ListRenderer.php
@@ -28,7 +28,7 @@ use TYPO3\CMS\Core\Messaging\FlashMessage;
class ListRenderer implements FlashMessageRendererInterface
{
/**
- * @var string The message severity class names
+ * @var string[] The message severity class names
*/
protected static $classes = [
FlashMessage::NOTICE => 'notice',
@@ -39,7 +39,7 @@ class ListRenderer implements FlashMessageRendererInterface
];
/**
- * @var string The message severity icon names
+ * @var string[] The message severity icon names
*/
protected static $icons = [
FlashMessage::NOTICE => 'lightbulb-o',
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
index 5f2ba930f629..c58746e21869 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
@@ -82,7 +82,7 @@ class Query implements QueryInterface
protected $statement;
/**
- * @var int
+ * @var int[]
*/
protected $orderings = [];
diff --git a/typo3/sysext/extbase/Classes/Validation/Error.php b/typo3/sysext/extbase/Classes/Validation/Error.php
index ce9b670f5725..203f3cfc665e 100644
--- a/typo3/sysext/extbase/Classes/Validation/Error.php
+++ b/typo3/sysext/extbase/Classes/Validation/Error.php
@@ -25,7 +25,7 @@ class Error extends \TYPO3\CMS\Extbase\Error\Error
protected $message = 'Unknown validation error';
/**
- * @var string
+ * @var int
*/
protected $code = 1201447005;
}
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
index 4345e9928996..5c228c1abf10 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
@@ -47,7 +47,7 @@ class DownloadController extends AbstractController
protected $downloadUtility;
/**
- * @var JsonView
+ * @var string
*/
protected $defaultViewObjectName = JsonView::class;
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php b/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
index be9179494cf9..cdc562363270 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
@@ -48,7 +48,7 @@ class UpdateFromTerController extends AbstractController
protected $extensionRepository;
/**
- * @var JsonView
+ * @var string
*/
protected $defaultViewObjectName = JsonView::class;
diff --git a/typo3/sysext/filelist/Classes/Controller/FileListController.php b/typo3/sysext/filelist/Classes/Controller/FileListController.php
index d8a82ca6ca1c..a90ec95839a4 100644
--- a/typo3/sysext/filelist/Classes/Controller/FileListController.php
+++ b/typo3/sysext/filelist/Classes/Controller/FileListController.php
@@ -137,7 +137,7 @@ class FileListController extends ActionController implements LoggerAwareInterfac
/**
* BackendTemplateView Container
*
- * @var BackendTemplateView
+ * @var string
*/
protected $defaultViewObjectName = BackendTemplateView::class;
diff --git a/typo3/sysext/form/Classes/Controller/FormEditorController.php b/typo3/sysext/form/Classes/Controller/FormEditorController.php
index eac1ee2a292c..9dd18dd8dc22 100644
--- a/typo3/sysext/form/Classes/Controller/FormEditorController.php
+++ b/typo3/sysext/form/Classes/Controller/FormEditorController.php
@@ -53,7 +53,7 @@ class FormEditorController extends AbstractBackendController
/**
* Default View Container
*
- * @var BackendTemplateView
+ * @var string
*/
protected $defaultViewObjectName = BackendTemplateView::class;
diff --git a/typo3/sysext/form/Classes/Controller/FormManagerController.php b/typo3/sysext/form/Classes/Controller/FormManagerController.php
index 6ec0ebe3d49c..a1413f426280 100644
--- a/typo3/sysext/form/Classes/Controller/FormManagerController.php
+++ b/typo3/sysext/form/Classes/Controller/FormManagerController.php
@@ -60,7 +60,7 @@ class FormManagerController extends AbstractBackendController
/**
* Default View Container
*
- * @var BackendTemplateView
+ * @var string
*/
protected $defaultViewObjectName = BackendTemplateView::class;
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index 7056f9605197..388300642c42 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -113,7 +113,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
/**
* The type (read-only)
- * @var int
+ * @var int|string
*/
public $type = '';
@@ -189,7 +189,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
/**
* sys_page-object, pagefunctions
*
- * @var PageRepository
+ * @var PageRepository|string
*/
public $sys_page = '';
@@ -223,7 +223,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
/**
* The frontend user
*
- * @var FrontendUserAuthentication
+ * @var FrontendUserAuthentication|string
*/
public $fe_user = '';
@@ -318,7 +318,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
/**
* TypoScript configuration of the page-object pointed to by sPre.
* $this->tmpl->setup[$this->sPre.'.']
- * @var array
+ * @var array|string
*/
public $pSetup = '';
@@ -357,7 +357,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
/**
* May be set to the pagesTSconfig
- * @var array
+ * @var array|string
* @internal
*/
protected $pagesTSconfig = '';
@@ -399,7 +399,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
public $additionalCSS = [];
/**
- * @var string
+ * @var string
*/
public $JSCode;
@@ -593,7 +593,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
/**
* Page content render object
*
- * @var ContentObjectRenderer
+ * @var ContentObjectRenderer|string
*/
public $cObj = '';
diff --git a/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php b/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
index 52b75c847254..874375b8b58a 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
@@ -70,7 +70,7 @@ class AdministrationController extends ActionController
/**
* Backend Template Container
*
- * @var BackendTemplateView
+ * @var string
*/
protected $defaultViewObjectName = BackendTemplateView::class;
diff --git a/typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php b/typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php
index 75a36413eaf8..7ffa0b2c7806 100644
--- a/typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Utility\StringUtility;
class DirectoryNode extends AbstractNode implements NodeInterface
{
/**
- * @var int|null Default for directories is octal 02775 == decimal 1533
+ * @var string Default for directories is octal 02775 == decimal 1533
*/
protected $targetPermission = '2775';
diff --git a/typo3/sysext/install/Classes/FolderStructure/FileNode.php b/typo3/sysext/install/Classes/FolderStructure/FileNode.php
index 1fab25aaf3e0..1e299eb48691 100644
--- a/typo3/sysext/install/Classes/FolderStructure/FileNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/FileNode.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Messaging\FlashMessage;
class FileNode extends AbstractNode implements NodeInterface
{
/**
- * @var int|null Default for files is octal 0664 == decimal 436
+ * @var string Default for files is octal 0664 == decimal 436
*/
protected $targetPermission = '0664';
diff --git a/typo3/sysext/linkvalidator/Classes/Linktype/ExternalLinktype.php b/typo3/sysext/linkvalidator/Classes/Linktype/ExternalLinktype.php
index 663221eee4b0..0703c2942015 100644
--- a/typo3/sysext/linkvalidator/Classes/Linktype/ExternalLinktype.php
+++ b/typo3/sysext/linkvalidator/Classes/Linktype/ExternalLinktype.php
@@ -54,7 +54,7 @@ class ExternalLinktype extends AbstractLinktype
* Preferred method of fetching (HEAD | GET).
* If HEAD is used, we fallback to GET
*
- * @var array
+ * @var string
*/
protected $method = 'HEAD';
diff --git a/typo3/sysext/redirects/Classes/Service/SlugService.php b/typo3/sysext/redirects/Classes/Service/SlugService.php
index e7e4dbc7c2a8..e6c81a73128e 100644
--- a/typo3/sysext/redirects/Classes/Service/SlugService.php
+++ b/typo3/sysext/redirects/Classes/Service/SlugService.php
@@ -75,12 +75,12 @@ class SlugService implements LoggerAwareInterface
protected $pageRepository;
/**
- * @var CorrelationId
+ * @var CorrelationId|string
*/
protected $correlationIdRedirectCreation = '';
/**
- * @var CorrelationId
+ * @var CorrelationId|string
*/
protected $correlationIdSlugUpdate = '';
--
GitLab