Merge branch '5.x' into upstream-master

vimeo · Sep 11, 2023 · 7428e49 · 7428e49
2 parents 37cc4fd + 13ea0c2
commit 7428e49
Show file tree

Hide file tree

Showing 15 changed files with 57 additions and 23 deletions.
diff --git a/.github/workflows/bcc.yml b/.github/workflows/bcc.yml
@@ -15,7 +15,7 @@ jobs:
         env:
           fail-fast: true
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/build-phar.yml b/.github/workflows/build-phar.yml
@@ -44,7 +44,7 @@ jobs:
         env:
           fail-fast: true
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # required for composer to automatically detect root package version
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
         env:
           fail-fast: true
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get Composer Cache Directories
         id: composer-cache
@@ -63,7 +63,7 @@ jobs:
         env:
           fail-fast: true
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get Composer Cache Directories
         id: composer-cache
@@ -148,7 +148,7 @@ jobs:
         env:
           fail-fast: true
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get Composer Cache Directories
         id: composer-cache

diff --git a/.github/workflows/shepherd.yml b/.github/workflows/shepherd.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: shivammathur/setup-php@v2
       with:
         php-version: '8.2'

diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -67,7 +67,7 @@ jobs:
           php -v
           php -r 'var_dump(PHP_VERSION_ID);'
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get Composer Cache Directories
         id: composer-cache

diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -1307,8 +1307,8 @@
 'date_create_immutable' => ['DateTimeImmutable|false', 'datetime='=>'string', 'timezone='=>'?DateTimeZone'],
 'date_create_immutable_from_format' => ['DateTimeImmutable|false', 'format'=>'string', 'datetime'=>'string', 'timezone='=>'?DateTimeZone'],
 'date_date_set' => ['DateTime', 'object'=>'DateTime', 'year'=>'int', 'month'=>'int', 'day'=>'int'],
-'date_default_timezone_get' => ['string'],
-'date_default_timezone_set' => ['bool', 'timezoneId'=>'string'],
+'date_default_timezone_get' => ['non-empty-string'],
+'date_default_timezone_set' => ['bool', 'timezoneId'=>'non-empty-string'],
 'date_diff' => ['DateInterval', 'baseObject'=>'DateTimeInterface', 'targetObject'=>'DateTimeInterface', 'absolute='=>'bool'],
 'date_format' => ['string', 'object'=>'DateTimeInterface', 'format'=>'string'],
 'date_get_last_errors' => ['array{warning_count:int,warnings:array<int,string>,error_count:int,errors:array<int,string>}|false'],
@@ -1390,11 +1390,11 @@
 'DateTimeInterface::getTimezone' => ['DateTimeZone|false'],
 'DateTimeInterface::__serialize' => ['array'],
 'DateTimeInterface::__unserialize' => ['void', 'data'=>'array'],
-'DateTimeZone::__construct' => ['void', 'timezone'=>'string'],
+'DateTimeZone::__construct' => ['void', 'timezone'=>'non-empty-string'],
 'DateTimeZone::__set_state' => ['DateTimeZone', 'array'=>'array'],
 'DateTimeZone::__wakeup' => ['void'],
 'DateTimeZone::getLocation' => ['array|false'],
-'DateTimeZone::getName' => ['string'],
+'DateTimeZone::getName' => ['non-empty-string'],
 'DateTimeZone::getOffset' => ['int', 'datetime'=>'DateTimeInterface'],
 'DateTimeZone::getTransitions' => ['list<array{ts: int, time: string, offset: int, isdst: bool, abbr: string}>|false', 'timestampBegin='=>'int', 'timestampEnd='=>'int'],
 'DateTimeZone::listAbbreviations' => ['array<string, list<array{dst: bool, offset: int, timezone_id: string|null}>>'],

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -847,11 +847,11 @@
     'DateTimeInterface::getOffset' => ['int'],
     'DateTimeInterface::getTimestamp' => ['int|false'],
     'DateTimeInterface::getTimezone' => ['DateTimeZone|false'],
-    'DateTimeZone::__construct' => ['void', 'timezone'=>'string'],
+    'DateTimeZone::__construct' => ['void', 'timezone'=>'non-empty-string'],
     'DateTimeZone::__set_state' => ['DateTimeZone', 'array'=>'array'],
     'DateTimeZone::__wakeup' => ['void'],
     'DateTimeZone::getLocation' => ['array|false'],
-    'DateTimeZone::getName' => ['string'],
+    'DateTimeZone::getName' => ['non-empty-string'],
     'DateTimeZone::getOffset' => ['int|false', 'datetime'=>'DateTimeInterface'],
     'DateTimeZone::getTransitions' => ['list<array{ts: int, time: string, offset: int, isdst: bool, abbr: string}>|false', 'timestampBegin='=>'int', 'timestampEnd='=>'int'],
     'DateTimeZone::listAbbreviations' => ['array<string, list<array{dst: bool, offset: int, timezone_id: string|null}>>'],
@@ -9820,8 +9820,8 @@
     'date_create_immutable' => ['DateTimeImmutable|false', 'datetime='=>'string', 'timezone='=>'?DateTimeZone'],
     'date_create_immutable_from_format' => ['DateTimeImmutable|false', 'format'=>'string', 'datetime'=>'string', 'timezone='=>'?DateTimeZone'],
     'date_date_set' => ['DateTime|false', 'object'=>'DateTime', 'year'=>'int', 'month'=>'int', 'day'=>'int'],
-    'date_default_timezone_get' => ['string'],
-    'date_default_timezone_set' => ['bool', 'timezoneId'=>'string'],
+    'date_default_timezone_get' => ['non-empty-string'],
+    'date_default_timezone_set' => ['bool', 'timezoneId'=>'non-empty-string'],
     'date_diff' => ['DateInterval|false', 'baseObject'=>'DateTimeInterface', 'targetObject'=>'DateTimeInterface', 'absolute='=>'bool'],
     'date_format' => ['string|false', 'object'=>'DateTimeInterface', 'format'=>'string'],
     'date_get_last_errors' => ['array{warning_count:int,warnings:array<int,string>,error_count:int,errors:array<int,string>}|false'],

diff --git a/src/Psalm/Config/FileFilter.php b/src/Psalm/Config/FileFilter.php
@@ -336,7 +336,7 @@ public static function loadFromArray(
             foreach ($config['referencedFunction'] as $referenced_function) {
                 $function_id = $referenced_function['name'] ?? '';
                 if (!is_string($function_id)
-                    || (!preg_match('/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/', $function_id)
+                    || (!preg_match('/^[a-zA-Z_\x80-\xff](?:[\\\\]?[a-zA-Z0-9_\x80-\xff]+)*$/', $function_id)
                         && !preg_match('/^[^:]+::[^:]+$/', $function_id) // methods are also allowed
                         && !static::isRegularExpression($function_id))) {
                     throw new ConfigException(

diff --git a/stubs/CoreGenericClasses.phpstub b/stubs/CoreGenericClasses.phpstub
@@ -125,7 +125,7 @@ interface ArrayAccess {
  * This class allows objects to work as arrays.
  * @link http://php.net/manual/en/class.arrayobject.php
  *
- * @template TKey
+ * @template TKey of array-key
  * @template TValue
  * @template-implements IteratorAggregate<TKey, TValue>
  * @template-implements ArrayAccess<TKey, TValue>

diff --git a/stubs/CoreImmutableClasses.phpstub b/stubs/CoreImmutableClasses.phpstub
@@ -105,6 +105,7 @@ class DateTimeImmutable implements DateTimeInterface
  */
 class DateTimeZone
 {
+    /** @param non-empty-string $timezone */
     public function __construct(string $timezone) {}
 }
 

diff --git a/tests/ArrayAssignmentTest.php b/tests/ArrayAssignmentTest.php
@@ -1297,7 +1297,6 @@ function foo(ArrayObject $a) : array {
 
                         /**
                          * @psalm-suppress MixedAssignment
-                         * @psalm-suppress MixedArrayOffset
                          */
                         foreach ($a as $k => $v) {
                             $arr[$k] = $v;

diff --git a/tests/ClassTest.php b/tests/ClassTest.php
@@ -640,7 +640,7 @@ function intersect(A $a) {
                 'code' => '<?php
 
                     /**
-                     * @template TTKey
+                     * @template TTKey of array-key
                      * @template TTValue
                      *
                      * @extends ArrayObject<TTKey, TTValue>
@@ -675,7 +675,7 @@ class b extends a {
             'preventDoubleStaticResolution2' => [
                 'code' => '<?php
                     /**
-                     * @template TTKey
+                     * @template TTKey of array-key
                      * @template TTValue
                      *
                      * @extends ArrayObject<TTKey, TTValue>
@@ -712,7 +712,7 @@ public function ret(): iter {
             'preventDoubleStaticResolution3' => [
                 'code' => '<?php
                     /**
-                     * @template TTKey
+                     * @template TTKey of array-key
                      * @template TTValue
                      *
                      * @extends ArrayObject<TTKey, TTValue>

diff --git a/tests/Config/ConfigTest.php b/tests/Config/ConfigTest.php
@@ -18,6 +18,7 @@
 use Psalm\Internal\RuntimeCaches;
 use Psalm\Internal\Scanner\FileScanner;
 use Psalm\Issue\TooManyArguments;
+use Psalm\Issue\UndefinedFunction;
 use Psalm\Tests\Config\Plugin\FileTypeSelfRegisteringPlugin;
 use Psalm\Tests\Internal\Provider\FakeParserCacheProvider;
 use Psalm\Tests\TestCase;
@@ -1856,4 +1857,34 @@ public function testReferencedFunctionAllowsMethods(): void
             ),
         );
     }
+
+    public function testReferencedFunctionAllowsNamespacedFunctions(): void
+    {
+        $config_xml = Config::loadFromXML(
+            (string) getcwd(),
+            <<<XML
+            <?xml version="1.0"?>
+            <psalm>
+                <issueHandlers>
+                    <UndefinedFunction>
+                        <errorLevel type="suppress">
+                            <referencedFunction name="Foo\Bar\baz" />
+                        </errorLevel>
+                    </UndefinedFunction>
+                </issueHandlers>
+            </psalm>
+            XML,
+        );
+
+        $this->assertSame(
+            Config::REPORT_SUPPRESS,
+            $config_xml->getReportingLevelForIssue(
+                new UndefinedFunction(
+                    'Function Foo\Bar\baz does not exist',
+                    new Raw('aaa', 'aaa.php', 'aaa.php', 1, 2),
+                    'foo\bar\baz',
+                ),
+            ),
+        );
+    }
 }
diff --git a/tests/PureAnnotationTest.php b/tests/PureAnnotationTest.php
@@ -152,7 +152,10 @@ function foo(array $arr) : array {
                 'code' => '<?php
                     final class Date
                     {
-                        /** @psalm-pure */
+                        /**
+                         * @param non-empty-string $tzString
+                         * @psalm-pure
+                         */
                         public static function timeZone(string $tzString) : DateTimeZone
                         {
                             return new \DateTimeZone($tzString);

diff --git a/tests/Template/ClassTemplateExtendsTest.php b/tests/Template/ClassTemplateExtendsTest.php
@@ -1390,7 +1390,7 @@ class A {}',
             'extendArrayObjectWithTemplateParams' => [
                 'code' => '<?php
                     /**
-                     * @template TKey
+                     * @template TKey of array-key
                      * @template TValue
                      * @template-extends \ArrayObject<TKey,TValue>
                      */