Fix PhanUnreferencedUseNormal from phan

This removes references to "use" statements that aren't referenced
anywhere in the file and fixes the PhanUnreferencedUseNormal "errors"
that are flagged. For each "use" that was removed, I first checked the
file to verify that there weren't, in fact, any references to them.

There's a bug in phan where it doesn't understand typed property
references as uses, so lines that were only referenced in that way are
simply ignored for now.

.phan/config.php

@@ -12,11 +12,9 @@
 	'suppress_issue_types' => [
 		'PhanTypeInvalidBitwiseBinaryOperator',
 		'PhanTypeObjectUnsetDeclaredProperty',
-		'PhanUnreferencedUseNormal',
 		'PhanUndeclaredClassMethod',
 		'PhanTypeMismatchProperty',
 		'PhanTypeExpectedObjectPropAccessButGotNull',
-		'PhanUnreferencedUseNormal',
 		'PhanTypeMismatchDimFetchNullable',
 		'PhanUndeclaredMethod',
 		'PhanTypeMismatchArgument',

lib/Block.php

@@ -9,9 +9,10 @@
 
 namespace PHPCompiler;
 
+// used as a property type.
+// @phan-suppress-next-line PhanUnreferencedUseNormal
 use PHPCfg\Func;
 use PHPCfg\Block as CfgBlock;
-use PHPCfg\Op\Expr;
 use PHPCfg\Operand;
 use PHPCompiler\VM\Context;
 use PHPCompiler\VM\Variable;

lib/Compiler.php

@@ -9,6 +9,8 @@
 
 namespace PHPCompiler;
 
+// This is used as a property type, phan is confused.
+// @phan-suppress-next-line PhanUnreferencedUseNormal
 use SplObjectStorage;
 use PHPCfg\Func as CfgFunc;
 use PHPCfg\Op;
@@ -17,7 +19,6 @@
 use PHPCfg\Script;
 use PHPTypes\Type;
 use PHPCompiler\VM\Variable;
-use PHPCompiler\NativeType\NativeArray;
 
 class Compiler {
 
@@ -553,4 +554,4 @@ protected function compileTerminal(Op\Terminal $terminal, Block $block): OpCode
         }
     }
 
-}
+}

lib/Func.php

@@ -10,7 +10,6 @@
 namespace PHPCompiler;
 
 use PHPCompiler\VM\Context;
-use PHPCompiler\VM\Variable;
 
 abstract class Func {
 
@@ -26,4 +25,4 @@ public function getName(): string {
 
     abstract public function getFrame(Context $context, ?Frame $frame = null): Frame;
 
-}
+}

lib/Func/PHP.php

@@ -13,7 +13,6 @@
 use PHPCompiler\Frame;
 use PHPCompiler\Block;
 use PHPCompiler\VM\Context;
-use PHPCompiler\VM\Variable;
 
 final class PHP extends Func {
 
@@ -28,4 +27,4 @@ public function getFrame(Context $context, ?Frame $frame = null): Frame {
         return $this->block->getFrame($context, $frame);
     }
 
-}
+}

lib/JIT.php

@@ -14,15 +14,11 @@
 
 use PHPCfg\Operand;
 use PHPCfg\Op;
-use PHPCfg\Block as CfgBlock;
 use PHPTypes\Type;
-use PHPCompiler\JIT\Analyzer;
 use PHPCompiler\JIT\Context;
 use PHPCompiler\JIT\Variable;
 
 use PHPCompiler\Func as CoreFunc;
-use PHPCompiler\JIT\Func as JITFunc;
-use PHPCompiler\NativeType\NativeArray as NativeArray;
 
 use PHPLLVM;
 

lib/JIT.pre

@@ -11,15 +11,11 @@ namespace PHPCompiler;
 
 use PHPCfg\Operand;
 use PHPCfg\Op;
-use PHPCfg\Block as CfgBlock;
 use PHPTypes\Type;
-use PHPCompiler\JIT\Analyzer;
 use PHPCompiler\JIT\Context;
 use PHPCompiler\JIT\Variable;
 
 use PHPCompiler\Func as CoreFunc;
-use PHPCompiler\JIT\Func as JITFunc;
-use PHPCompiler\NativeType\NativeArray as NativeArray;
 
 use PHPLLVM;
 

lib/JIT/Builtin/Type.php

@@ -11,8 +11,6 @@
 
 use PHPCompiler\JIT\Builtin;
 
-use PHPLLVM;
-
 class Type extends Builtin {
 
     public Type\String_ $string;
@@ -34,4 +32,4 @@ public function register(): void {
     }
 
 
-}
+}

lib/JIT/Builtin/Type/HashTable.php

@@ -10,8 +10,6 @@
 namespace PHPCompiler\JIT\Builtin\Type;
 
 use PHPCompiler\JIT\Builtin\Type;
-use PHPCompiler\JIT\Builtin\Refcount;
-use PHPCompiler\JIT\Variable;
 
 class HashTable extends Type {
     private \gcc_jit_struct_ptr $struct;
@@ -84,4 +82,4 @@ public function implement(): void {
             \gcc_jit_field_ptr_ptr::fromArray(...array_values($this->bucketFields))
         );
     }
-}
+}

lib/JIT/Builtin/Type/MaskedArray.php

@@ -9,12 +9,8 @@
 
 namespace PHPCompiler\JIT\Builtin\Type;
 
-use PHPCfg\Operand;
-use PHPCfg\Operand\Literal;
 use PHPCompiler\JIT\Builtin\Type;
 use PHPCompiler\JIT\Builtin\Refcount;
-use PHPCompiler\JIT\Variable;
-use PHPCompiler\JIT\Func;
 
 class MaskedArray extends Type {
     private \gcc_jit_struct_ptr $struct;
@@ -256,4 +252,4 @@ public function size(\gcc_jit_rvalue_ptr $ptr): \gcc_jit_rvalue_ptr {
     }
 
 
-}
+}

lib/JIT/Builtin/Type/Value.php

@@ -13,11 +13,8 @@
 namespace PHPCompiler\JIT\Builtin\Type;
 
 use PHPCompiler\JIT\Builtin\Type;
-use PHPCompiler\JIT\Builtin\Refcount;
 use PHPCompiler\JIT\Variable;
 
-use PHPLLVM;
-
 class Value extends Type {
 
     public function register(): void {

lib/JIT/Builtin/Type/Value.pre

@@ -10,11 +10,8 @@
 namespace PHPCompiler\JIT\Builtin\Type;
 
 use PHPCompiler\JIT\Builtin\Type;
-use PHPCompiler\JIT\Builtin\Refcount;
 use PHPCompiler\JIT\Variable;
 
-use PHPLLVM;
-
 class Value extends Type {
 
     public function register(): void {

lib/JIT/Context.php

@@ -11,10 +11,8 @@
 
 use PHPCfg\Operand;
 use PHPCompiler\Runtime;
-use PHPCompiler\Handler;
 use PHPCompiler\Block;
 use PHPCompiler\VM\Variable as VMVariable;
-use PHPCompiler\Handler\Builtins;
 use PHPTypes\Type;
 
 use PHPLLVM;

lib/JIT/Scope.php

@@ -9,10 +9,6 @@
 
 namespace PHPCompiler\JIT;
 
-use PHPCfg\Operand;
-
-use PHPLLVM;
-
 class Scope {
     public int $classId = 0;
     public \SplObjectStorage $blockStorage;
@@ -24,4 +20,4 @@ public function __construct() {
         $this->blockStorage = new \SplObjectStorage;
         $this->variables = new \SplObjectStorage;
     }
-}
+}

lib/Runtime.php

@@ -14,7 +14,6 @@
 use PHPCfg\Traverser;
 use PHPCfg\LivenessDetector;
 use PHPCfg\Visitor;
-use PHPCfg\Printer as CfgPrinter;
 use PHPCfg\Script;
 use PHPTypes\TypeReconstructor;
 use PhpParser\NodeTraverser;

lib/VM.php

@@ -9,7 +9,6 @@
 
 namespace PHPCompiler;
 
-use PHPTypes\Type;
 use PHPCompiler\VM\Context;
 use PHPCompiler\VM\ClassEntry;
 use PHPCompiler\VM\ObjectEntry;

lib/VM/ClassEntry.php

@@ -9,6 +9,8 @@
 
 namespace PHPCompiler\VM;
 
+// bug in phan: https://github.com/phan/phan/issues/2661
+// @phan-suppress-next-line PhanUnreferencedUseNormal
 use PHPCompiler\Block;
 
 class ClassEntry {
@@ -28,4 +30,4 @@ public function getProperties(array $properties, int $reason): array {
         return $properties;
     }
 
-}
+}

lib/VM/ClassProperty.php

@@ -9,8 +9,6 @@
 
 namespace PHPCompiler\VM;
 
-use PHPCompiler\Block;
-
 class ClassProperty {
 
     public string $name;
@@ -33,4 +31,4 @@ public function getVariable(): Variable {
     }
 
 
-}
+}

lib/VM/Context.php

@@ -12,8 +12,6 @@
 use PHPCompiler\Frame;
 use PHPCompiler\Func;
 use PHPCompiler\Runtime;
-use PHPCompiler\Handler\Builtins;
-use PHPTypes\Type;
 
 class Context {
     public array $functions = [];

lib/VM/ObjectEntry.php

@@ -9,12 +9,8 @@
 
 namespace PHPCompiler\VM;
 
-use PHPCfg\Func;
-use PHPCfg\Op;
-use PHPCfg\Block as CfgBlock;
-use PHPCfg\Operand;
-use PHPCfg\Script;
-use PHPTypes\Type;
+// Bug in phan: https://github.com/phan/phan/issues/2661
+// @phan-suppress-next-line PhanUnreferencedUseNormal
 use PHPCompiler\Block;
 
 class ObjectEntry {
@@ -44,4 +40,4 @@ public function getProperties(int $purpose): array {
         return $this->class->getProperties($this->properties, $purpose);
     }
 
-}
+}