From 1e072cb90439cb8f361066eeba60ef5844de8d77 Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver@typo3.org>
Date: Sun, 30 Jan 2022 16:52:24 +0100
Subject: [PATCH] [TASK] Add
 AfterFunctionLikeAnalysisEvent::getFunctionlikeStorage

AfterFunctionLikeAnalysisEvent's method `getClasslikeStorage` actually
returned the current `FunctionLikeStorage`. This change streamlines the
naming and adds corresponding `getFunctionlikeStorage` method.

Method `getClasslikeStorage` is deprecated in will be removed
in Psalm v5.0.
---
 src/Psalm/Internal/EventDispatcher.php           |  2 +-
 .../Event/AfterFunctionLikeAnalysisEvent.php     | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Psalm/Internal/EventDispatcher.php b/src/Psalm/Internal/EventDispatcher.php
index 82db6300091..c7d22655797 100644
--- a/src/Psalm/Internal/EventDispatcher.php
+++ b/src/Psalm/Internal/EventDispatcher.php
@@ -578,7 +578,7 @@ public function dispatchAfterFunctionLikeAnalysis(AfterFunctionLikeAnalysisEvent
             $file_replacements = $event->getFileReplacements();
             if ($handler::afterStatementAnalysis(
                 $event->getStmt(),
-                $event->getClasslikeStorage(),
+                $event->getFunctionlikeStorage(),
                 $event->getStatementsSource(),
                 $event->getCodebase(),
                 $file_replacements
diff --git a/src/Psalm/Plugin/EventHandler/Event/AfterFunctionLikeAnalysisEvent.php b/src/Psalm/Plugin/EventHandler/Event/AfterFunctionLikeAnalysisEvent.php
index 792da7a8eca..df6cbefcc5c 100644
--- a/src/Psalm/Plugin/EventHandler/Event/AfterFunctionLikeAnalysisEvent.php
+++ b/src/Psalm/Plugin/EventHandler/Event/AfterFunctionLikeAnalysisEvent.php
@@ -19,7 +19,7 @@ class AfterFunctionLikeAnalysisEvent
     /**
      * @var FunctionLikeStorage
      */
-    private $classlike_storage;
+    private $functionlike_storage;
     /**
      * @var StatementsSource
      */
@@ -48,7 +48,7 @@ class AfterFunctionLikeAnalysisEvent
      */
     public function __construct(
         Node\FunctionLike $stmt,
-        FunctionLikeStorage $classlike_storage,
+        FunctionLikeStorage $functionlike_storage,
         StatementsSource $statements_source,
         Codebase $codebase,
         array $file_replacements,
@@ -56,7 +56,7 @@ public function __construct(
         Context $context
     ) {
         $this->stmt = $stmt;
-        $this->classlike_storage = $classlike_storage;
+        $this->functionlike_storage = $functionlike_storage;
         $this->statements_source = $statements_source;
         $this->codebase = $codebase;
         $this->file_replacements = $file_replacements;
@@ -69,9 +69,17 @@ public function getStmt(): Node\FunctionLike
         return $this->stmt;
     }
 
+    /**
+     * @deprecated Will be removed in Psalm v5.0, use getFunctionlikeStorage() instead
+     */
     public function getClasslikeStorage(): FunctionLikeStorage
     {
-        return $this->classlike_storage;
+        return $this->functionlike_storage;
+    }
+
+    public function getFunctionlikeStorage(): FunctionLikeStorage
+    {
+        return $this->functionlike_storage;
     }
 
     public function getStatementsSource(): StatementsSource