Skip to content

Commit ab55fe1

Browse files
authored
Merge pull request #6942 from codeigniter4/dependabot/composer/rector/rector-0.15.0
chore(deps-dev): update rector/rector requirement from 0.14.8 to 0.15.0
2 parents 3dbea06 + 457bee3 commit ab55fe1

60 files changed

Lines changed: 201 additions & 53 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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.14.8"
28+
"rector/rector": "0.15.0"
2929
},
3030
"suggest": {
3131
"ext-curl": "If you use CURLRequest class",

rector.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
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;
4950
use Utils\Rector\PassStrictParameterToFunctionParameterRector;
5051
use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
5152
use Utils\Rector\RemoveVarTagFromClassConstantRector;
@@ -119,6 +120,9 @@
119120
GetMockBuilderGetMockToCreateMockRector::class => [
120121
__DIR__ . '/tests/system/Email/EmailTest.php',
121122
],
123+
124+
// buggy on union mixed type, new class extends SomeClass marked as object in union, and false replaced with bool in Union
125+
TypedPropertyFromAssignsRector::class,
122126
]);
123127

124128
// auto import fully qualified class names

tests/system/API/ResponseTraitTest.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,16 @@
2929
*/
3030
final class ResponseTraitTest extends CIUnitTestCase
3131
{
32+
/**
33+
* @var MockIncomingRequest|null
34+
*/
3235
private $request;
36+
37+
/**
38+
* @var MockResponse|null
39+
*/
3340
private $response;
41+
3442
private ?FormatterInterface $formatter = null;
3543

3644
protected function setUp(): void

tests/system/CLI/CLITest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
*/
2424
final class CLITest extends CIUnitTestCase
2525
{
26+
/**
27+
* @var false|resource
28+
*/
2629
private $stream_filter;
2730

2831
protected function setUp(): void

tests/system/CLI/CommandRunnerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
final class CommandRunnerTest extends CIUnitTestCase
2525
{
2626
/**
27-
* @var resource
27+
* @var false|resource
2828
*/
2929
private $streamFilter;
3030

tests/system/CLI/ConsoleTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
final class ConsoleTest extends CIUnitTestCase
2828
{
2929
private DotEnv $env;
30+
31+
/**
32+
* @var false|resource
33+
*/
3034
private $stream_filter;
3135

3236
protected function setUp(): void

tests/system/Commands/BaseCommandTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace CodeIgniter\Commands;
1313

14+
use CodeIgniter\Log\Logger;
1415
use CodeIgniter\Test\CIUnitTestCase;
1516
use Config\Services;
1617
use Tests\Support\Commands\AppInfo;
@@ -22,7 +23,7 @@
2223
*/
2324
final class BaseCommandTest extends CIUnitTestCase
2425
{
25-
private $logger;
26+
private Logger $logger;
2627

2728
protected function setUp(): void
2829
{

tests/system/Commands/ClearCacheTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
*/
2424
final class ClearCacheTest extends CIUnitTestCase
2525
{
26+
/**
27+
* @var false|resource
28+
*/
2629
private $streamFilter;
2730

2831
protected function setUp(): void

tests/system/Commands/ClearDebugbarTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121
*/
2222
final class ClearDebugbarTest extends CIUnitTestCase
2323
{
24+
/**
25+
* @var false|resource
26+
*/
2427
private $streamFilter;
25-
private $time;
28+
29+
private int $time;
2630

2731
protected function setUp(): void
2832
{

tests/system/Commands/ClearLogsTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121
*/
2222
final class ClearLogsTest extends CIUnitTestCase
2323
{
24+
/**
25+
* @var false|resource
26+
*/
2427
private $streamFilter;
25-
private $date;
28+
29+
private string $date;
2630

2731
protected function setUp(): void
2832
{

0 commit comments

Comments
 (0)