[PHP7] type resolver supports anonymous classes and is improved

Author: Halleck45

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

@@ -51,7 +51,7 @@ public function extract(&$n, TokenCollection $tokens)
         $previous = $tokens->get($n - 2);
         if($previous && T_NEW === $previous->getType()) {
             // anonymous class
-            $class = new ReflectedAnonymousClass($this->namespace, trim('class@anonymous'));
+            $class = new ReflectedAnonymousClass($this->namespace, 'class@anonymous');
             return $class;
         }
 

src/Hal/Component/OOP/Resolver/TypeResolver.php

@@ -26,6 +26,7 @@ class TypeResolver
     const TYPE_NULL = 'null';
     const TYPE_UNKNWON = 'unknown';
     const TYPE_FLUENT_INTERFACE = 'fluent';
+    const TYPE_ANONYMOUS_CLASS = 'anonymous@class';
 
     /**
      * Resolves type of given string
@@ -58,12 +59,12 @@ public function resolve($string)
             return self::TYPE_ARRAY;
         }
 
-        if(preg_match('!(^\[|^array\()!', $string)) {
-            return self::TYPE_ARRAY;
+        if(preg_match('!^new\s+class\s+!', $string, $matches)) {
+            return self::TYPE_ANONYMOUS_CLASS;
         }
 
-        if(preg_match('!^new\s*(.*)!', $string, $matches)) {
-            return trim(preg_replace('!^(new\s+)!', '', $cased));
+        if(preg_match('!^(new\s+)(.*?)([\(;].*|$)!', $cased, $matches)) {
+            return $matches[2];
         }
 
         if(preg_match('!^\$this$!', $string, $matches)) {

tests/Hal/Component/OOP/Resolver/TypeResolverTest.php

@@ -32,6 +32,8 @@ public function providesTypes()
             array('', TypeResolver::TYPE_VOID),
             array('$this->foo();', TypeResolver::TYPE_UNKNWON),
             array('new \StdClass', '\StdClass'),
+            array('new \StdClass($a, $b)', '\StdClass'),
+            array('new class implements Countable, Iterator {}', 'anonymous@class')
         );
     }
 }