Prevent crash when getting callerName (#120)

* Prevent crash when getting callerName * Code cleanup * Added change log
php-translation · Jul 9, 2018 · 82fc51a · 82fc51a
1 parent 795676d
commit 82fc51a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -4,6 +4,12 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 ## UNRELEASED
 
+## 1.7.1
+
+### Fixed
+
+- Error when getting caller name with the `FlashMessage` extractor.
+
 ## 1.7.0
 
 ### Added

diff --git a/src/Visitor/Php/Symfony/FlashMessage.php b/src/Visitor/Php/Symfony/FlashMessage.php
@@ -35,6 +35,12 @@ public function enterNode(Node $node)
         }
 
         $name = (string) $node->name;
+
+        // This prevents dealing with some fatal edge cases when getting the callerName
+        if (!in_array($name, ['addFlash', 'add'])) {
+            return;
+        }
+
         $caller = $node->var;
         // $caller might be "Node\Expr\New_"
         $callerName = isset($caller->name) ? (string) $caller->name : '';