fixes phpmetrics#160 - name of called class when PHP5.4 syntax is used (new X)->foo()

Author: Halleck45

src/Hal/Component/OOP/Extractor/CallExtractor.php

@@ -43,24 +43,30 @@ public function extract(&$n, TokenCollection $tokens)
     {
 
         $token = $tokens[$n];
+        $call = null;
         switch($token->getType()) {
             case T_PAAMAYIM_NEKUDOTAYIM:
                 $prev = $n - 1;
                 $value = $this->searcher->getUnder(array('::'), $prev, $tokens);
                 if ($value === 'parent') {
                     $extendPosition = $this->searcher->getExtendPostition($tokens);
                     $parentName = $this->searcher->getFollowingName($extendPosition, $tokens);
-                    return $parentName;
-                }
-                if ($value === 'self' || $value === 'static') {
+                    $call = $parentName;
+                } else if ($value === 'self' || $value === 'static') {
                     $extendPosition = $this->searcher->getClassNamePosition($tokens);
                     $className = $this->searcher->getFollowingName($extendPosition, $tokens);
-                    return $className;
+                    $call = $className;
+                } else {
+                    $call = $value;
                 }
-                return $value;
+                break;
             case T_NEW:
-                return $this->searcher->getFollowingName($n, $tokens);
+                $call = $this->searcher->getFollowingName($n, $tokens);
+        }
+
+        if(null === $call) {
+            throw new \LogicException('Classname of call not found');
         }
-        throw new \LogicException('Classname of call not found');
+        return trim($call, '()'); // fixes PHP 5.4:    (new MyClass)->foo()
     }
 };

src/Hal/Component/OOP/Extractor/MethodExtractor.php

@@ -196,9 +196,7 @@ private function extractDependencies(ReflectedMethod $method, $n, TokenCollectio
                 case T_PAAMAYIM_NEKUDOTAYIM:
                 case T_NEW:
                     $call = $extractor->extract($i, $tokens);
-                    if($call == 'class') { // anonymous class
-//                        $method->pushAnonymousClass(new ReflectedAnonymousClass($method->getNamespace(), 'anonymous@class'));
-                    } else {
+                    if($call !== 'class') { // anonymous class
                         $method->pushDependency($call);
                     }
                     break;

tests/Hal/Component/OOP/CallExtractorTest.php

@@ -34,4 +34,30 @@ public function provideCalls() {
             , array('\ExtendClass', 13, '<?php class CurrentClass extends \ExtendClass { parent::bar(); }')
         );
     }
-}
+
+    /**
+     * @group wip
+     */
+    public function testClassMamberDirectAccessOnInstanciationIsParsed() {
+        $code = '<?php
+class A {
+    function foo() {
+        (new B) ->doAny();
+    }
+}';
+        $searcher = new Searcher();
+        $callExtractor = new CallExtractor($searcher);
+        $tokens = new TokenCollection(token_get_all($code));
+        $n = 16;
+//
+//
+//        foreach($tokens as $index => $t) {
+//            $y = token_name($t->getType());
+//            var_dump("[$index] $y       {$t->getvalue()}");
+//        }
+//        exit;
+        $name = $callExtractor->extract($n, $tokens);
+        $this->assertEquals('B', $name);
+    }
+}
+