autofix all the lint errors, update hhast to not have false positives

hhvm · Aug 7, 2018 · c3bc8cd · c3bc8cd
1 parent 72e4370
commit c3bc8cd
Show file tree

Hide file tree

Showing 38 changed files with 55 additions and 56 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/examples/BaseRouterExample.php b/examples/BaseRouterExample.php
@@ -1,4 +1,4 @@
-<?hh
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
@@ -16,8 +16,8 @@
 
 require_once(__DIR__.'/../vendor/hh_autoload.php');
 
-use Facebook\HackRouter\BaseRouter;
-use Facebook\HackRouter\HttpMethod;
+use type Facebook\HackRouter\BaseRouter;
+use type Facebook\HackRouter\HttpMethod;
 
 /** This can be whatever you want; in this case, it's a
  * callable, but classname<MyWebControllerBase> is also a
@@ -67,4 +67,5 @@ function main(): void {
   }
 }
 
+/* HH_IGNORE_ERROR[1002] top-level statement in strict file */
 main();
diff --git a/examples/UriPatternsExample.php b/examples/UriPatternsExample.php
@@ -1,4 +1,4 @@
-<?hh
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
@@ -16,14 +16,13 @@
 
 require_once(__DIR__.'/../vendor/hh_autoload.php');
 
-use Facebook\HackRouter\{
+use   type Facebook\HackRouter\{
   BaseRouter,
   GetFastRoutePatternFromUriPattern,
   GetUriBuilderFromUriPattern,
   HasUriPattern,
   HttpMethod,
   RequestParameters,
-  UriBuilder,
   UriPattern
 };
 
@@ -124,4 +123,5 @@ function main(): void {
   }
 }
 
+/* HH_IGNORE_ERROR[1002] top-level statement in strict file */
 main();
diff --git a/src/PatternParser/LiteralNode.php b/src/PatternParser/LiteralNode.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/PatternParser/Node.php b/src/PatternParser/Node.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/PatternParser/OptionalNode.php b/src/PatternParser/OptionalNode.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/PatternParser/ParameterNode.php b/src/PatternParser/ParameterNode.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
@@ -10,7 +10,6 @@
 
 namespace Facebook\HackRouter\PatternParser;
 
-use namespace HH\Lib\Str;
 
 final class ParameterNode implements Node {
   public function __construct(private string $name, private ?string $regexp) {

diff --git a/src/PatternParser/Parser.php b/src/PatternParser/Parser.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/PatternParser/PatternNode.php b/src/PatternParser/PatternNode.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
@@ -10,7 +10,7 @@
 
 namespace Facebook\HackRouter\PatternParser;
 
-use namespace HH\Lib\{Keyset, Str, Vec};
+use namespace HH\Lib\{Str, Vec};
 
 final class PatternNode implements Node {
   public function __construct(private vec<Node> $children) {

diff --git a/src/PatternParser/Token.php b/src/PatternParser/Token.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/PatternParser/TokenType.php b/src/PatternParser/TokenType.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/PatternParser/tokenize.php b/src/PatternParser/tokenize.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/request-parameters/EnumRequestParameter.php b/src/request-parameters/EnumRequestParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/request-parameters/IntRequestParameter.php b/src/request-parameters/IntRequestParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/request-parameters/RequestParameter.php b/src/request-parameters/RequestParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/request-parameters/StringRequestParameter.php b/src/request-parameters/StringRequestParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/request-parameters/TypedRequestParameter.php b/src/request-parameters/TypedRequestParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/request-parameters/TypedUriParameter.php b/src/request-parameters/TypedUriParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/request-parameters/UriParameter.php b/src/request-parameters/UriParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/router/HttpMethod.php b/src/router/HttpMethod.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/router/PrefixMatching/PrefixMap.php b/src/router/PrefixMatching/PrefixMap.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/router/PrefixMatching/PrefixMapOrResponder.php b/src/router/PrefixMatching/PrefixMapOrResponder.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
@@ -10,7 +10,6 @@
 
 namespace Facebook\HackRouter\PrefixMatching;
 
-use namespace Facebook\TypeAssert;
 
 final class PrefixMapOrResponder<T> {
   public function __construct(

diff --git a/src/uri-patterns/GetFastRoutePatternFromUriPattern.php b/src/uri-patterns/GetFastRoutePatternFromUriPattern.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/uri-patterns/GetUriBuilderFromUriPattern.php b/src/uri-patterns/GetUriBuilderFromUriPattern.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/uri-patterns/HasFastRouteFragment.php b/src/uri-patterns/HasFastRouteFragment.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/uri-patterns/HasUriPattern.php b/src/uri-patterns/HasUriPattern.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/uri-patterns/UriBuilder.php b/src/uri-patterns/UriBuilder.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/uri-patterns/UriBuilderBase.php b/src/uri-patterns/UriBuilderBase.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/uri-patterns/UriBuilderGetPath.php b/src/uri-patterns/UriBuilderGetPath.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/uri-patterns/UriBuilderSetters.php b/src/uri-patterns/UriBuilderSetters.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/uri-patterns/UriBuilderWithPath.php b/src/uri-patterns/UriBuilderWithPath.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/uri-patterns/UriPattern.php b/src/uri-patterns/UriPattern.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/uri-patterns/UriPatternLiteral.php b/src/uri-patterns/UriPatternLiteral.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/uri-patterns/UriPatternPart.php b/src/uri-patterns/UriPatternPart.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.

diff --git a/tests/RequestParametersTest.php b/tests/RequestParametersTest.php
@@ -10,8 +10,8 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\Tests\TestIntEnum;
-use \Facebook\HackRouter\Tests\TestStringEnum;
+use type Facebook\HackRouter\Tests\TestIntEnum;
+use type Facebook\HackRouter\Tests\TestStringEnum;
 
 final class RequestParametersTest extends \PHPUnit_Framework_TestCase {
   public function testStringParam(): void {

diff --git a/tests/RouterTest.php b/tests/RouterTest.php
@@ -10,10 +10,10 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\Tests\TestRouter;
-use \Zend\Diactoros\ServerRequest;
+use type Facebook\HackRouter\Tests\TestRouter;
+use type Zend\Diactoros\ServerRequest;
 use function Facebook\FBExpect\expect;
-use namespace HH\Lib\{C, Dict, Str};
+use namespace HH\Lib\Dict;
 
 final class RouterTest extends \PHPUnit_Framework_TestCase {
   const keyset<string> MAP = keyset[
@@ -100,7 +100,7 @@ public function expectedMatchesWithResolvers(
 
   /** @dataProvider getAllResolvers */
   public function testMethodNotAllowedResponses(
-    string $name,
+    string $_name,
     (function(dict<HttpMethod, dict<string, string>>): IResolver<string>) $factory
   ): void {
     $map = dict[
@@ -148,7 +148,7 @@ public function testMatchesPattern(
    * @dataProvider expectedMatchesWithResolvers
    */
   public function testAllResolvers(
-    string $resolver_name,
+    string $_resolver_name,
     IResolver<string> $resolver,
     string $in,
     string $expected_responder,

diff --git a/tests/UriBuilderTest.php b/tests/UriBuilderTest.php
@@ -10,8 +10,8 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\Tests\TestIntEnum;
-use \Facebook\HackRouter\Tests\TestStringEnum;
+use type Facebook\HackRouter\Tests\TestIntEnum;
+use type Facebook\HackRouter\Tests\TestStringEnum;
 
 final class UriBuilderTest extends \PHPUnit_Framework_TestCase {
   public function testLiteral(): void {

diff --git a/tests/UriPatternTest.php b/tests/UriPatternTest.php
@@ -10,8 +10,8 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\Tests\TestStringEnum;
-use \Facebook\HackRouter\Tests\TestIntEnum;
+use type Facebook\HackRouter\Tests\TestStringEnum;
+use type Facebook\HackRouter\Tests\TestIntEnum;
 
 final class UriPatternTest extends \PHPUnit_Framework_TestCase {
   public function testLiteral(): void {