Merge pull request #412 from QoboLtd/slevomat-cs-8.16-next

Update to Slevomat 8.16 and phpdoc-parser 2

Author: ADmad

CakePHP/Sniffs/Commenting/TypeHintSniff.php

@@ -32,6 +32,7 @@
 use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
 
 /**
  * Verifies order of types in type hints
@@ -294,13 +295,16 @@ protected static function getValueNode(string $tagName, string $tagComment): Php
     {
         static $phpDocParser;
         if (!$phpDocParser) {
-            $constExprParser = new ConstExprParser();
-            $phpDocParser = new PhpDocParser(new TypeParser($constExprParser), $constExprParser);
+            $config = new ParserConfig(usedAttributes: ['lines' => true, 'indexes' => true]);
+
+            $constExprParser = new ConstExprParser($config);
+            $phpDocParser = new PhpDocParser($config, new TypeParser($config, $constExprParser), $constExprParser);
         }
 
         static $phpDocLexer;
         if (!$phpDocLexer) {
-            $phpDocLexer = new Lexer();
+            $config = new ParserConfig(usedAttributes: ['lines' => true, 'indexes' => true]);
+            $phpDocLexer = new Lexer($config);
         }
 
         return $phpDocParser->parseTagValue(new TokenIterator($phpDocLexer->tokenize($tagComment)), $tagName);

CakePHP/ruleset.xml

@@ -219,10 +219,11 @@
         <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.UselessAnnotation"/>
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat">
+    <rule ref="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat">
         <properties>
             <property name="enable" type="boolean" value="true"/>
-            <property name="withSpaces" value="no"/>
+            <property name="withSpacesAroundOperators" value="no"/>
+            <property name="withSpacesInsideParentheses" value="no"/>
             <property name="shortNullable" value="yes"/>
             <property name="nullPosition" value="last"/>
         </properties>

composer.json

@@ -19,8 +19,8 @@
     },
     "require": {
         "php": ">=8.1.0",
-        "phpstan/phpdoc-parser": "^1.4.5",
-        "slevomat/coding-standard": "^8.15",
+        "phpstan/phpdoc-parser": "^2.1.0",
+        "slevomat/coding-standard": "^8.16",
         "squizlabs/php_codesniffer": "^3.9"
     },
     "require-dev": {

docs/README.md

@@ -138,14 +138,14 @@ SlevomatCodingStandard (52 sniffs)
 - SlevomatCodingStandard.PHP.UselessParentheses
 - SlevomatCodingStandard.PHP.UselessSemicolon
 - SlevomatCodingStandard.TypeHints.DeclareStrictTypes
+- SlevomatCodingStandard.TypeHints.DNFTypeHintFormat
 - SlevomatCodingStandard.TypeHints.LongTypeHints
 - SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue
 - SlevomatCodingStandard.TypeHints.ParameterTypeHint
 - SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing
 - SlevomatCodingStandard.TypeHints.PropertyTypeHint
 - SlevomatCodingStandard.TypeHints.ReturnTypeHint
 - SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing
-- SlevomatCodingStandard.TypeHints.UnionTypeHintFormat
 - SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable
 - SlevomatCodingStandard.Variables.UnusedVariable
 
@@ -182,4 +182,4 @@ Squiz (28 sniffs)
 
 Zend (1 sniff)
 --------------
-- Zend.NamingConventions.ValidVariableName
+- Zend.NamingConventions.ValidVariableName