From 05bccec84d3b4f53a0114bd027445ba4d63cb7c7 Mon Sep 17 00:00:00 2001
From: Sara Itani <sitani@microsoft.com>
Date: Thu, 13 Apr 2017 09:12:30 -0700
Subject: [PATCH] Ensure duplicate ScopedPropertyAccess expressions don't
 appear

---
 src/TolerantTreeAnalyzer.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/TolerantTreeAnalyzer.php b/src/TolerantTreeAnalyzer.php
index e1046fd..3b11df5 100644
--- a/src/TolerantTreeAnalyzer.php
+++ b/src/TolerantTreeAnalyzer.php
@@ -95,7 +95,10 @@ class TolerantTreeAnalyzer implements TreeAnalyzerInterface {
 
         $parent = $node->parent;
         if (!(
-            ($node instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression
+            (
+                // $node->parent instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
+                ($node instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression || 
+                $node instanceof Tolerant\Node\Expression\MemberAccessExpression)
                 && !(
                     $node->parent instanceof Tolerant\Node\Expression\CallExpression ||
                     $node->memberName instanceof Tolerant\Token
@@ -127,7 +130,9 @@ class TolerantTreeAnalyzer implements TreeAnalyzerInterface {
                 if (TolerantDefinitionResolver::isConstantFetch($node) ||
                     ($parent instanceof Tolerant\Node\Expression\CallExpression
                         && !(
-                            $node instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression
+                            $parent->callableExpression instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
+                            $node instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
+                            $node instanceof Tolerant\Node\Expression\MemberAccessExpression
                         ))) {
                     $parts = explode('\\', $fqn);
                     if (count($parts) > 1) {