Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 7efd884

Browse files
Merge branch 'develop' of https://github.com/magento-commerce/magento-coding-standard into ACP2E-2977
2 parents a539f96 + e0f31fa commit 7efd884

File tree

7 files changed

+31
-35
lines changed

7 files changed

+31
-35
lines changed

‎Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
use PhpParser\Node;
1111
use PhpParser\Node\Stmt\Class_;
12-
use Rector\Core\Rector\AbstractRector;
12+
use Rector\Rector\AbstractRector;
1313
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
1414
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
1515

‎Magento2/Rector/Src/ReplaceMbStrposNullLimit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use PhpParser\Node;
1111
use PhpParser\Node\Expr\FuncCall;
1212
use PhpParser\Node\Scalar\LNumber;
13-
use Rector\Core\Rector\AbstractRector;
13+
use Rector\Rector\AbstractRector;
1414
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
1515
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
1616

‎Magento2/Rector/Src/ReplaceNewDateTimeNull.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use PhpParser\Node;
1111
use PhpParser\Node\Expr\New_;
1212
use PhpParser\Node\Scalar\String_;
13-
use Rector\Core\Rector\AbstractRector;
13+
use Rector\Rector\AbstractRector;
1414
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
1515
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
1616

‎Magento2/Rector/Src/ReplacePregSplitNullLimit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use PhpParser\Node;
1111
use PhpParser\Node\Expr\ConstFetch;
1212
use PhpParser\Node\Expr\FuncCall;
13-
use Rector\Core\Rector\AbstractRector;
13+
use Rector\Rector\AbstractRector;
1414
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
1515
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
1616

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
"AFL-3.0"
77
],
88
"type": "phpcodesniffer-standard",
9-
"version": "33",
9+
"version": "34",
1010
"require": {
1111
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
1212
"webonyx/graphql-php": "^15.0",
1313
"ext-simplexml": "*",
1414
"ext-dom": "*",
1515
"squizlabs/php_codesniffer": "^3.6.1",
16-
"rector/rector": "^0.17.12",
16+
"rector/rector": "^1.2.4",
1717
"phpcsstandards/phpcsutils": "^1.0.5",
1818
"magento/php-compatibility-fork": "^0.1"
1919
},

‎composer.lock‎

Lines changed: 16 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rector.php‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Magento2\Rector\Src\ReplaceMbStrposNullLimit;
66
use Magento2\Rector\Src\ReplaceNewDateTimeNull;
77
use Rector\Config\RectorConfig;
8-
use Rector\Core\ValueObject\PhpVersion;
8+
use Rector\ValueObject\PhpVersion;
99
use Rector\Php80\Rector\Class_\StringableForToStringRector;
1010
use Rector\Php80\Rector\ClassMethod\FinalPrivateToPrivateVisibilityRector;
1111
use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
@@ -17,16 +17,13 @@
1717
$rectorConfig->phpVersion(PhpVersion::PHP_80);
1818
$rectorConfig->phpVersion(PhpVersion::PHP_81);
1919

20-
// get services (needed for register a single rule)
21-
$services = $rectorConfig->services();
22-
2320
// register a single rule
24-
$services->set(FinalPrivateToPrivateVisibilityRector::class);
25-
$services->set(OptionalParametersAfterRequiredRector::class);
26-
$services->set(SetStateToStaticRector::class);
27-
$services->set(StringableForToStringRector::class);
28-
$services->set(Php81ResourceReturnToObjectRector::class);
29-
$services->set(ReplacePregSplitNullLimit::class);
30-
$services->set(ReplaceMbStrposNullLimit::class);
31-
$services->set(ReplaceNewDateTimeNull::class);
21+
$rectorConfig->singleton(FinalPrivateToPrivateVisibilityRector::class);
22+
$rectorConfig->singleton(OptionalParametersAfterRequiredRector::class);
23+
$rectorConfig->singleton(SetStateToStaticRector::class);
24+
$rectorConfig->singleton(StringableForToStringRector::class);
25+
$rectorConfig->singleton(Php81ResourceReturnToObjectRector::class);
26+
$rectorConfig->singleton(ReplacePregSplitNullLimit::class);
27+
$rectorConfig->singleton(ReplaceMbStrposNullLimit::class);
28+
$rectorConfig->singleton(ReplaceNewDateTimeNull::class);
3229
};

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /