Merge remote-tracking branch 'upstream/develop' into less-class-naming-strpos

Author: fredden

.github/workflows/php.yml

@@ -13,7 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"

Magento2/Rector/Tests/AddArrayAccessInterfaceReturnTypes/AddArrayAccessInterfaceReturnTypesTest.php

@@ -16,9 +16,9 @@ class AddArrayAccessInterfaceReturnTypesTest extends AbstractRectorTestCase
     /**
      * @dataProvider provideData()
      */
-    public function test(SmartFileInfo $fileInfo): void
+    public function test(string $fileInfo): void
     {
-        $this->doTestFileInfo($fileInfo);
+        $this->doTestFile($fileInfo);
     }
 
     /**

Magento2/Rector/Tests/ReplaceMbStrposNullLimit/ReplaceMbStrposNullLimitTest.php

@@ -16,9 +16,9 @@ class ReplaceMbStrposNullLimitTest extends AbstractRectorTestCase
     /**
      * @dataProvider provideData()
      */
-    public function test(SmartFileInfo $fileInfo): void
+    public function test(string $fileInfo): void
     {
-        $this->doTestFileInfo($fileInfo);
+        $this->doTestFile($fileInfo);
     }
 
     /**

Magento2/Rector/Tests/ReplaceNewDateTimeNull/ReplaceNewDateTimeNullTest.php

@@ -16,9 +16,9 @@ class ReplaceNewDateTimeNullTest extends AbstractRectorTestCase
     /**
      * @dataProvider provideData()
      */
-    public function test(SmartFileInfo $fileInfo): void
+    public function test(string $fileInfo): void
     {
-        $this->doTestFileInfo($fileInfo);
+        $this->doTestFile($fileInfo);
     }
 
     /**

Magento2/Rector/Tests/ReplacePregSplitNullLimit/ReplacePregSplitNullLimitTest.php

@@ -16,9 +16,9 @@ class ReplacePregSplitNullLimitTest extends AbstractRectorTestCase
     /**
      * @dataProvider provideData()
      */
-    public function test(SmartFileInfo $fileInfo): void
+    public function test(string $fileInfo): void
     {
-        $this->doTestFileInfo($fileInfo);
+        $this->doTestFile($fileInfo);
     }
 
     /**

Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php

@@ -29,7 +29,9 @@ class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
         T_NS_SEPARATOR,
         T_STRING,
         T_COMMENT,
-        T_NULLABLE
+        T_NULLABLE,
+        T_BITWISE_AND,
+        T_TYPE_UNION,
     ];
 
     /**

Magento2/Sniffs/Legacy/TableNameSniff.php

@@ -189,8 +189,10 @@ private function checkOccurrencesInProperty(File $phpcsFile, int $stackPtr, arra
     private function checkOccurrencesInArray(File $phpcsFile, int $stackPtr, array $tokens): void
     {
         $aliasPos = $phpcsFile->findPrevious(
-            T_CONSTANT_ENCAPSED_STRING,
-            $stackPtr -1
+            T_WHITESPACE,
+            $stackPtr - 1,
+            null,
+            true,
         );
 
         $alias = trim($tokens[$aliasPos]['content'], '\'"');

Magento2/Sniffs/Less/ClassNamingSniff.php

@@ -67,7 +67,9 @@ public function process(File $phpcsFile, $stackPtr)
             );
         }
 
-        if (strlen($className) > 1 && strpos($className, self::STRING_HELPER_CLASSES_PREFIX, 2) !== false) {
+        if (strlen($className) > 1 && strpos($className, self::STRING_HELPER_CLASSES_PREFIX, 2) !== false
+            && !str_starts_with($className, 'admin__')
+        ) {
             $phpcsFile->addError(
                 'CSS class names should be separated with "-" (dash) instead of "_" (underscore)',
                 $stackPtr,

Magento2/Tests/Legacy/TableNameUnitTest.inc

@@ -28,6 +28,8 @@ $select = $connection->select()->from(
     ['main_table' => 'magento_sample_table']
 );
 
+$fooBar=array(0=>array(125,0,875,750),'33' =>array(85,0,194,716), 10 => 100);
+
 class Collection extends \Magento\Sales\Model\ResourceModel\Report\Order\Collection
 {
     /**

Magento2/Tests/Legacy/TableNameUnitTest.php

@@ -19,7 +19,7 @@ public function getErrorList($testFile = '')
             7 => 1,
             16 => 1,
             20 => 1,
-            38 => 1,
+            40 => 1,
         ];
     }
 

Magento2/Tests/Less/ClassNamingUnitTest.less

@@ -35,3 +35,8 @@
 .a {
   text-decoration: none;
 }
+
+// @see https://github.com/magento/magento-coding-standard/issues/409
+.admin__allowed {
+  background: green;
+}

composer.json

@@ -6,15 +6,16 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "26",
+    "version": "31",
     "require": {
-        "php": ">=7.3",
-        "webonyx/graphql-php": "^14.9",
+        "php": ">=7.4",
+        "webonyx/graphql-php": "^15.0",
         "ext-simplexml": "*",
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.13.0"
+        "rector/rector": "^0.15.10",
+        "symfony/polyfill": "^1.16"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"