Add missing randomizer method, improve stub parsing

vimeo · Feb 15, 2024 · 65f3a78 · 65f3a78
1 parent b238bc7
commit 65f3a78
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 3 deletions.
diff --git a/dictionaries/CallMap_83_delta.php b/dictionaries/CallMap_83_delta.php
@@ -18,6 +18,7 @@
 return [
   'added' => [
     'json_validate' => ['bool', 'json'=>'string', 'depth='=>'positive-int', 'flags='=>'int'],
+    'Random\\Randomizer::getBytesFromString' => ['non-empty-string', 'string' => 'non-empty-string', 'length' => 'int<1, max>'],
   ],
 
   'changed' => [

diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockParser.php b/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockParser.php
@@ -387,6 +387,14 @@ public static function parse(
             if (preg_match('/^[4578]\.\d(\.\d+)?$/', $since)) {
                 $since_parts = explode('.', $since);
 
+                $info->since_php_major_version = (int)$since_parts[0];
+                $info->since_php_minor_version = (int)$since_parts[1];
+            }
+        } elseif (isset($parsed_docblock->tags['php-from'])) {
+            $since = trim(reset($parsed_docblock->tags['php-from']));
+            if (preg_match('/^[4578]\.\d(\.\d+)?$/', $since)) {
+                $since_parts = explode('.', $since);
+
                 $info->since_php_major_version = (int)$since_parts[0];
                 $info->since_php_minor_version = (int)$since_parts[1];
             }

diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeNodeScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeNodeScanner.php
@@ -461,9 +461,9 @@ public function start(PhpParser\Node\FunctionLike $stmt, bool $fake_method = fal
             }
 
             if ($docblock_info) {
-                if ($docblock_info->since_php_major_version && !$this->aliases->namespace) {
+                if ($docblock_info->since_php_major_version) {
                     $analysis_major_php_version = $this->codebase->getMajorAnalysisPhpVersion();
-                    $analysis_minor_php_version = $this->codebase->getMajorAnalysisPhpVersion();
+                    $analysis_minor_php_version = $this->codebase->getMinorAnalysisPhpVersion();
                     if ($docblock_info->since_php_major_version > $analysis_major_php_version) {
                         return false;
                     }

diff --git a/stubs/extensions/random.phpstub b/stubs/extensions/random.phpstub
@@ -90,7 +90,7 @@ namespace Random
         /**
          * @template TValue
          * @param array<TValue> $array
-         * @return list<TValue>
+         * @return ($array is non-empty-array<TValue> ? non-empty-list<TValue> : list<TValue>)
          */
         public function shuffleArray(array $array): array {}
 
@@ -103,6 +103,15 @@ namespace Random
          */
         public function pickArrayKeys(array $array, int $num): array {}
 
+        /**
+         * @since 8.3
+         *
+         * @param non-empty-string $string
+         * @param positive-int $length
+         * @return non-empty-string
+         */
+        public function getBytesFromString(string $string, int $length): string {}
+
         public function __serialize(): array {}
 
         public function __unserialize(array $data): void {}

diff --git a/tests/CoreStubsTest.php b/tests/CoreStubsTest.php
@@ -424,10 +424,44 @@ function takesList(array $list): void {}
                 $globBrace = glob('abc', GLOB_BRACE);
                 PHP,
         ];
+        yield 'randomizer' => [
+            'code' => <<<'PHP'
+                <?php
+                $r = new Random\Randomizer;
+                /** @var array<int, int> */
+                $arr = [];
+                $res = $r->shuffleArray($arr);
+                /** @psalm-check-type-exact $res = list<int> */;
+
+                /** @var non-empty-array<int, int> */
+                $arr = [];
+                $res = $r->shuffleArray($arr);
+                /** @psalm-check-type-exact $res = non-empty-list<int> */;
+
+                $str = '123';
+                $res = $r->getBytesFromString($str, 3);
+                /** @psalm-check-type-exact $res = non-empty-string */;
+                PHP,
+            'assertions' => [],
+            'ignored_issues' => [],
+            'php_version' => '8.3',
+        ];
     }
 
     public function providerInvalidCodeParse(): iterable
     {
+        yield 'randomizer 8.2' => [
+            'code' => <<<'PHP'
+                <?php
+                $r = new Random\Randomizer;
+
+                $str = '123';
+                $res = $r->getBytesFromString($str, 3);
+                PHP,
+            'error_message' => 'InvalidAssignment',
+            'error_levels' => [],
+            'php_version' => '8.2',
+        ];
         yield 'json_decode invalid depth' => [
             'code' => '<?php
                 json_decode("true", depth: -1);