Merge pull request #141 from magento-commerce/imported-sergeynezbrits…

…kiy-magento-coding-standard-346 [Imported] Fix Issue 340
magento · Dec 22, 2021 · cd02bf3 · cd02bf3
2 parents 6f2a73b + 816605b
commit cd02bf3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/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
     ];
 
     /**

diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/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;
 }
diff --git a/phpunit.xml.dist b/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>