Skip to content

Commit 0108a28

Browse files
authored
Merge pull request #6979 from samsonasik/update-rector-0151
[Rector] Update to Rector 0.15.1 and re-enable TypedPropertyFromAssignsRector
2 parents 8e60c03 + 0049b35 commit 0108a28

4 files changed

Lines changed: 3 additions & 11 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"phpunit/phpcov": "^8.2",
2626
"phpunit/phpunit": "^9.1",
2727
"predis/predis": "^1.1 || ^2.0",
28-
"rector/rector": "0.15.0"
28+
"rector/rector": "0.15.1"
2929
},
3030
"suggest": {
3131
"ext-curl": "If you use CURLRequest class",

rector.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
4747
use Rector\Set\ValueObject\LevelSetList;
4848
use Rector\Set\ValueObject\SetList;
49-
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
5049
use Utils\Rector\PassStrictParameterToFunctionParameterRector;
5150
use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
5251
use Utils\Rector\RemoveVarTagFromClassConstantRector;
@@ -111,9 +110,6 @@
111110
GetMockBuilderGetMockToCreateMockRector::class => [
112111
__DIR__ . '/tests/system/Email/EmailTest.php',
113112
],
114-
115-
// buggy on union mixed type, new class extends SomeClass marked as object in union, and false replaced with bool in Union
116-
TypedPropertyFromAssignsRector::class,
117113
]);
118114

119115
// auto import fully qualified class names

tests/system/ControllerTest.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@
3939
final class ControllerTest extends CIUnitTestCase
4040
{
4141
private App $config;
42-
43-
/**
44-
* @var Controller|null
45-
*/
46-
private $controller;
42+
private ?Controller $controller = null;
4743

4844
/**
4945
* Current request.

tests/system/View/DecoratorsTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final class DecoratorsTest extends CIUnitTestCase
2828
{
2929
private FileLocator $loader;
3030
private string $viewsDir;
31-
private $config;
31+
private ?\Config\View $config = null;
3232

3333
protected function setUp(): void
3434
{

0 commit comments

Comments
 (0)