Merge pull request #10597 from weirdan/update-master

vimeo · Jan 29, 2024 · 9520223 · 9520223
2 parents 275dfd8 + 917c5f8
commit 9520223
Show file tree

Hide file tree

Showing 14 changed files with 93 additions and 225 deletions.
diff --git a/.github/workflows/bcc.yml b/.github/workflows/bcc.yml
@@ -30,7 +30,7 @@ jobs:
           composer update --no-install
 
       - name: Cache composer cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ${{ steps.composer-cache.outputs.files_cache }}

diff --git a/.github/workflows/build-phar.yml b/.github/workflows/build-phar.yml
@@ -59,7 +59,7 @@ jobs:
           composer update --no-install
 
       - name: Cache composer cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ${{ steps.composer-cache.outputs.files_cache }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
           COMPOSER_ROOT_VERSION: dev-master
 
       - name: Cache composer cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ${{ steps.composer-cache.outputs.files_cache }}
@@ -77,7 +77,7 @@ jobs:
           COMPOSER_ROOT_VERSION: dev-master
 
       - name: Cache composer cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ${{ steps.composer-cache.outputs.files_cache }}
@@ -164,7 +164,7 @@ jobs:
           COMPOSER_ROOT_VERSION: dev-master
 
       - name: Cache composer cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ${{ steps.composer-cache.outputs.files_cache }}

diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -85,7 +85,7 @@ jobs:
           COMPOSER_ROOT_VERSION: dev-master
 
       - name: Cache composer cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ${{ steps.composer-cache.outputs.files_cache }}

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="dev-master@950293c6e74c6e9db842f537c5722755b1594313">
+  <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php">
+    <PossiblyUndefinedStringArrayOffset>
+      <code><![CDATA[$subNodes['expr']]]></code>
+    </PossiblyUndefinedStringArrayOffset>
+  </file>
   <file src="examples/TemplateChecker.php">
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$comment_block->tags['variablesfrom'][0]]]></code>

diff --git a/src/Psalm/Codebase.php b/src/Psalm/Codebase.php
@@ -1735,6 +1735,8 @@ public function getCompletionItemsForClassishThing(
     /**
      * @param list<CompletionItem> $items
      * @return list<CompletionItem>
+     * @deprecated to be removed in Psalm 6
+     * @api fix deprecation problem "PossiblyUnusedMethod: Cannot find any calls to method"
      */
     public function filterCompletionItemsByBeginLiteralPart(array $items, string $literal_part): array
     {

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/EncapsulatedStringAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/EncapsulatedStringAnalyzer.php
@@ -48,9 +48,12 @@ public static function analyze(
                 return false;
             }
 
-            $part_type = $statements_analyzer->node_data->getType($part);
-
-            if ($part_type !== null) {
+            if ($part instanceof EncapsedStringPart) {
+                if ($literal_string !== null) {
+                    $literal_string .= $part->value;
+                }
+                $non_empty = $non_empty || $part->value !== "";
+            } elseif ($part_type = $statements_analyzer->node_data->getType($part)) {
                 $casted_part_type = CastAnalyzer::castStringAttempt(
                     $statements_analyzer,
                     $context,
@@ -112,11 +115,6 @@ public static function analyze(
                         }
                     }
                 }
-            } elseif ($part instanceof EncapsedStringPart) {
-                if ($literal_string !== null) {
-                    $literal_string .= $part->value;
-                }
-                $non_empty = $non_empty || $part->value !== "";
             } else {
                 $all_literals = false;
                 $literal_string = null;

diff --git a/src/Psalm/Internal/LanguageServer/Server/TextDocument.php b/src/Psalm/Internal/LanguageServer/Server/TextDocument.php
@@ -281,7 +281,6 @@ public function completion(TextDocumentIdentifier $textDocument, Position $posit
 
         try {
             $completion_data = $this->codebase->getCompletionDataAtPosition($file_path, $position);
-            $literal_part = $this->codebase->getBeginedLiteralPart($file_path, $position);
             if ($completion_data) {
                 [$recent_type, $gap, $offset] = $completion_data;
 
@@ -290,8 +289,6 @@ public function completion(TextDocumentIdentifier $textDocument, Position $posit
                         ->textDocument->completion->completionItem->snippetSupport ?? false;
                     $completion_items =
                         $this->codebase->getCompletionItemsForClassishThing($recent_type, $gap, $snippetSupport);
-                    $completion_items =
-                        $this->codebase->filterCompletionItemsByBeginLiteralPart($completion_items, $literal_part);
                 } elseif ($gap === '[') {
                     $completion_items = $this->codebase->getCompletionItemsForArrayKeys($recent_type);
                 } else {

diff --git a/src/Psalm/Internal/Type/TemplateStandinTypeReplacer.php b/src/Psalm/Internal/Type/TemplateStandinTypeReplacer.php
@@ -1244,7 +1244,6 @@ public static function getMappedGenericTypeParams(
         Atomic $container_type_part,
         ?array &$container_type_params_covariant = null,
     ): array {
-        $_ = null;
         if ($input_type_part instanceof TGenericObject || $input_type_part instanceof TIterable) {
             $input_type_params = $input_type_part->type_params;
         } elseif ($codebase->classlike_storage_provider->has($input_type_part->value)) {
@@ -1280,7 +1279,6 @@ public static function getMappedGenericTypeParams(
             $replacement_templates = [];
 
             if ($input_template_types
-                && (!$input_type_part instanceof TGenericObject || !$input_type_part->remapped_params)
                 && (!$container_type_part instanceof TGenericObject || !$container_type_part->remapped_params)
             ) {
                 foreach ($input_template_types as $template_name => $_) {

diff --git a/tests/ClassTest.php b/tests/ClassTest.php
@@ -464,7 +464,9 @@ class T extends \PHPUnit\Framework\TestCase {
             ],
             'classAliasNoException' => [
                 'code' => '<?php
-                    class_alias("Bar\F1", "Bar\F2");
+                    namespace {
+                        class_alias("Bar\F1", "Bar\F2");
+                    }
 
                     namespace Bar {
                         class F1 {

diff --git a/tests/FileUpdates/TemporaryUpdateTest.php b/tests/FileUpdates/TemporaryUpdateTest.php
@@ -605,7 +605,7 @@ public function foo() : void {
 
                             class A {
                                 public function foo() : void {
-                                    throw new Error("bad", 5);
+                                    throw new Error("bad", []);
                                 }
                             }',
                     ],
@@ -615,7 +615,7 @@ public function foo() : void {
 
                             class A {
                                 public function foo() : void {
-                                    throw new Error("bad", 5);
+                                    throw new Error("bad", []);
                                 }
                             }',
                     ],
@@ -659,7 +659,7 @@ public function foo() : void {
 
                             class A {
                                 public function foo() : void {
-                                    throw new E("bad", 5);
+                                    throw new E("bad", []);
                                 }
                             }',
                     ],
@@ -669,7 +669,7 @@ public function foo() : void {
 
                             class A {
                                 public function foo() : void {
-                                    throw new E("bad", 5);
+                                    throw new E("bad", []);
                                 }
                             }',
                     ],
@@ -709,7 +709,7 @@ public function foo() : void {
 
                             class A {
                                 public function foo() : void {
-                                    throw new Error("bad", 5);
+                                    throw new Error("bad", []);
                                 }
                             }',
                     ],
@@ -719,7 +719,7 @@ public function foo() : void {
 
                             class A {
                                 public function foo() : void {
-                                    throw new Error("bad", 5);
+                                    throw new Error("bad", []);
                                 }
                             }',
                     ],
@@ -757,7 +757,7 @@ public function foo() : void {
 
                             class A {
                                 public function foo() : void {
-                                    throw new E("bad", 5);
+                                    throw new E("bad", []);
                                 }
                             }',
                     ],
@@ -767,7 +767,7 @@ public function foo() : void {
 
                             class A {
                                 public function foo() : void {
-                                    throw new E("bad", 5);
+                                    throw new E("bad", []);
                                 }
                             }',
                     ],