Merge pull request #196 from magento-commerce/develop

Version 26 master update

Magento2/Helpers/Commenting/PHPDocFormattingValidator.php

@@ -123,6 +123,12 @@ public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)
         }
         $seePtr = $this->getTagPosition('@see', $commentStartPtr, $tokens);
         if ($seePtr === -1) {
+            if (preg_match(
+                "/This [a-zA-Z]* will be removed in version \d.\d.\d without replacement/",
+                $tokens[$deprecatedPtr + 2]['content']
+            )) {
+                return true;
+            }
             return false;
         }
 

Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/config/configured_rule.php

@@ -1,14 +1,13 @@
 <?php
 /**
- * Copyright 2021 Adobe
+ * Copyright 2022 Adobe
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
 use Magento2\Rector\Src\AddArrayAccessInterfaceReturnTypes;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Config\RectorConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-    $services->set(AddArrayAccessInterfaceReturnTypes::class);
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(AddArrayAccessInterfaceReturnTypes::class);
 };

Magento2/Rector/Tests/ReplaceMbStrposNullLimit/config/configured_rule.php

@@ -1,14 +1,13 @@
 <?php
 /**
- * Copyright 2021 Adobe
+ * Copyright 2022 Adobe
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
 use Magento2\Rector\Src\ReplaceMbStrposNullLimit;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Config\RectorConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-    $services->set(ReplaceMbStrposNullLimit::class);
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(ReplaceMbStrposNullLimit::class);
 };

Magento2/Rector/Tests/ReplaceNewDateTimeNull/config/configured_rule.php

@@ -1,14 +1,13 @@
 <?php
 /**
- * Copyright 2021 Adobe
+ * Copyright 2022 Adobe
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
 use Magento2\Rector\Src\ReplaceNewDateTimeNull;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Config\RectorConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-    $services->set(ReplaceNewDateTimeNull::class);
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(ReplaceNewDateTimeNull::class);
 };

Magento2/Rector/Tests/ReplacePregSplitNullLimit/config/configured_rule.php

@@ -1,14 +1,13 @@
 <?php
 /**
- * Copyright 2021 Adobe
+ * Copyright 2022 Adobe
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
 use Magento2\Rector\Src\ReplacePregSplitNullLimit;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Config\RectorConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-    $services->set(ReplacePregSplitNullLimit::class);
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(ReplacePregSplitNullLimit::class);
 };