Retarget to 1.x and fix conflicts

Author: mvriel

src/TypeResolver.php

@@ -88,7 +88,7 @@ final class TypeResolver
         'callback' => Types\Callable_::class,
         'callable' => Types\Callable_::class,
         'false' => PseudoTypes\False_::class,
-        'true' => PseudoTypes\False_::class,
+        'true' => PseudoTypes\True_::class,
         'self' => Types\Self_::class,
         '$this' => Types\This::class,
         'static' => Types\Static_::class,

src/Types/False_.php

@@ -704,9 +704,9 @@ public function provideKeywords() : array
             ['bool', Types\Boolean::class],
             ['boolean', Types\Boolean::class],
             ['true', Types\Boolean::class],
-            ['true', Types\True_::class],
+            ['true', PseudoTypes\True_::class],
             ['false', Types\Boolean::class],
-            ['false', Types\False_::class],
+            ['false', PseudoTypes\False_::class],
             ['resource', Types\Resource_::class],
             ['null', Types\Null_::class],
             ['callable', Types\Callable_::class],