diff --git a/lib/private/AppFramework/Utility/ControllerMethodReflector.php b/lib/private/AppFramework/Utility/ControllerMethodReflector.php index 679e1788004c5..568e037d5cd6d 100644 --- a/lib/private/AppFramework/Utility/ControllerMethodReflector.php +++ b/lib/private/AppFramework/Utility/ControllerMethodReflector.php @@ -50,7 +50,7 @@ public function reflect($object, string $method) { // extract type parameter information preg_match_all('/@param\h+(?P\w+)\h+\$(?P\w+)/', $docs, $matches); $this->types = array_combine($matches['var'], $matches['type']); - preg_match_all('/@psalm-param\h+(\?)?(?P\w+)<(?P(-?\d+|min)),\h*(?P(-?\d+|max))>(\|null)?\h+\$(?P\w+)/', $docs, $matches); + preg_match_all('/@(?:psalm-)?param\h+(\?)?(?P\w+)<(?P(-?\d+|min)),\h*(?P(-?\d+|max))>(\|null)?\h+\$(?P\w+)/', $docs, $matches); foreach ($matches['var'] as $index => $varName) { if ($matches['type'][$index] !== 'int') { // only int ranges are possible at the moment diff --git a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php b/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php index 00ae47928244d..c0f0833fb6982 100644 --- a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php +++ b/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php @@ -49,6 +49,16 @@ public function test3() { */ public function test4(int $rangedOne, int $rangedTwo, ?int $rangedThree, ?int $rangedFour) { } + + /** + * @param int<-4, 42> $rangedOne + * @param int $rangedTwo + * @param int<1, 6>|null $rangedThree + * @param ?int<-70, -30> $rangedFour + * @return void + */ + public function test5(int $rangedOne, int $rangedTwo, ?int $rangedThree, ?int $rangedFour) { + } } class EndController extends MiddleController { @@ -230,7 +240,7 @@ public function testInheritanceOverrideNoDocblock(): void { $this->assertFalse($reader->hasAnnotation('Annotation')); } - public function testRangeDetection(): void { + public function testRangeDetectionPsalm(): void { $reader = new ControllerMethodReflector(); $reader->reflect('Test\AppFramework\Utility\EndController', 'test4'); @@ -250,4 +260,25 @@ public function testRangeDetection(): void { $this->assertSame(-70, $rangeInfo3['min']); $this->assertSame(-30, $rangeInfo3['max']); } + + public function testRangeDetectionNative(): void { + $reader = new ControllerMethodReflector(); + $reader->reflect('Test\AppFramework\Utility\EndController', 'test5'); + + $rangeInfo1 = $reader->getRange('rangedOne'); + $this->assertSame(-4, $rangeInfo1['min']); + $this->assertSame(42, $rangeInfo1['max']); + + $rangeInfo2 = $reader->getRange('rangedTwo'); + $this->assertSame(PHP_INT_MIN, $rangeInfo2['min']); + $this->assertSame(PHP_INT_MAX, $rangeInfo2['max']); + + $rangeInfo3 = $reader->getRange('rangedThree'); + $this->assertSame(1, $rangeInfo3['min']); + $this->assertSame(6, $rangeInfo3['max']); + + $rangeInfo3 = $reader->getRange('rangedFour'); + $this->assertSame(-70, $rangeInfo3['min']); + $this->assertSame(-30, $rangeInfo3['max']); + } }