Fixup, fix bug in converting trait adaptations

Author: TysonAndre

README.md

@@ -3,13 +3,15 @@ PHP-Parser to php-ast
 
 [![Build Status](https://travis-ci.org/TysonAndre/php-parser-to-php-ast.svg?branch=master)](https://travis-ci.org/TysonAndre/php-parser-to-php-ast)
 
-8 out of 41 tests are failing, and only due to namespace support and line numbers being slightly different in php-ast.
+No tests are failing
 
+- This is 90% done
 - The test suite is not yet comprehensive.
+- Need to normalize namespaces.
 
 [Current Issues](https://github.com/TysonAndre/php-parser-to-php-ast/issues/)
 
-- The test suite this is based off of is not comprehensive, and edge cases still remain.
+- The test suite this is based off of covers common cases for Phan, but edge cases still remain.
   See https://github.com/TysonAndre/php-parser-to-php-ast/issues/4
 
 Usage

src/ASTConverter/ASTConverter.php

@@ -846,9 +846,10 @@ private static function _init_handle_map() : array {
                 );
             },
             'PhpParser\Node\Stmt\TraitUseAdaptation\Alias' => function(PhpParser\Node\Stmt\TraitUseAdaptation\Alias $n, int $startLine) : \ast\Node {
-                $old_class = $n->trait !== null ? self::_phpparser_name_to_string($n->trait) : null;
+                $old_class = $n->trait !== null ? self::_phpparser_node_to_ast_node($n->trait) : null;
+                $flags = ($n->trait instanceof PhpParser\Node\Name\FullyQualified) ? \ast\flags\NAME_FQ : \ast\flags\NAME_NOT_FQ;
                 // TODO: flags for visibility
-                return astnode(\ast\AST_TRAIT_ALIAS, self::_phpparser_visibility_to_ast_visibility($n->newModifier ?? 0), [
+                return astnode(\ast\AST_TRAIT_ALIAS, self::_phpparser_visibility_to_ast_visibility($n->newModifier ?? 0, false), [
                     'method' => astnode(\ast\AST_METHOD_REFERENCE, 0, [
                         'class' => $old_class,
                         'method' => $n->method,
@@ -1523,7 +1524,7 @@ private static function _phpparser_constelem_to_ast_constelem(PhpParser\Node\Con
         return astnode(\ast\AST_CONST_ELEM, 0, $children, $startLine, self::_extract_phpdoc_comment($n->getAttribute('comments') ?? $docComment));
     }
 
-    private static function _phpparser_visibility_to_ast_visibility(int $visibility) : int {
+    private static function _phpparser_visibility_to_ast_visibility(int $visibility, bool $automatically_add_public = true) : int {
         $ast_visibility = 0;
         if ($visibility & \PHPParser\Node\Stmt\Class_::MODIFIER_PUBLIC) {
             $ast_visibility |= \ast\flags\MODIFIER_PUBLIC;
@@ -1532,7 +1533,9 @@ private static function _phpparser_visibility_to_ast_visibility(int $visibility)
         } else if ($visibility & \PHPParser\Node\Stmt\Class_::MODIFIER_PRIVATE) {
             $ast_visibility |= \ast\flags\MODIFIER_PRIVATE;
         } else {
-            $ast_visibility |= \ast\flags\MODIFIER_PUBLIC;
+            if ($automatically_add_public) {
+                $ast_visibility |= \ast\flags\MODIFIER_PUBLIC;
+            }
         }
         if ($visibility & \PHPParser\Node\Stmt\Class_::MODIFIER_STATIC) {
             $ast_visibility |= \ast\flags\MODIFIER_STATIC;

test_files/src/0295_bad_trait_adaptations.php

@@ -0,0 +1,24 @@
+<?php
+// Phan should detect and catch some types of misuse of trait adaptations(`insteadof`/`as`)
+
+trait Trait295 {
+    public function baz() { }
+    public function xyz() { }
+}
+trait Trait295B {
+}
+
+class A295 {
+    use Trait295 {
+        Trait295::foo as bar;
+        Trait295B::xyz insteadof Trait295;
+        Trait295C::zz as zzAlias;
+    }
+}
+
+function test295() {
+    $x = new A295();
+    $x->baz();
+    $x->bar();
+    $x->foo();
+}