Lots of lint fixes

fredemmott · fredemmott · commit a7e094f92732 · 2018-07-05T11:16:25.000-07:00
diff --git a/src/Codegen.php b/src/Codegen.php
@@ -10,15 +10,15 @@
 
 namespace Facebook\HackRouter;
 
-use Facebook\HackCodegen\{
+use type Facebook\HackCodegen\{
   CodegenGeneratedFrom,
   IHackCodegenConfig,
   HackCodegenConfig,
   HackCodegenFactory
 };
-use Facebook\DefinitionFinder\BaseParser;
-use Facebook\DefinitionFinder\TreeParser;
-use Facebook\HackRouter\PrivateImpl\{ClassFacts, ControllerFacts};
+use type Facebook\DefinitionFinder\BaseParser;
+use type Facebook\DefinitionFinder\TreeParser;
+use type Facebook\HackRouter\PrivateImpl\{ClassFacts, ControllerFacts};
 
 final class Codegen {
   const type TUriBuilderOutput = shape(
diff --git a/src/RequestParametersCodegenBuilder.php b/src/RequestParametersCodegenBuilder.php
@@ -10,15 +10,14 @@
 
 namespace Facebook\HackRouter;
 
-use Facebook\HackCodegen\{
+use type Facebook\HackCodegen\{
   CodegenClass,
   CodegenTrait,
   CodegenMethod,
   HackBuilderValues,
   HackCodegenFactory,
   IHackCodegenConfig
 };
-use Facebook\HackRouter\PrivateImpl\RequestParameterRequirementState;
 
 final class RequestParametersCodegenBuilder<T as RequestParametersBase>
 extends RequestParametersCodegenBuilderBase<RequestParametersCodegenBase<T>> {
diff --git a/src/RequestParametersCodegenBuilderBase.php b/src/RequestParametersCodegenBuilderBase.php
@@ -10,7 +10,7 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackCodegen\{
+use type \Facebook\HackCodegen\{
   CodegenClass,
   CodegenFile,
   CodegenFileResult,
diff --git a/src/RouterCLILookupCodegenBuilder.php b/src/RouterCLILookupCodegenBuilder.php
@@ -10,7 +10,7 @@
 
 namespace Facebook\HackRouter;
 
-use Facebook\HackCodegen\{
+use type Facebook\HackCodegen\{
   CodegenClass,
   CodegenFile,
   CodegenFileResult,
diff --git a/src/RouterCodegenBuilder.php b/src/RouterCodegenBuilder.php
@@ -10,7 +10,7 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackCodegen\{
+use type \Facebook\HackCodegen\{
   CodegenClass,
   CodegenFile,
   CodegenFileResult,
@@ -21,7 +21,7 @@
   HackCodegenFactory,
   IHackCodegenConfig
 };
-use \Facebook\DefinitionFinder\BaseParser;
+use type \Facebook\DefinitionFinder\BaseParser;
 
 final class RouterCodegenBuilder<T as IncludeInUriMap> {
   private CodegenGeneratedFrom $generatedFrom;
diff --git a/src/UriBuilderCodegenBuilder.php b/src/UriBuilderCodegenBuilder.php
@@ -10,7 +10,7 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackCodegen\{
+use type \Facebook\HackCodegen\{
   CodegenClass,
   CodegenTrait,
   HackBuilderValues,
diff --git a/src/UriMapBuilder.php b/src/UriMapBuilder.php
@@ -10,7 +10,7 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\PrivateImpl\ControllerFacts;
+use type \Facebook\HackRouter\PrivateImpl\ControllerFacts;
 
 final class UriMapBuilder<TBase as IncludeInUriMap> {
 
diff --git a/src/privateimpl/ClassFacts.php b/src/privateimpl/ClassFacts.php
@@ -10,9 +10,9 @@
 
 namespace Facebook\HackRouter\PrivateImpl;
 
-use Facebook\DefinitionFinder\BaseParser;
-use Facebook\DefinitionFinder\ScannedBasicClass;
-use Facebook\DefinitionFinder\ScannedClass;
+use type Facebook\DefinitionFinder\BaseParser;
+use type Facebook\DefinitionFinder\ScannedBasicClass;
+use type Facebook\DefinitionFinder\ScannedClass;
 
 final class ClassFacts {
   private ImmMap<string, ScannedClass> $classes;
diff --git a/src/privateimpl/ControllerFacts.php b/src/privateimpl/ControllerFacts.php
@@ -10,9 +10,9 @@
 
 namespace Facebook\HackRouter\PrivateImpl;
 
-use \Facebook\DefinitionFinder\ScannedBasicClass;
-use \Facebook\DefinitionFinder\ScannedClass;
-use \Facebook\HackRouter\{
+use type \Facebook\DefinitionFinder\ScannedBasicClass;
+use type \Facebook\DefinitionFinder\ScannedClass;
+use type \Facebook\HackRouter\{
   HttpMethod,
   IncludeInUriMap,
   SupportsGetRequests,
diff --git a/src/privateimpl/RequestParameterRequirementState.php b/src/privateimpl/RequestParameterRequirementState.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2016-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/uriparameters/RequestParameterCodegenBuilder.php b/src/uriparameters/RequestParameterCodegenBuilder.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2016-present, Facebook, Inc.
  *  All rights reserved.
@@ -10,9 +10,9 @@
 
 namespace Facebook\HackRouter;
 
-use Facebook\HackRouter\PrivateImpl\RequestParameterRequirementState;
+use type Facebook\HackRouter\PrivateImpl\RequestParameterRequirementState;
 
-use Facebook\HackCodegen\{
+use type Facebook\HackCodegen\{
   IHackCodegenConfig,
   HackCodegenFactory,
   CodegenMethod
diff --git a/src/uriparameters/spec/EnumParameterCodegenSpec.php b/src/uriparameters/spec/EnumParameterCodegenSpec.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2016-present, Facebook, Inc.
  *  All rights reserved.
@@ -10,7 +10,7 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\UriParameterCodegenArgumentSpec as Args;
+use type \Facebook\HackRouter\UriParameterCodegenArgumentSpec as Args;
 
 final class EnumParameterCodegenSpec extends UriParameterCodegenSpec {
   private static function cast<T>(
diff --git a/src/uriparameters/spec/IntParameterCodegenSpec.php b/src/uriparameters/spec/IntParameterCodegenSpec.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2016-present, Facebook, Inc.
  *  All rights reserved.
@@ -10,8 +10,6 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\UriParameterCodegenArgument as Arg;
-
 final class IntParameterCodegenSpec extends SimpleParameterCodegenSpec {
   <<__Override>>
   protected static function getSimpleSpec(): self::TSimpleSpec {
diff --git a/src/uriparameters/spec/SimpleParameterCodegenSpec.php b/src/uriparameters/spec/SimpleParameterCodegenSpec.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2016-present, Facebook, Inc.
  *  All rights reserved.
@@ -10,7 +10,7 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\UriParameterCodegenArgumentSpec as Args;
+use type \Facebook\HackRouter\UriParameterCodegenArgumentSpec as Args;
 
 abstract class SimpleParameterCodegenSpec extends UriParameterCodegenSpec {
   const type TSimpleSpec = shape(
diff --git a/src/uriparameters/spec/StringParameterCodegenSpec.php b/src/uriparameters/spec/StringParameterCodegenSpec.php
@@ -10,7 +10,7 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\UriParameterCodegenArgument as Arg;
+use type \Facebook\HackRouter\UriParameterCodegenArgument as Arg;
 
 final class StringParameterCodegenSpec extends SimpleParameterCodegenSpec {
   <<__Override>>
diff --git a/tests/BaseCodegenTestCase.php b/tests/BaseCodegenTestCase.php
@@ -10,7 +10,7 @@
 
 namespace Facebook\HackRouter;
 
-use Facebook\HackCodegen\{
+use type Facebook\HackCodegen\{
   HackCodegenConfig,
   HackCodegenFactory,
   IHackCodegenConfig
diff --git a/tests/ControllerFactsTest.php b/tests/ControllerFactsTest.php
@@ -10,12 +10,10 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\DefinitionFinder\FileParser;
-use \Facebook\DefinitionFinder\ScannedBasicClass;
-use \Facebook\HackRouter\HttpMethod;
-use \Facebook\HackRouter\CodeGen\Tests\GetRequestExampleController;
-use \Facebook\HackRouter\PrivateImpl\{
-  ClassFacts,
+use type \Facebook\DefinitionFinder\FileParser;
+use type \Facebook\DefinitionFinder\ScannedBasicClass;
+use type \Facebook\HackRouter\HttpMethod;
+use type \Facebook\HackRouter\PrivateImpl\{ClassFacts,
   ControllerFacts
 };
 
diff --git a/tests/RequestParametersCodegenBuilderTest.php b/tests/RequestParametersCodegenBuilderTest.php
@@ -10,15 +10,15 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\DefinitionFinder\FileParser;
-use \Facebook\HackCodegen\HackBuilderValues;
-use \Facebook\HackRouter\HttpMethod;
-use \Facebook\HackRouter\CodeGen\Tests\GetRequestExampleController;
-use \Facebook\HackRouter\CodeGen\Tests\Generated\{
+use type \Facebook\DefinitionFinder\FileParser;
+use type \Facebook\HackCodegen\HackBuilderValues;
+use type \Facebook\HackRouter\HttpMethod;
+use type \Facebook\HackRouter\CodeGen\Tests\GetRequestExampleController;
+use type \Facebook\HackRouter\CodeGen\Tests\Generated\{
   GetRequestExampleControllerUriBuilder,
   GetRequestExampleControllerParameters
 };
-use \Facebook\HackRouter\CodeGen\Tests\WebController;
+use type \Facebook\HackRouter\CodeGen\Tests\WebController;
 use namespace \Facebook\TypeAssert;
 
 final class RequestParametersCodegenBuilderTest extends BaseCodegenTestCase {
diff --git a/tests/RouterCLILookupCodegenBuilderTest.php b/tests/RouterCLILookupCodegenBuilderTest.php
@@ -10,8 +10,8 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\CodeGen\Tests\Generated\MySiteRouter;
-use \Facebook\HackRouter\CodeGen\Tests\{
+use type \Facebook\HackRouter\CodeGen\Tests\Generated\MySiteRouter;
+use type \Facebook\HackRouter\CodeGen\Tests\{
   GetRequestExampleController,
   MyEnum
 };
diff --git a/tests/RouterCodegenBuilderTest.php b/tests/RouterCodegenBuilderTest.php
@@ -10,14 +10,13 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\DefinitionFinder\FileParser;
-use \Facebook\HackRouter\CodeGen\Tests\{
+use type \Facebook\DefinitionFinder\FileParser;
+use type \Facebook\HackRouter\CodeGen\Tests\{
   GetRequestExampleController,
   MyEnum
 };
-use \Facebook\HackRouter\CodeGen\Tests\Generated\MySiteRouter;
-use \Facebook\HackRouter\PrivateImpl\{
-  ClassFacts,
+use type \Facebook\HackRouter\CodeGen\Tests\Generated\MySiteRouter;
+use type \Facebook\HackRouter\PrivateImpl\{ClassFacts,
   ControllerFacts
 };
 
diff --git a/tests/UriBuilderCodegenBuilderTest.php b/tests/UriBuilderCodegenBuilderTest.php
@@ -10,10 +10,11 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\DefinitionFinder\FileParser;
-use \Facebook\HackRouter\HttpMethod;
-use \Facebook\HackRouter\CodeGen\Tests\GetRequestExampleController;
-use \Facebook\HackRouter\CodeGen\Tests\Generated\GetRequestExampleControllerUriBuilder;
+use type \Facebook\DefinitionFinder\FileParser;
+use type \Facebook\HackRouter\HttpMethod;
+use type \Facebook\HackRouter\CodeGen\Tests\GetRequestExampleController;
+use type \Facebook\HackRouter\CodeGen\Tests\Generated\GetRequestExampleControllerUriBuilder
+;
 
 final class UriBuilderCodegenBuilderTest extends BaseCodegenTestCase {
   use TestTypechecksTestTrait;
diff --git a/tests/UriMapBuilderTest.php b/tests/UriMapBuilderTest.php
@@ -10,12 +10,11 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\DefinitionFinder\FileParser;
-use \Facebook\DefinitionFinder\ScannedBasicClass;
-use \Facebook\HackRouter\HttpMethod;
-use \Facebook\HackRouter\CodeGen\Tests\GetRequestExampleController;
-use \Facebook\HackRouter\PrivateImpl\{
-  ClassFacts,
+use type \Facebook\DefinitionFinder\FileParser;
+use type \Facebook\DefinitionFinder\ScannedBasicClass;
+use type \Facebook\HackRouter\HttpMethod;
+use type \Facebook\HackRouter\CodeGen\Tests\GetRequestExampleController;
+use type \Facebook\HackRouter\PrivateImpl\{ClassFacts,
   ControllerFacts
 };
 
diff --git a/tests/examples/GetRequestExampleController.php b/tests/examples/GetRequestExampleController.php
@@ -10,7 +10,7 @@
 
 namespace Facebook\HackRouter\CodeGen\Tests;
 
-use Facebook\HackRouter\{
+use type Facebook\HackRouter\{
   UriPattern,
   RequestParameter,
   RequestParameters,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?hh //strict`
	`1`	`+<?hh // strict`
`2`	`2`	`/*`
`3`	`3`	`* Copyright (c) 2016-present, Facebook, Inc.`
`4`	`4`	`* All rights reserved.`