Merge branch 'develop'

* develop: fix NoBrokenRefDirective false positive (#1823) Remove deprecated PHPStan options
OskarStark · Aug 28, 2024 · d726549 · d726549
2 parents 99b24f8 + f91bd2f
commit d726549
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,9 +2,12 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
+    ignoreErrors:
+        -
+            identifier: missingType.iterableValue
+        -
+            identifier: missingType.generics
     paths:
         - src
         - tests
     level: max
-    checkGenericClassInNonGenericObjectType: false
-    checkMissingIterableValueType: false
diff --git a/src/Rule/NoBrokenRefDirective.php b/src/Rule/NoBrokenRefDirective.php
@@ -37,7 +37,7 @@ public function check(Lines $lines, int $number, string $filename): ViolationInt
         $lines->seek($number);
         $line = $lines->current();
 
-        if ($line->clean()->match('/(:ref\s|ref:)/') && !$line->clean()->match('/:ref:/')) {
+        if ($line->clean()->match('/(:ref\s|\sref:)/') && !$line->clean()->match('/:ref:/')) {
             return Violation::from(
                 'Please use correct syntax for :ref: directive',
                 $filename,

diff --git a/tests/Rule/NoBrokenRefDirectiveTest.php b/tests/Rule/NoBrokenRefDirectiveTest.php
@@ -43,22 +43,22 @@ public static function checkProvider(): iterable
                     'Please use correct syntax for :ref: directive',
                     'filename',
                     1,
-                    'ref:`Redis section <messenger-redis-transport>` below',
+                    'see ref:`Redis section <messenger-redis-transport>` below',
                 ),
-                new RstSample('ref:`Redis section <messenger-redis-transport>` below'),
+                new RstSample('see ref:`Redis section <messenger-redis-transport>` below'),
             ],
             [
                 Violation::from(
                     'Please use correct syntax for :ref: directive',
                     'filename',
                     1,
-                    ':ref `Redis section <messenger-redis-transport>` below',
+                    'see :ref `Redis section <messenger-redis-transport>` below',
                 ),
-                new RstSample(':ref `Redis section <messenger-redis-transport>` below'),
+                new RstSample('see :ref `Redis section <messenger-redis-transport>` below'),
             ],
             [
                 NullViolation::create(),
-                new RstSample(':ref:`Redis section <messenger-redis-transport>` below'),
+                new RstSample('see :ref:`Redis section <messenger-redis-transport>` below'),
             ],
             [
                 NullViolation::create(),
@@ -68,6 +68,10 @@ public static function checkProvider(): iterable
                 NullViolation::create(),
                 new RstSample('Then use the :method:`Symfony\\Component\\Lock\\LockInterface::refresh` method'),
             ],
+            [
+                NullViolation::create(),
+                new RstSample('new Link(href: style.css'),
+            ],
         ];
     }
 }