Merge branch 'develop' of https://github.com/mage-os/mirror-magento-c…

…oding-standard into develop
mage-os · Sep 7, 2024 · 006a4f4 · 006a4f4
2 parents 7b02061 + e0f31fa
commit 006a4f4
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 35 deletions.
diff --git a/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php b/Magento2/Rector/Src/AddArrayAccessInterfaceReturnTypes.php
@@ -9,7 +9,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 

diff --git a/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php b/Magento2/Rector/Src/ReplaceMbStrposNullLimit.php
@@ -10,7 +10,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Scalar\LNumber;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 

diff --git a/Magento2/Rector/Src/ReplaceNewDateTimeNull.php b/Magento2/Rector/Src/ReplaceNewDateTimeNull.php
@@ -10,7 +10,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Scalar\String_;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 

diff --git a/Magento2/Rector/Src/ReplacePregSplitNullLimit.php b/Magento2/Rector/Src/ReplacePregSplitNullLimit.php
@@ -10,7 +10,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\FuncCall;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 

diff --git a/composer.json b/composer.json
@@ -6,14 +6,14 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "33",
+    "version": "34",
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "webonyx/graphql-php": "^15.0",
         "ext-simplexml": "*",
         "ext-dom": "*",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.17.12",
+        "rector/rector": "^1.2.4",
         "phpcsstandards/phpcsutils": "^1.0.5",
         "magento/php-compatibility-fork": "^0.1"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/rector.php b/rector.php
@@ -5,7 +5,7 @@
 use Magento2\Rector\Src\ReplaceMbStrposNullLimit;
 use Magento2\Rector\Src\ReplaceNewDateTimeNull;
 use Rector\Config\RectorConfig;
-use Rector\Core\ValueObject\PhpVersion;
+use Rector\ValueObject\PhpVersion;
 use Rector\Php80\Rector\Class_\StringableForToStringRector;
 use Rector\Php80\Rector\ClassMethod\FinalPrivateToPrivateVisibilityRector;
 use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
@@ -17,16 +17,13 @@
     $rectorConfig->phpVersion(PhpVersion::PHP_80);
     $rectorConfig->phpVersion(PhpVersion::PHP_81);
 
-    // get services (needed for register a single rule)
-    $services = $rectorConfig->services();
-
     // register a single rule
-    $services->set(FinalPrivateToPrivateVisibilityRector::class);
-    $services->set(OptionalParametersAfterRequiredRector::class);
-    $services->set(SetStateToStaticRector::class);
-    $services->set(StringableForToStringRector::class);
-    $services->set(Php81ResourceReturnToObjectRector::class);
-    $services->set(ReplacePregSplitNullLimit::class);
-    $services->set(ReplaceMbStrposNullLimit::class);
-    $services->set(ReplaceNewDateTimeNull::class);
+    $rectorConfig->singleton(FinalPrivateToPrivateVisibilityRector::class);
+    $rectorConfig->singleton(OptionalParametersAfterRequiredRector::class);
+    $rectorConfig->singleton(SetStateToStaticRector::class);
+    $rectorConfig->singleton(StringableForToStringRector::class);
+    $rectorConfig->singleton(Php81ResourceReturnToObjectRector::class);
+    $rectorConfig->singleton(ReplacePregSplitNullLimit::class);
+    $rectorConfig->singleton(ReplaceMbStrposNullLimit::class);
+    $rectorConfig->singleton(ReplaceNewDateTimeNull::class);
 };