Merge branch 'main' into avoid-warning

phpDocumentor · Jul 5, 2023 · a9d87bc · a9d87bc
2 parents 0cd2065 + b453b9f
commit a9d87bc
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 65 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "php": "^8.1",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "doctrine/lexer": "^2.1",
+        "doctrine/lexer": "^3.0",
         "league/commonmark": "^2.4",
         "league/flysystem": "^1.0",
         "league/tactician": "^1.1",

diff --git a/composer.lock b/composer.lock
diff --git a/packages/guides-restructured-text/composer.json b/packages/guides-restructured-text/composer.json
@@ -22,7 +22,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": "^8.1",
-        "doctrine/lexer": "^2.1",
+        "doctrine/lexer": "^3.0",
         "phpdocumentor/guides": "dev-main@dev",
         "webmozart/assert": "^1.11"
     }

diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/InlineLexer.php b/packages/guides-restructured-text/src/RestructuredText/Parser/InlineLexer.php
@@ -104,7 +104,7 @@ protected function getNonCatchablePatterns(): array
     }
 
     /** @inheritDoc */
-    protected function getType(&$value)
+    protected function getType(string &$value)
     {
         if (preg_match('/^\\\\[\s\S]/i', $value)) {
             return self::ESCAPED_SIGN;

diff --git a/phpstan.neon b/phpstan.neon
@@ -13,6 +13,17 @@ parameters:
       message: '#Unreachable statement - code above always terminates\.#'
       path: packages/guides-restructured-text/tests/unit/Parser/Productions/GridTableRuleTest.php
 
+    # https://github.com/doctrine/lexer/pull/109
+    -
+      message: '#^Result of && is always false.|Strict comparison using \=\=\= between Doctrine\\Common\\Lexer\\Token and null will always evaluate to false\.$#'
+      paths:
+        - packages/guides-restructured-text/src/RestructuredText/Parser/Productions/InlineRules/AnnotationRoleRule.php
+        - packages/guides-restructured-text/src/RestructuredText/Parser/Productions/InlineRules/DefaultTextRoleRule.php
+        - packages/guides-restructured-text/src/RestructuredText/Parser/Productions/InlineRules/EmphasisRule.php
+        - packages/guides-restructured-text/src/RestructuredText/Parser/Productions/InlineRules/StrongRule.php
+        - packages/guides-restructured-text/src/RestructuredText/Parser/Productions/InlineRules/TextRoleRule.php
+        - packages/guides-restructured-text/src/RestructuredText/Parser/Productions/InlineRules/VariableInlineRule.php
+
   paths:
     - packages/guides/src
     - packages/guides-markdown/src