From 7532e32b9d9db80eb029a77c49d5f97eb0d0629e Mon Sep 17 00:00:00 2001
From: Matthew Brown <github@muglug.com>
Date: Fri, 19 May 2017 00:48:26 -0400
Subject: [PATCH] Fixed spacing and use statement formatting

---
 src/Psalm/CallMap.php                         |  4 +-
 src/Psalm/Checker/AlgebraChecker.php          |  2 +-
 src/Psalm/Checker/CanAlias.php                |  4 --
 src/Psalm/Checker/ClassLikeChecker.php        | 10 ++---
 src/Psalm/Checker/CommentChecker.php          |  8 ++--
 src/Psalm/Checker/FileChecker.php             |  3 +-
 src/Psalm/Checker/FunctionChecker.php         |  5 ---
 src/Psalm/Checker/FunctionLikeChecker.php     |  5 +--
 src/Psalm/Checker/MethodChecker.php           |  4 --
 src/Psalm/Checker/NamespaceChecker.php        |  5 +--
 src/Psalm/Checker/ProjectChecker.php          |  2 +-
 src/Psalm/Checker/SourceChecker.php           |  4 --
 .../Checker/Statements/Block/ForChecker.php   |  2 +-
 .../Statements/Block/ForeachChecker.php       |  9 ++--
 .../Checker/Statements/Block/IfChecker.php    |  3 +-
 .../Statements/Block/SwitchChecker.php        |  2 +-
 .../Checker/Statements/Block/TryChecker.php   |  2 +-
 .../Checker/Statements/Block/WhileChecker.php | 11 +++--
 .../Statements/Expression/AssertionFinder.php |  1 -
 .../Expression/AssignmentChecker.php          | 24 ++---------
 .../Statements/Expression/CallChecker.php     | 22 ++--------
 .../Statements/Expression/FetchChecker.php    | 33 ++++++---------
 .../Checker/Statements/ExpressionChecker.php  | 20 ++-------
 src/Psalm/Checker/StatementsChecker.php       |  3 +-
 src/Psalm/Checker/TraitChecker.php            |  4 +-
 src/Psalm/Checker/TypeChecker.php             | 28 +++++--------
 src/Psalm/Config/ErrorLevelFileFilter.php     |  1 -
 src/Psalm/Config/IssueHandler.php             |  1 -
 src/Psalm/Config/ProjectFileFilter.php        |  1 -
 src/Psalm/Context.php                         |  2 +-
 src/Psalm/Provider/FileReferenceProvider.php  |  2 +-
 src/Psalm/StatementsSource.php                |  1 -
 src/Psalm/Storage/FunctionLikeStorage.php     |  3 +-
 src/Psalm/Storage/MethodStorage.php           |  1 -
 src/Psalm/Type.php                            | 27 +++++-------
 src/Psalm/Type/Atomic.php                     | 41 +++++++++----------
 src/Psalm/Type/Atomic/TNamedObject.php        |  1 -
 37 files changed, 102 insertions(+), 199 deletions(-)

diff --git a/src/Psalm/CallMap.php b/src/Psalm/CallMap.php
index 7e4692cec..0b3021020 100644
--- a/src/Psalm/CallMap.php
+++ b/src/Psalm/CallMap.php
@@ -6501,7 +6501,7 @@ return [
 'openssl_decrypt' => ['string', 'data'=>'string', 'method'=>'string', 'password'=>'string', 'options='=>'int', 'iv='=>'string', 'tag='=>'string', 'aad='=>'string'],
 'openssl_dh_compute_key' => ['string', 'pub_key'=>'string', 'dh_key'=>''],
 'openssl_digest' => ['string', 'data'=>'string', 'method'=>'string', 'raw_output='=>'bool'],
-'openssl_encrypt' => ['string', 'data'=>'string', 'method'=>'string', 'password'=>'string', 'options='=>'int', 'iv='=>'string', '&tag='=>'string', 'aad='=>'string','tag_length='=>'int'],
+'openssl_encrypt' => ['string', 'data'=>'string', 'method'=>'string', 'password'=>'string', 'options='=>'int', 'iv='=>'string', '&tag='=>'string', 'aad='=>'string', 'tag_length='=>'int'],
 'openssl_error_string' => ['string'],
 'openssl_free_key' => ['', 'key_identifier'=>''],
 'openssl_get_cert_locations' => ['array'],
@@ -8012,7 +8012,7 @@ return [
 'session_reset' => [''],
 'session_save_path' => ['string', 'newname='=>'string'],
 'session_set_cookie_params' => ['', 'lifetime'=>'int', 'path='=>'string', 'domain='=>'string|null', 'secure='=>'bool', 'httponly='=>'bool'],
-'session_set_save_handler' => ['bool', 'open'=>'callable', 'close'=>'callable', 'read'=>'callable', 'write'=>'callable', 'destroy'=>'callable', 'gc'=>'callable', 'create_sid='=>'callable', 'validate_sid='=>'callable','update_timestamp='=>'callable'],
+'session_set_save_handler' => ['bool', 'open'=>'callable', 'close'=>'callable', 'read'=>'callable', 'write'=>'callable', 'destroy'=>'callable', 'gc'=>'callable', 'create_sid='=>'callable', 'validate_sid='=>'callable', 'update_timestamp='=>'callable'],
 'session_set_save_handler\'1' => ['bool', 'sessionhandler'=>'SessionHandlerInterface', 'register_shutdown='=>'bool'],
 'session_start' => ['bool', 'options='=>'array'],
 'session_status' => ['int'],
diff --git a/src/Psalm/Checker/AlgebraChecker.php b/src/Psalm/Checker/AlgebraChecker.php
index 0a0956d37..7e4fcd578 100644
--- a/src/Psalm/Checker/AlgebraChecker.php
+++ b/src/Psalm/Checker/AlgebraChecker.php
@@ -5,8 +5,8 @@ use PhpParser;
 use Psalm\Checker\Statements\Expression\AssertionFinder;
 use Psalm\Clause;
 use Psalm\CodeLocation;
-use Psalm\IssueBuffer;
 use Psalm\Issue\ParadoxicalCondition;
+use Psalm\IssueBuffer;
 use Psalm\StatementsSource;
 
 class AlgebraChecker
diff --git a/src/Psalm/Checker/CanAlias.php b/src/Psalm/Checker/CanAlias.php
index 1d57efd6a..080e5f248 100644
--- a/src/Psalm/Checker/CanAlias.php
+++ b/src/Psalm/Checker/CanAlias.php
@@ -1,12 +1,8 @@
 <?php
 namespace Psalm\Checker;
 
-use PhpParser\Node\Stmt\Namespace_;
 use PhpParser;
 use Psalm\CodeLocation;
-use Psalm\Context;
-use Psalm\StatementsSource;
-use Psalm\Type;
 
 trait CanAlias
 {
diff --git a/src/Psalm/Checker/ClassLikeChecker.php b/src/Psalm/Checker/ClassLikeChecker.php
index f9e41479c..d91efb4c7 100644
--- a/src/Psalm/Checker/ClassLikeChecker.php
+++ b/src/Psalm/Checker/ClassLikeChecker.php
@@ -2,28 +2,26 @@
 namespace Psalm\Checker;
 
 use PhpParser;
+use Psalm\Checker\Statements\ExpressionChecker;
 use Psalm\CodeLocation;
 use Psalm\Config;
 use Psalm\Context;
-use Psalm\Checker\Statements\ExpressionChecker;
 use Psalm\Exception\DocblockParseException;
 use Psalm\Issue\DuplicateClass;
-use Psalm\Issue\InvalidClass;
-use Psalm\Issue\InvalidDocblock;
 use Psalm\Issue\InaccessibleMethod;
 use Psalm\Issue\InaccessibleProperty;
+use Psalm\Issue\InvalidClass;
+use Psalm\Issue\InvalidDocblock;
 use Psalm\Issue\MissingConstructor;
 use Psalm\Issue\MissingPropertyType;
 use Psalm\Issue\PropertyNotSetInConstructor;
-use Psalm\Issue\RedefinedTraitMethod;
 use Psalm\Issue\UndefinedClass;
 use Psalm\Issue\UndefinedTrait;
 use Psalm\Issue\UnimplementedInterfaceMethod;
 use Psalm\IssueBuffer;
-use Psalm\StatementsSource;
 use Psalm\Provider\FileReferenceProvider;
+use Psalm\StatementsSource;
 use Psalm\Storage\ClassLikeStorage;
-use Psalm\Storage\MethodStorage;
 use Psalm\Storage\PropertyStorage;
 use Psalm\Type;
 use Psalm\Type\Atomic\TNamedObject;
diff --git a/src/Psalm/Checker/CommentChecker.php b/src/Psalm/Checker/CommentChecker.php
index e818e15a1..e219517d1 100644
--- a/src/Psalm/Checker/CommentChecker.php
+++ b/src/Psalm/Checker/CommentChecker.php
@@ -1,11 +1,11 @@
 <?php
 namespace Psalm\Checker;
 
-use Psalm\Context;
-use Psalm\Exception\TypeParseTreeException;
-use Psalm\Exception\DocblockParseException;
-use Psalm\FunctionDocblockComment;
 use Psalm\ClassLikeDocblockComment;
+use Psalm\Context;
+use Psalm\Exception\DocblockParseException;
+use Psalm\Exception\TypeParseTreeException;
+use Psalm\FunctionDocblockComment;
 use Psalm\StatementsSource;
 use Psalm\Type;
 
diff --git a/src/Psalm/Checker/FileChecker.php b/src/Psalm/Checker/FileChecker.php
index 3be78b971..9cda6139d 100644
--- a/src/Psalm/Checker/FileChecker.php
+++ b/src/Psalm/Checker/FileChecker.php
@@ -1,12 +1,11 @@
 <?php
 namespace Psalm\Checker;
 
-use PhpParser\ParserFactory;
 use PhpParser;
 use Psalm\Config;
 use Psalm\Context;
-use Psalm\IssueBuffer;
 use Psalm\Issue\DuplicateClass;
+use Psalm\IssueBuffer;
 use Psalm\Provider\FileProvider;
 use Psalm\StatementsSource;
 use Psalm\Storage\FileStorage;
diff --git a/src/Psalm/Checker/FunctionChecker.php b/src/Psalm/Checker/FunctionChecker.php
index 6bd90264a..ed0c4791d 100644
--- a/src/Psalm/Checker/FunctionChecker.php
+++ b/src/Psalm/Checker/FunctionChecker.php
@@ -3,12 +3,7 @@ namespace Psalm\Checker;
 
 use PhpParser;
 use Psalm\CodeLocation;
-use Psalm\Config;
-use Psalm\EffectsAnalyser;
-use Psalm\Exception\DocblockParseException;
 use Psalm\FunctionLikeParameter;
-use Psalm\Issue\DuplicateParam;
-use Psalm\Issue\InvalidDocblock;
 use Psalm\Issue\InvalidReturnType;
 use Psalm\IssueBuffer;
 use Psalm\StatementsSource;
diff --git a/src/Psalm/Checker/FunctionLikeChecker.php b/src/Psalm/Checker/FunctionLikeChecker.php
index ac0f39d7b..231b9389f 100644
--- a/src/Psalm/Checker/FunctionLikeChecker.php
+++ b/src/Psalm/Checker/FunctionLikeChecker.php
@@ -1,13 +1,12 @@
 <?php
 namespace Psalm\Checker;
 
+use PhpParser;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
-use PhpParser;
-use Psalm\CodeLocation;
 use Psalm\Checker\Statements\ExpressionChecker;
-use Psalm\Checker\TypeChecker;
+use Psalm\CodeLocation;
 use Psalm\Config;
 use Psalm\Context;
 use Psalm\EffectsAnalyser;
diff --git a/src/Psalm/Checker/MethodChecker.php b/src/Psalm/Checker/MethodChecker.php
index 461d19c2d..36b927c4e 100644
--- a/src/Psalm/Checker/MethodChecker.php
+++ b/src/Psalm/Checker/MethodChecker.php
@@ -3,12 +3,8 @@ namespace Psalm\Checker;
 
 use PhpParser;
 use Psalm\CodeLocation;
-use Psalm\Config;
-use Psalm\Exception\DocblockParseException;
 use Psalm\Issue\DeprecatedMethod;
-use Psalm\Issue\DuplicateParam;
 use Psalm\Issue\InaccessibleMethod;
-use Psalm\Issue\InvalidDocblock;
 use Psalm\Issue\InvalidStaticInvocation;
 use Psalm\Issue\NonStaticSelfCall;
 use Psalm\Issue\UndefinedMethod;
diff --git a/src/Psalm/Checker/NamespaceChecker.php b/src/Psalm/Checker/NamespaceChecker.php
index d850b620d..7c70ba702 100644
--- a/src/Psalm/Checker/NamespaceChecker.php
+++ b/src/Psalm/Checker/NamespaceChecker.php
@@ -1,12 +1,11 @@
 <?php
 namespace Psalm\Checker;
 
-use PhpParser\Node\Stmt\Namespace_;
 use PhpParser;
+use PhpParser\Node\Stmt\Namespace_;
 use Psalm\Context;
-use Psalm\Exception\RedefinedPredefinedClassException;
-use Psalm\IssueBuffer;
 use Psalm\Issue\DuplicateClass;
+use Psalm\IssueBuffer;
 use Psalm\StatementsSource;
 use Psalm\Type;
 
diff --git a/src/Psalm/Checker/ProjectChecker.php b/src/Psalm/Checker/ProjectChecker.php
index 0bdd48580..2fc5e1fd2 100644
--- a/src/Psalm/Checker/ProjectChecker.php
+++ b/src/Psalm/Checker/ProjectChecker.php
@@ -4,10 +4,10 @@ namespace Psalm\Checker;
 use Psalm\Config;
 use Psalm\Context;
 use Psalm\Exception;
-use Psalm\IssueBuffer;
 use Psalm\Issue\PossiblyUnusedMethod;
 use Psalm\Issue\UnusedClass;
 use Psalm\Issue\UnusedMethod;
+use Psalm\IssueBuffer;
 use Psalm\Provider\CacheProvider;
 use Psalm\Provider\FileProvider;
 use Psalm\Provider\FileReferenceProvider;
diff --git a/src/Psalm/Checker/SourceChecker.php b/src/Psalm/Checker/SourceChecker.php
index 4dad4d23b..5a99b2387 100644
--- a/src/Psalm/Checker/SourceChecker.php
+++ b/src/Psalm/Checker/SourceChecker.php
@@ -1,11 +1,7 @@
 <?php
 namespace Psalm\Checker;
 
-use PhpParser\Node\Stmt\Namespace_;
-use PhpParser;
-use Psalm\Context;
 use Psalm\StatementsSource;
-use Psalm\Type;
 
 abstract class SourceChecker implements StatementsSource
 {
diff --git a/src/Psalm/Checker/Statements/Block/ForChecker.php b/src/Psalm/Checker/Statements/Block/ForChecker.php
index 89a7490dd..ad941d1ee 100644
--- a/src/Psalm/Checker/Statements/Block/ForChecker.php
+++ b/src/Psalm/Checker/Statements/Block/ForChecker.php
@@ -2,9 +2,9 @@
 namespace Psalm\Checker\Statements\Block;
 
 use PhpParser;
-use Psalm\Context;
 use Psalm\Checker\Statements\ExpressionChecker;
 use Psalm\Checker\StatementsChecker;
+use Psalm\Context;
 use Psalm\Type;
 
 class ForChecker
diff --git a/src/Psalm/Checker/Statements/Block/ForeachChecker.php b/src/Psalm/Checker/Statements/Block/ForeachChecker.php
index 341495fbc..fd18cc7d7 100644
--- a/src/Psalm/Checker/Statements/Block/ForeachChecker.php
+++ b/src/Psalm/Checker/Statements/Block/ForeachChecker.php
@@ -2,18 +2,17 @@
 namespace Psalm\Checker\Statements\Block;
 
 use PhpParser;
-use Psalm\CodeLocation;
-use Psalm\Context;
-use Psalm\IssueBuffer;
 use Psalm\Checker\ClassChecker;
 use Psalm\Checker\ClassLikeChecker;
 use Psalm\Checker\CommentChecker;
 use Psalm\Checker\MethodChecker;
-use Psalm\Checker\Statements\ExpressionChecker;
 use Psalm\Checker\Statements\Expression\AssignmentChecker;
+use Psalm\Checker\Statements\ExpressionChecker;
 use Psalm\Checker\StatementsChecker;
+use Psalm\CodeLocation;
+use Psalm\Context;
 use Psalm\Issue\InvalidIterator;
-use Psalm\Issue\NullReference;
+use Psalm\IssueBuffer;
 use Psalm\Type;
 
 class ForeachChecker
diff --git a/src/Psalm/Checker/Statements/Block/IfChecker.php b/src/Psalm/Checker/Statements/Block/IfChecker.php
index 5873199dd..22893db93 100644
--- a/src/Psalm/Checker/Statements/Block/IfChecker.php
+++ b/src/Psalm/Checker/Statements/Block/IfChecker.php
@@ -7,12 +7,11 @@ use Psalm\Checker\ScopeChecker;
 use Psalm\Checker\Statements\ExpressionChecker;
 use Psalm\Checker\StatementsChecker;
 use Psalm\Checker\TypeChecker;
-use Psalm\Clause;
 use Psalm\CodeLocation;
 use Psalm\Context;
 use Psalm\IfScope;
-use Psalm\IssueBuffer;
 use Psalm\Issue\ConflictingReferenceConstraint;
+use Psalm\IssueBuffer;
 use Psalm\Type;
 
 class IfChecker
diff --git a/src/Psalm/Checker/Statements/Block/SwitchChecker.php b/src/Psalm/Checker/Statements/Block/SwitchChecker.php
index 3a3de0bd5..a6be6c9ac 100644
--- a/src/Psalm/Checker/Statements/Block/SwitchChecker.php
+++ b/src/Psalm/Checker/Statements/Block/SwitchChecker.php
@@ -3,8 +3,8 @@ namespace Psalm\Checker\Statements\Block;
 
 use PhpParser;
 use Psalm\Checker\ScopeChecker;
-use Psalm\Checker\StatementsChecker;
 use Psalm\Checker\Statements\ExpressionChecker;
+use Psalm\Checker\StatementsChecker;
 use Psalm\CodeLocation;
 use Psalm\Context;
 use Psalm\Issue\ContinueOutsideLoop;
diff --git a/src/Psalm/Checker/Statements/Block/TryChecker.php b/src/Psalm/Checker/Statements/Block/TryChecker.php
index 7f8017ba3..f6954319d 100644
--- a/src/Psalm/Checker/Statements/Block/TryChecker.php
+++ b/src/Psalm/Checker/Statements/Block/TryChecker.php
@@ -3,9 +3,9 @@ namespace Psalm\Checker\Statements\Block;
 
 use PhpParser;
 use Psalm\Checker\ClassLikeChecker;
-use Psalm\CodeLocation;
 use Psalm\Checker\ScopeChecker;
 use Psalm\Checker\StatementsChecker;
+use Psalm\CodeLocation;
 use Psalm\Context;
 use Psalm\Type;
 use Psalm\Type\Atomic\TNamedObject;
diff --git a/src/Psalm/Checker/Statements/Block/WhileChecker.php b/src/Psalm/Checker/Statements/Block/WhileChecker.php
index 2b4d3c15c..5aa2a8d15 100644
--- a/src/Psalm/Checker/Statements/Block/WhileChecker.php
+++ b/src/Psalm/Checker/Statements/Block/WhileChecker.php
@@ -2,14 +2,13 @@
 namespace Psalm\Checker\Statements\Block;
 
 use PhpParser;
+use Psalm\Checker\AlgebraChecker;
+use Psalm\Checker\ScopeChecker;
+use Psalm\Checker\Statements\ExpressionChecker;
+use Psalm\Checker\StatementsChecker;
+use Psalm\Checker\TypeChecker;
 use Psalm\CodeLocation;
 use Psalm\Context;
-use Psalm\Checker\AlgebraChecker;
-use Psalm\Checker\Statements\ExpressionChecker;
-use Psalm\Checker\Statements\Expression\AssertionFinder;
-use Psalm\Checker\StatementsChecker;
-use Psalm\Checker\ScopeChecker;
-use Psalm\Checker\TypeChecker;
 use Psalm\Type;
 
 class WhileChecker
diff --git a/src/Psalm/Checker/Statements/Expression/AssertionFinder.php b/src/Psalm/Checker/Statements/Expression/AssertionFinder.php
index a24a7567d..c520a2416 100644
--- a/src/Psalm/Checker/Statements/Expression/AssertionFinder.php
+++ b/src/Psalm/Checker/Statements/Expression/AssertionFinder.php
@@ -5,7 +5,6 @@ use PhpParser;
 use Psalm\Checker\ClassLikeChecker;
 use Psalm\Checker\Statements\ExpressionChecker;
 use Psalm\Checker\TypeChecker;
-use Psalm\Clause;
 use Psalm\CodeLocation;
 use Psalm\Issue\TypeDoesNotContainNull;
 use Psalm\Issue\TypeDoesNotContainType;
diff --git a/src/Psalm/Checker/Statements/Expression/AssignmentChecker.php b/src/Psalm/Checker/Statements/Expression/AssignmentChecker.php
index e7052b80f..a4f0f575f 100644
--- a/src/Psalm/Checker/Statements/Expression/AssignmentChecker.php
+++ b/src/Psalm/Checker/Statements/Expression/AssignmentChecker.php
@@ -9,8 +9,8 @@ use Psalm\Checker\ClassLikeChecker;
 use Psalm\Checker\CommentChecker;
 use Psalm\Checker\InterfaceChecker;
 use Psalm\Checker\MethodChecker;
-use Psalm\Checker\StatementsChecker;
 use Psalm\Checker\Statements\ExpressionChecker;
+use Psalm\Checker\StatementsChecker;
 use Psalm\Checker\TypeChecker;
 use Psalm\CodeLocation;
 use Psalm\Context;
@@ -18,9 +18,7 @@ use Psalm\Issue\FailedTypeResolution;
 use Psalm\Issue\InvalidArrayAssignment;
 use Psalm\Issue\InvalidPropertyAssignment;
 use Psalm\Issue\InvalidScope;
-use Psalm\Issue\InaccessibleProperty;
 use Psalm\Issue\MissingPropertyDeclaration;
-use Psalm\Issue\MissingPropertyType;
 use Psalm\Issue\MixedAssignment;
 use Psalm\Issue\MixedPropertyAssignment;
 use Psalm\Issue\MixedStringOffsetAssignment;
@@ -33,26 +31,12 @@ use Psalm\Issue\UndefinedPropertyAssignment;
 use Psalm\Issue\UndefinedThisPropertyAssignment;
 use Psalm\IssueBuffer;
 use Psalm\Type;
-use Psalm\Type\Atomic\Generic;
-use Psalm\Type\Atomic\ObjectLike;
 use Psalm\Type\Atomic\Scalar;
-use Psalm\Type\Atomic\TNumeric;
-use Psalm\Type\Atomic\TInt;
-use Psalm\Type\Atomic\TVoid;
-use Psalm\Type\Atomic\TFloat;
-use Psalm\Type\Atomic\TString;
-use Psalm\Type\Atomic\TBool;
-use Psalm\Type\Atomic\TFalse;
-use Psalm\Type\Atomic\TNull;
-use Psalm\Type\Atomic\TEmpty;
-use Psalm\Type\Atomic\TArray;
 use Psalm\Type\Atomic\TMixed;
-use Psalm\Type\Atomic\TObject;
-use Psalm\Type\Atomic\TResource;
-use Psalm\Type\Atomic\TCallable;
 use Psalm\Type\Atomic\TNamedObject;
-use Psalm\Type\Atomic\TGenericObject;
-use Psalm\Type\Atomic\TNumericString;
+use Psalm\Type\Atomic\TNull;
+use Psalm\Type\Atomic\TObject;
+use Psalm\Type\Atomic\TString;
 
 class AssignmentChecker
 {
diff --git a/src/Psalm/Checker/Statements/Expression/CallChecker.php b/src/Psalm/Checker/Statements/Expression/CallChecker.php
index b43732899..7a685a4c9 100644
--- a/src/Psalm/Checker/Statements/Expression/CallChecker.php
+++ b/src/Psalm/Checker/Statements/Expression/CallChecker.php
@@ -8,9 +8,8 @@ use Psalm\Checker\ClassLikeChecker;
 use Psalm\Checker\FunctionChecker;
 use Psalm\Checker\FunctionLikeChecker;
 use Psalm\Checker\MethodChecker;
-use Psalm\Checker\StatementsChecker;
 use Psalm\Checker\Statements\ExpressionChecker;
-use Psalm\Checker\TraitChecker;
+use Psalm\Checker\StatementsChecker;
 use Psalm\Checker\TypeChecker;
 use Psalm\CodeLocation;
 use Psalm\Config;
@@ -42,26 +41,13 @@ use Psalm\IssueBuffer;
 use Psalm\Storage\ClassLikeStorage;
 use Psalm\Storage\FunctionLikeStorage;
 use Psalm\Type;
-use Psalm\Type\Atomic\Generic;
 use Psalm\Type\Atomic\ObjectLike;
-use Psalm\Type\Atomic\Scalar;
-use Psalm\Type\Atomic\TNumeric;
-use Psalm\Type\Atomic\TInt;
-use Psalm\Type\Atomic\TVoid;
-use Psalm\Type\Atomic\TFloat;
-use Psalm\Type\Atomic\TString;
-use Psalm\Type\Atomic\TBool;
-use Psalm\Type\Atomic\TFalse;
-use Psalm\Type\Atomic\TNull;
-use Psalm\Type\Atomic\TEmpty;
 use Psalm\Type\Atomic\TArray;
-use Psalm\Type\Atomic\TMixed;
-use Psalm\Type\Atomic\TObject;
-use Psalm\Type\Atomic\TResource;
 use Psalm\Type\Atomic\TCallable;
-use Psalm\Type\Atomic\TNamedObject;
 use Psalm\Type\Atomic\TGenericObject;
-use Psalm\Type\Atomic\TNumericString;
+use Psalm\Type\Atomic\TMixed;
+use Psalm\Type\Atomic\TNamedObject;
+use Psalm\Type\Atomic\TNull;
 
 class CallChecker
 {
diff --git a/src/Psalm/Checker/Statements/Expression/FetchChecker.php b/src/Psalm/Checker/Statements/Expression/FetchChecker.php
index 61804e4d2..3aea0e6dd 100644
--- a/src/Psalm/Checker/Statements/Expression/FetchChecker.php
+++ b/src/Psalm/Checker/Statements/Expression/FetchChecker.php
@@ -6,16 +6,15 @@ use Psalm\Checker\ClassChecker;
 use Psalm\Checker\ClassLikeChecker;
 use Psalm\Checker\InterfaceChecker;
 use Psalm\Checker\MethodChecker;
-use Psalm\Checker\StatementsChecker;
 use Psalm\Checker\Statements\ExpressionChecker;
+use Psalm\Checker\StatementsChecker;
 use Psalm\Checker\TraitChecker;
 use Psalm\CodeLocation;
 use Psalm\Context;
+use Psalm\Issue\InaccessibleClassConstant;
 use Psalm\Issue\InvalidArrayAccess;
 use Psalm\Issue\InvalidArrayAssignment;
 use Psalm\Issue\InvalidPropertyFetch;
-use Psalm\Issue\InaccessibleClassConstant;
-use Psalm\Issue\InaccessibleProperty;
 use Psalm\Issue\MissingPropertyType;
 use Psalm\Issue\MixedArrayAccess;
 use Psalm\Issue\MixedArrayOffset;
@@ -34,26 +33,18 @@ use Psalm\Issue\UndefinedPropertyFetch;
 use Psalm\Issue\UndefinedThisPropertyFetch;
 use Psalm\IssueBuffer;
 use Psalm\Type;
-use Psalm\Type\Atomic\Generic;
-use Psalm\Type\Atomic\ObjectLike;
 use Psalm\Type\Atomic\Scalar;
-use Psalm\Type\Atomic\TNumeric;
-use Psalm\Type\Atomic\TInt;
-use Psalm\Type\Atomic\TVoid;
-use Psalm\Type\Atomic\TFloat;
-use Psalm\Type\Atomic\TString;
-use Psalm\Type\Atomic\TBool;
-use Psalm\Type\Atomic\TFalse;
-use Psalm\Type\Atomic\TNull;
-use Psalm\Type\Atomic\TEmpty;
 use Psalm\Type\Atomic\TArray;
-use Psalm\Type\Atomic\TMixed;
-use Psalm\Type\Atomic\TObject;
-use Psalm\Type\Atomic\TResource;
-use Psalm\Type\Atomic\TCallable;
-use Psalm\Type\Atomic\TNamedObject;
+use Psalm\Type\Atomic\TBool;
+use Psalm\Type\Atomic\TEmpty;
+use Psalm\Type\Atomic\TFloat;
 use Psalm\Type\Atomic\TGenericObject;
-use Psalm\Type\Atomic\TNumericString;
+use Psalm\Type\Atomic\TInt;
+use Psalm\Type\Atomic\TMixed;
+use Psalm\Type\Atomic\TNamedObject;
+use Psalm\Type\Atomic\TNull;
+use Psalm\Type\Atomic\TObject;
+use Psalm\Type\Atomic\TString;
 
 class FetchChecker
 {
@@ -1227,7 +1218,7 @@ class FetchChecker
         ) {
             if (IssueBuffer::accepts(
                 new InvalidArrayAssignment(
-                    'Cannot assign value on variable' . ($var_id ? ' ' . $var_id  : '') . ' of type ' . $type .
+                    'Cannot assign value on variable' . ($var_id ? ' ' . $var_id : '') . ' of type ' . $type .
                         ' that does not implement ArrayAccess',
                     $code_location
                 ),
diff --git a/src/Psalm/Checker/Statements/ExpressionChecker.php b/src/Psalm/Checker/Statements/ExpressionChecker.php
index b122b00d4..8649f1b2a 100644
--- a/src/Psalm/Checker/Statements/ExpressionChecker.php
+++ b/src/Psalm/Checker/Statements/ExpressionChecker.php
@@ -8,7 +8,6 @@ use Psalm\Checker\ClassLikeChecker;
 use Psalm\Checker\ClosureChecker;
 use Psalm\Checker\CommentChecker;
 use Psalm\Checker\MethodChecker;
-use Psalm\Checker\Statements\Expression\AssertionFinder;
 use Psalm\Checker\Statements\Expression\AssignmentChecker;
 use Psalm\Checker\Statements\Expression\CallChecker;
 use Psalm\Checker\Statements\Expression\FetchChecker;
@@ -31,26 +30,15 @@ use Psalm\Issue\UnrecognizedExpression;
 use Psalm\IssueBuffer;
 use Psalm\StatementsSource;
 use Psalm\Type;
-use Psalm\Type\Atomic\Generic;
 use Psalm\Type\Atomic\ObjectLike;
 use Psalm\Type\Atomic\Scalar;
-use Psalm\Type\Atomic\TNumeric;
-use Psalm\Type\Atomic\TInt;
-use Psalm\Type\Atomic\TVoid;
-use Psalm\Type\Atomic\TFloat;
-use Psalm\Type\Atomic\TString;
-use Psalm\Type\Atomic\TBool;
-use Psalm\Type\Atomic\TFalse;
-use Psalm\Type\Atomic\TNull;
-use Psalm\Type\Atomic\TEmpty;
 use Psalm\Type\Atomic\TArray;
+use Psalm\Type\Atomic\TFloat;
+use Psalm\Type\Atomic\TInt;
 use Psalm\Type\Atomic\TMixed;
-use Psalm\Type\Atomic\TObject;
-use Psalm\Type\Atomic\TResource;
-use Psalm\Type\Atomic\TCallable;
 use Psalm\Type\Atomic\TNamedObject;
-use Psalm\Type\Atomic\TGenericObject;
-use Psalm\Type\Atomic\TNumericString;
+use Psalm\Type\Atomic\TObject;
+use Psalm\Type\Atomic\TString;
 
 class ExpressionChecker
 {
diff --git a/src/Psalm/Checker/StatementsChecker.php b/src/Psalm/Checker/StatementsChecker.php
index 5770e78fb..bf363a901 100644
--- a/src/Psalm/Checker/StatementsChecker.php
+++ b/src/Psalm/Checker/StatementsChecker.php
@@ -8,16 +8,15 @@ use Psalm\Checker\Statements\Block\IfChecker;
 use Psalm\Checker\Statements\Block\SwitchChecker;
 use Psalm\Checker\Statements\Block\TryChecker;
 use Psalm\Checker\Statements\Block\WhileChecker;
-use Psalm\Checker\Statements\ExpressionChecker;
 use Psalm\Checker\Statements\Expression\AssignmentChecker;
 use Psalm\Checker\Statements\Expression\CallChecker;
+use Psalm\Checker\Statements\ExpressionChecker;
 use Psalm\CodeLocation;
 use Psalm\Config;
 use Psalm\Context;
 use Psalm\Exception\FileIncludeException;
 use Psalm\Issue\ContinueOutsideLoop;
 use Psalm\Issue\InvalidGlobal;
-use Psalm\Issue\InvalidNamespace;
 use Psalm\Issue\UnevaluatedCode;
 use Psalm\Issue\UnrecognizedStatement;
 use Psalm\IssueBuffer;
diff --git a/src/Psalm/Checker/TraitChecker.php b/src/Psalm/Checker/TraitChecker.php
index 780af06ec..316d2ff6a 100644
--- a/src/Psalm/Checker/TraitChecker.php
+++ b/src/Psalm/Checker/TraitChecker.php
@@ -2,9 +2,9 @@
 namespace Psalm\Checker;
 
 use PhpParser;
-use Psalm\StatementsSource;
-use Psalm\Context;
 use Psalm\CodeLocation;
+use Psalm\Context;
+use Psalm\StatementsSource;
 use Psalm\Storage\ClassLikeStorage;
 
 class TraitChecker extends ClassLikeChecker
diff --git a/src/Psalm/Checker/TypeChecker.php b/src/Psalm/Checker/TypeChecker.php
index 024e354a0..d3ca32112 100644
--- a/src/Psalm/Checker/TypeChecker.php
+++ b/src/Psalm/Checker/TypeChecker.php
@@ -1,36 +1,30 @@
 <?php
 namespace Psalm\Checker;
 
-use PhpParser;
 use Psalm\Checker\Statements\ExpressionChecker;
 use Psalm\CodeLocation;
 use Psalm\Issue\FailedTypeResolution;
 use Psalm\Issue\TypeDoesNotContainNull;
 use Psalm\Issue\TypeDoesNotContainType;
 use Psalm\IssueBuffer;
-use Psalm\StatementsSource;
 use Psalm\Type;
-use Psalm\Type\Atomic\Generic;
 use Psalm\Type\Atomic\ObjectLike;
 use Psalm\Type\Atomic\Scalar;
-use Psalm\Type\Atomic\TScalar;
-use Psalm\Type\Atomic\TNumeric;
-use Psalm\Type\Atomic\TInt;
-use Psalm\Type\Atomic\TVoid;
-use Psalm\Type\Atomic\TFloat;
-use Psalm\Type\Atomic\TString;
-use Psalm\Type\Atomic\TBool;
-use Psalm\Type\Atomic\TFalse;
-use Psalm\Type\Atomic\TNull;
-use Psalm\Type\Atomic\TEmpty;
 use Psalm\Type\Atomic\TArray;
+use Psalm\Type\Atomic\TBool;
+use Psalm\Type\Atomic\TCallable;
+use Psalm\Type\Atomic\TFalse;
+use Psalm\Type\Atomic\TFloat;
+use Psalm\Type\Atomic\TInt;
 use Psalm\Type\Atomic\TMixed;
+use Psalm\Type\Atomic\TNamedObject;
+use Psalm\Type\Atomic\TNull;
+use Psalm\Type\Atomic\TNumeric;
+use Psalm\Type\Atomic\TNumericString;
 use Psalm\Type\Atomic\TObject;
 use Psalm\Type\Atomic\TResource;
-use Psalm\Type\Atomic\TCallable;
-use Psalm\Type\Atomic\TNamedObject;
-use Psalm\Type\Atomic\TGenericObject;
-use Psalm\Type\Atomic\TNumericString;
+use Psalm\Type\Atomic\TScalar;
+use Psalm\Type\Atomic\TString;
 
 class TypeChecker
 {
diff --git a/src/Psalm/Config/ErrorLevelFileFilter.php b/src/Psalm/Config/ErrorLevelFileFilter.php
index fc913c53f..6a470079f 100644
--- a/src/Psalm/Config/ErrorLevelFileFilter.php
+++ b/src/Psalm/Config/ErrorLevelFileFilter.php
@@ -1,7 +1,6 @@
 <?php
 namespace Psalm\Config;
 
-use Psalm\Config;
 use SimpleXMLElement;
 
 class ErrorLevelFileFilter extends FileFilter
diff --git a/src/Psalm/Config/IssueHandler.php b/src/Psalm/Config/IssueHandler.php
index 50da6ce88..4a4c08984 100644
--- a/src/Psalm/Config/IssueHandler.php
+++ b/src/Psalm/Config/IssueHandler.php
@@ -1,7 +1,6 @@
 <?php
 namespace Psalm\Config;
 
-use Psalm\Config;
 use SimpleXMLElement;
 
 class IssueHandler
diff --git a/src/Psalm/Config/ProjectFileFilter.php b/src/Psalm/Config/ProjectFileFilter.php
index fa3e97359..cabc06b3c 100644
--- a/src/Psalm/Config/ProjectFileFilter.php
+++ b/src/Psalm/Config/ProjectFileFilter.php
@@ -1,7 +1,6 @@
 <?php
 namespace Psalm\Config;
 
-use Psalm\Config;
 use SimpleXMLElement;
 
 class ProjectFileFilter extends FileFilter
diff --git a/src/Psalm/Context.php b/src/Psalm/Context.php
index b102a425a..b92d46dc7 100644
--- a/src/Psalm/Context.php
+++ b/src/Psalm/Context.php
@@ -1,8 +1,8 @@
 <?php
 namespace Psalm;
 
-use Psalm\Type\Union;
 use Psalm\Checker\FileChecker;
+use Psalm\Type\Union;
 
 class Context
 {
diff --git a/src/Psalm/Provider/FileReferenceProvider.php b/src/Psalm/Provider/FileReferenceProvider.php
index 13c83f710..7dcddc1f2 100644
--- a/src/Psalm/Provider/FileReferenceProvider.php
+++ b/src/Psalm/Provider/FileReferenceProvider.php
@@ -1,8 +1,8 @@
 <?php
 namespace Psalm\Provider;
 
-use Psalm\Config;
 use Psalm\Checker\ClassLikeChecker;
+use Psalm\Config;
 
 /**
  * Used to determine which files reference other files, necessary for using the --diff
diff --git a/src/Psalm/StatementsSource.php b/src/Psalm/StatementsSource.php
index c5bf1a6d6..f38f3db3d 100644
--- a/src/Psalm/StatementsSource.php
+++ b/src/Psalm/StatementsSource.php
@@ -1,7 +1,6 @@
 <?php
 namespace Psalm;
 
-use Psalm\Checker\ClassLikeChecker;
 use Psalm\Checker\FileChecker;
 
 interface StatementsSource
diff --git a/src/Psalm/Storage/FunctionLikeStorage.php b/src/Psalm/Storage/FunctionLikeStorage.php
index d2af61c73..d019b88d1 100644
--- a/src/Psalm/Storage/FunctionLikeStorage.php
+++ b/src/Psalm/Storage/FunctionLikeStorage.php
@@ -1,10 +1,9 @@
 <?php
 namespace Psalm\Storage;
 
-use PhpParser;
-use Psalm\Type;
 use Psalm\CodeLocation;
 use Psalm\FunctionLikeParameter;
+use Psalm\Type;
 
 class FunctionLikeStorage
 {
diff --git a/src/Psalm/Storage/MethodStorage.php b/src/Psalm/Storage/MethodStorage.php
index f069dd7fb..75ca7b292 100644
--- a/src/Psalm/Storage/MethodStorage.php
+++ b/src/Psalm/Storage/MethodStorage.php
@@ -1,7 +1,6 @@
 <?php
 namespace Psalm\Storage;
 
-use Psalm\Type;
 
 class MethodStorage extends FunctionLikeStorage
 {
diff --git a/src/Psalm/Type.php b/src/Psalm/Type.php
index c968f00ba..3c44e6d6f 100644
--- a/src/Psalm/Type.php
+++ b/src/Psalm/Type.php
@@ -5,24 +5,19 @@ use Psalm\Exception\TypeParseTreeException;
 use Psalm\Type\Atomic;
 use Psalm\Type\Atomic\Generic;
 use Psalm\Type\Atomic\ObjectLike;
-use Psalm\Type\Atomic\Scalar;
-use Psalm\Type\Atomic\TNumeric;
-use Psalm\Type\Atomic\TInt;
-use Psalm\Type\Atomic\TVoid;
-use Psalm\Type\Atomic\TFloat;
-use Psalm\Type\Atomic\TString;
-use Psalm\Type\Atomic\TBool;
-use Psalm\Type\Atomic\TFalse;
-use Psalm\Type\Atomic\TNull;
-use Psalm\Type\Atomic\TEmpty;
 use Psalm\Type\Atomic\TArray;
-use Psalm\Type\Atomic\TMixed;
-use Psalm\Type\Atomic\TObject;
-use Psalm\Type\Atomic\TResource;
-use Psalm\Type\Atomic\TCallable;
-use Psalm\Type\Atomic\TNamedObject;
+use Psalm\Type\Atomic\TBool;
+use Psalm\Type\Atomic\TEmpty;
+use Psalm\Type\Atomic\TFalse;
+use Psalm\Type\Atomic\TFloat;
 use Psalm\Type\Atomic\TGenericObject;
-use Psalm\Type\Atomic\TNumericString;
+use Psalm\Type\Atomic\TInt;
+use Psalm\Type\Atomic\TMixed;
+use Psalm\Type\Atomic\TNamedObject;
+use Psalm\Type\Atomic\TNull;
+use Psalm\Type\Atomic\TObject;
+use Psalm\Type\Atomic\TString;
+use Psalm\Type\Atomic\TVoid;
 use Psalm\Type\ParseTree;
 use Psalm\Type\Union;
 
diff --git a/src/Psalm/Type/Atomic.php b/src/Psalm/Type/Atomic.php
index 1a1b50017..79dcc9596 100644
--- a/src/Psalm/Type/Atomic.php
+++ b/src/Psalm/Type/Atomic.php
@@ -1,32 +1,31 @@
 <?php
 namespace Psalm\Type;
 
-use Psalm\Type;
-use Psalm\Type\Atomic\ObjectLike;
-use Psalm\Type\Atomic\Scalar;
-use Psalm\Type\Atomic\TNumeric;
-use Psalm\Type\Atomic\TInt;
-use Psalm\Type\Atomic\TVoid;
-use Psalm\Type\Atomic\TFloat;
-use Psalm\Type\Atomic\TString;
-use Psalm\Type\Atomic\TBool;
-use Psalm\Type\Atomic\TFalse;
-use Psalm\Type\Atomic\TNull;
-use Psalm\Type\Atomic\TEmpty;
-use Psalm\Type\Atomic\TArray;
-use Psalm\Type\Atomic\TMixed;
-use Psalm\Type\Atomic\TObject;
-use Psalm\Type\Atomic\TResource;
-use Psalm\Type\Atomic\TScalar;
-use Psalm\Type\Atomic\TCallable;
-use Psalm\Type\Atomic\TNamedObject;
-use Psalm\Type\Atomic\TNumericString;
-use Psalm\Type\Union;
 use Psalm\Checker\ClassChecker;
 use Psalm\Checker\ClassLikeChecker;
 use Psalm\Checker\FileChecker;
 use Psalm\CodeLocation;
 use Psalm\StatementsSource;
+use Psalm\Type;
+use Psalm\Type\Atomic\ObjectLike;
+use Psalm\Type\Atomic\Scalar;
+use Psalm\Type\Atomic\TArray;
+use Psalm\Type\Atomic\TBool;
+use Psalm\Type\Atomic\TCallable;
+use Psalm\Type\Atomic\TEmpty;
+use Psalm\Type\Atomic\TFalse;
+use Psalm\Type\Atomic\TFloat;
+use Psalm\Type\Atomic\TInt;
+use Psalm\Type\Atomic\TMixed;
+use Psalm\Type\Atomic\TNamedObject;
+use Psalm\Type\Atomic\TNull;
+use Psalm\Type\Atomic\TNumeric;
+use Psalm\Type\Atomic\TNumericString;
+use Psalm\Type\Atomic\TObject;
+use Psalm\Type\Atomic\TResource;
+use Psalm\Type\Atomic\TScalar;
+use Psalm\Type\Atomic\TString;
+use Psalm\Type\Atomic\TVoid;
 
 abstract class Atomic
 {
diff --git a/src/Psalm/Type/Atomic/TNamedObject.php b/src/Psalm/Type/Atomic/TNamedObject.php
index 5d7a2a3cf..731ebd2d4 100644
--- a/src/Psalm/Type/Atomic/TNamedObject.php
+++ b/src/Psalm/Type/Atomic/TNamedObject.php
@@ -2,7 +2,6 @@
 namespace Psalm\Type\Atomic;
 
 use \Psalm\Type\Atomic;
-use \Psalm\Type\Union;
 
 class TNamedObject extends Atomic
 {