Merge pull request magento#141 from magento-commerce/imported-sergeynezbritskiy-magento-coding-standard-346

[Imported] Fix Issue 340

Author: sivaschenko

Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php

@@ -28,7 +28,8 @@ class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
         T_WHITESPACE,
         T_NS_SEPARATOR,
         T_STRING,
-        T_COMMENT
+        T_COMMENT,
+        T_NULLABLE
     ];
 
     /**

Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc

@@ -134,5 +134,12 @@ class correctlyFormattedClassMemberDocBlock
     /**
      * @var string
      */
-    protected string $test;
+    protected string $test1;
+
+    /**
+     * Ensure that nullable sign in the property type hint declaration is interpreted correctly
+     *
+     * @var string|null
+     */
+    protected ?string $test2;
 }

phpunit.xml.dist

@@ -9,6 +9,6 @@
         </testsuite>
     </testsuites>
     <php>
-        <env name="PHPCS_IGNORE_TESTS" value="Generic,MySource,PEAR,PSR1,PSR2,Squiz,Zend"/>
+        <env name="PHPCS_IGNORE_TESTS" value="Generic,MySource,PEAR,PSR1,PSR2,PSR12,Squiz,Zend"/>
     </php>
 </phpunit>