From 48792c874d3fee2b335bd37b3dd5ef18a17d076c Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Sat, 16 Dec 2017 15:32:27 +0100
Subject: [PATCH] [TASK] CGL fix core after php-cs-fixer 2.9.0 raise
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The "self_accessor" fixer is more strict with younger
php-cs-fixer releases and changes method argument type
hints to self if a class object of the same class is
expected. It also changes return type hints to self
in this case.
This fixer now may collide with the "xclass" system
of the core and is thus deactivated. We shoud decide
manually if self or class name is used.
Change-Id: I3a8c20bea1d79ac2c7bc1e9ecbc2d435c4047843
Resolves: #83360
Related: #83331
Releases: master, 8.7
Reviewed-on: https://review.typo3.org/55121
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Stephan Großberndt <stephan@grossberndt.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
Build/.php_cs | 1 -
typo3/sysext/backend/Classes/Controller/PageLayoutController.php | 1 -
typo3/sysext/extbase/Classes/Persistence/Generic/Query.php | 1 -
3 files changed, 3 deletions(-)
diff --git a/Build/.php_cs b/Build/.php_cs
index 41f5e0e30e26..2eae9657b106 100644
--- a/Build/.php_cs
+++ b/Build/.php_cs
@@ -75,7 +75,6 @@ return PhpCsFixer\Config::create()
'lowercase_cast' => true,
'no_leading_namespace_whitespace' => true,
'native_function_casing' => true,
- 'self_accessor' => true,
'no_short_bool_cast' => true,
'no_unneeded_control_parentheses' => true,
'phpdoc_no_empty_return' => true,
diff --git a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
index 5e2f3a4722fd..e89a693d8229 100644
--- a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
@@ -137,7 +137,6 @@ class PageLayoutController
public $pageinfo;
/**
-
* "Pseudo" Description -table name
*
* @var string
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
index 7f78c65877d0..56ad15b6908b 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
@@ -60,7 +60,6 @@ class Query implements QueryInterface
/**
* @var \TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface
-
*/
protected $persistenceManager;
--
GitLab