Merge pull request #8961 from jack-worman/Add_Codebase_to_remaining_e…

…vents
vimeo · Dec 21, 2022 · 96f8902 · 96f8902
2 parents 91081f7 + b2ccf24
commit 96f8902
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/src/Psalm/IssueBuffer.php b/src/Psalm/IssueBuffer.php
@@ -254,24 +254,24 @@ public static function isSuppressed(CodeIssue $e, array $suppressed_issues = [])
     public static function add(CodeIssue $e, bool $is_fixable = false): bool
     {
         $config = Config::getInstance();
+        $project_analyzer = ProjectAnalyzer::getInstance();
+        $codebase = $project_analyzer->getCodebase();
 
-        $event = new BeforeAddIssueEvent($e, $is_fixable);
+        $event = new BeforeAddIssueEvent($e, $is_fixable, $codebase);
         if ($config->eventDispatcher->dispatchBeforeAddIssue($event) === false) {
             return false;
-        };
+        }
 
         $fqcn_parts = explode('\\', get_class($e));
         $issue_type = array_pop($fqcn_parts);
 
-        $project_analyzer = ProjectAnalyzer::getInstance();
-
         if (!$project_analyzer->show_issues) {
             return false;
         }
 
         $is_tainted = strpos($issue_type, 'Tainted') === 0;
 
-        if ($project_analyzer->getCodebase()->taint_flow_graph && !$is_tainted) {
+        if ($codebase->taint_flow_graph && !$is_tainted) {
             return false;
         }
 

diff --git a/src/Psalm/Plugin/EventHandler/Event/BeforeAddIssueEvent.php b/src/Psalm/Plugin/EventHandler/Event/BeforeAddIssueEvent.php
@@ -4,19 +4,21 @@
 
 namespace Psalm\Plugin\EventHandler\Event;
 
+use Psalm\Codebase;
 use Psalm\Issue\CodeIssue;
 
 final class BeforeAddIssueEvent
 {
     private CodeIssue $issue;
-
     private bool $fixable;
+    private Codebase $codebase;
 
     /** @internal */
-    public function __construct(CodeIssue $issue, bool $fixable)
+    public function __construct(CodeIssue $issue, bool $fixable, Codebase $codebase)
     {
         $this->issue = $issue;
         $this->fixable = $fixable;
+        $this->codebase = $codebase;
     }
 
     public function getIssue(): CodeIssue
@@ -28,4 +30,9 @@ public function isFixable(): bool
     {
         return $this->fixable;
     }
+
+    public function getCodebase(): Codebase
+    {
+        return $this->codebase;
+    }
 }
diff --git a/src/Psalm/Plugin/EventHandler/Event/StringInterpreterEvent.php b/src/Psalm/Plugin/EventHandler/Event/StringInterpreterEvent.php
@@ -2,23 +2,32 @@
 
 namespace Psalm\Plugin\EventHandler\Event;
 
+use Psalm\Codebase;
+
 final class StringInterpreterEvent
 {
     private string $value;
+    private Codebase $codebase;
 
     /**
      * Called after a statement has been checked
      *
      * @psalm-external-mutation-free
      * @internal
      */
-    public function __construct(string $value)
+    public function __construct(string $value, Codebase $codebase)
     {
         $this->value = $value;
+        $this->codebase = $codebase;
     }
 
     public function getValue(): string
     {
         return $this->value;
     }
+
+    public function getCodebase(): Codebase
+    {
+        return $this->codebase;
+    }
 }
diff --git a/src/Psalm/Type.php b/src/Psalm/Type.php
@@ -4,6 +4,7 @@
 
 use InvalidArgumentException;
 use LogicException;
+use Psalm\Internal\Analyzer\ProjectAnalyzer;
 use Psalm\Internal\Type\Comparator\AtomicTypeComparator;
 use Psalm\Internal\Type\Comparator\UnionTypeComparator;
 use Psalm\Internal\Type\TypeCombiner;
@@ -256,7 +257,7 @@ public static function getString(?string $value = null): Union
         if ($value !== null) {
             $config = Config::getInstance();
 
-            $event = new StringInterpreterEvent($value);
+            $event = new StringInterpreterEvent($value, ProjectAnalyzer::getInstance()->getCodebase());
 
             $type = $config->eventDispatcher->dispatchStringInterpreter($event);
 

diff --git a/tests/StubTest.php b/tests/StubTest.php
@@ -418,9 +418,9 @@ function bar(array $a) {}
                 '$c2===' => "'hello'",
 
                 '$d1===' => "5",
-                '$d2===' => "'hello'"
+                '$d2===' => "'hello'",
             ],
-            $context
+            $context,
         );
     }