Merge pull request #190 from magento-commerce/develop

Version 25 master update

Author: svera

Magento2/Sniffs/CodeAnalysis/EmptyBlockSniff.php

@@ -37,6 +37,17 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
+        // Ignore empty constructor function blocks when using property promotion
+        if ($tokens[$stackPtr]['code'] === T_FUNCTION &&
+            strpos($phpcsFile->getDeclarationName($stackPtr), '__construct') === 0 &&
+            count($phpcsFile->getMethodParameters($stackPtr)) > 0 &&
+            array_reduce($phpcsFile->getMethodParameters($stackPtr), static function ($result, $methodParam) {
+                return $result && isset($methodParam['property_visibility']);
+            }, true)) {
+
+            return;
+        }
+
         parent::process($phpcsFile, $stackPtr);
     }//end process()
 }

Magento2/Sniffs/Less/ColonSpacingSniff.php

@@ -60,12 +60,13 @@ private function needValidateSpaces(File $phpcsFile, $stackPtr, $tokens)
             return false;
         }
 
-        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] !== T_STYLE) {
-            // The colon is not part of a style definition.
+        // Avoid false positives when parsing pseudo-classes
+        $next = $phpcsFile->findNext([T_SEMICOLON, T_OPEN_CURLY_BRACKET], $stackPtr + 1);
+        if ($tokens[$next]['code'] === T_OPEN_CURLY_BRACKET) {
             return false;
         }
 
+        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
         if ($tokens[$prev]['content'] === 'progid') {
             // Special case for IE filters.
             return false;

Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.inc

@@ -76,3 +76,15 @@ function emptyFunction () { /*Empty function block*/ }
 function nonEmptyFunction () { return true; }
 
 function aroundEmptyFunction ($foo, $bar) { }
+
+class Foo {
+    public function __construct(private $bar) {}
+}
+
+class Foo2 {
+    public function __construct() {}
+}
+
+class Foo3 {
+    public function __construct(private $bar, $baz) {}
+}

Magento2/Tests/CodeAnalysis/EmptyBlockUnitTest.php

@@ -29,6 +29,8 @@ public function getErrorList()
             68 => 1,
             72 => 2,
             74 => 1,
+            85 => 1,
+            89 => 1
         ];
     }
 

Magento2/Tests/Less/ColonSpacingUnitTest.less

@@ -5,22 +5,46 @@
 
 
 div#foo {
-  blah:'abc';
+    blah:'abc';
 }
 
 .my #foo .blah {
-  some:  'stuff';
+    some:  'stuff';
 }
 
 .blah {
-  foo :'jkl';
+    foo :'jkl';
 }
 
 .foo {
-  bar:
+    bar:
           'xyz';
 }
 
 .right {
-  way: 'good'
+    way: 'good';
+}
+
+a:active {
+    color: #000;
+}
+
+@abs-action-button-as-link: {
+    &:not(:focus) {
+        box-shadow: none;
+    }
+}
+
+.actions-toolbar {
+    &:not(:first-child) {
+        &:extend(.abs-add-clearfix all);
+            > .secondary {
+                .action {
+                    &.add {
+                        margin-top: @indent__l;
+                    }
+                }
+            float: left;
+        }
+    }
 }

composer.json

@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "24",
+    "version": "25",
     "require": {
         "php": ">=7.3",
         "webonyx/graphql-php": "^14.9",