Merge pull request #26 from nazg-hack/feature/patch3.27

Feature/patch3.27

Author: ytake

.travis.yml

@@ -4,8 +4,8 @@ services:
  - docker
 env:
   matrix:
-   - HHVM_VERSION=3.25.3
    - HHVM_VERSION=3.26.0
+   - HHVM_VERSION=3.27.0
    - HHVM_VERSION=latest
 install:
  - docker pull hhvm/hhvm:$HHVM_VERSION

composer.json

@@ -21,16 +21,16 @@
   ],
   "require": {
     "php": ">=7.0",
-    "hhvm": ">=3.25.0",
+    "hhvm": ">=3.26.0",
     "ext-asio": "*",
     "hhvm/hhvm-autoload": "^1.6",
-    "hhvm/type-assert": "^3.2.1",
+    "hhvm/type-assert": "^3.2.2",
     "hack-psr/psr7-http-message-hhi": "^1.0.0",
-    "ytake/hh-container": "^0.5.2",
-    "ytake/hh-config-aggregator": "^0.1.5",
-    "nazg/heredity": "^0.3.2",
-    "nazg/hcache": "^0.1.2",
-    "facebook/hack-router": "^0.13",
+    "ytake/hh-container": "^1.0.2",
+    "ytake/hh-config-aggregator": "^0.1.7",
+    "nazg/heredity": "^0.3.3",
+    "nazg/hcache": "^0.1.4",
+    "facebook/hack-router": "^0.14",
     "zendframework/zend-diactoros": "^1.7.0",
     "monolog/monolog": "^1.23.0",
     "libreworks/psr3-log-hhi": "^1.0.1",
@@ -40,8 +40,8 @@
   "require-dev": {
     "phpunit/phpunit": "^5.7",
     "91carriage/phpunit-hhi": "^5.7",
-    "facebook/fbexpect": "^0.4.0",
-    "hhvm/hhast": "^1.0.1"
+    "facebook/fbexpect": "^2.0.0",
+    "hhvm/hhast": "^1.0.1|>=3.26.0"
   },
   "autoload": {
     "psr-4": {

hhast-lint.json

@@ -1,7 +1,9 @@
 {
-    "roots": [
-      "src/",
-      "tests/"
-    ]
+  "roots": [
+    "src/",
+    "tests/"
+  ],
+  "namespaceAliases": {
+    "HHAST": "Facebook\\HHAST\\Linters"
   }
-  
+}

src/Cache/CacheConfiguration.php

@@ -17,13 +17,15 @@
  */
 namespace Nazg\Cache;
 
-use Redis;
-use Memcached;
-use Nazg\Cache\Resolver\{
+use type Redis;
+use type Memcached;
+use   type Nazg\Cache\Resolver\{
   MemcachedResolver,
   RedisResolver
 };
 
+use function is_null;
+
 type MemcachedServer = shape(
   'host' => string,
   'port' => int,
@@ -57,22 +59,22 @@ public function __construct(
   ) {}
 
   public function getMemcached(): ?Memcached {
-    if(!\is_null($this->memcachedConfig)) {
+    if(!is_null($this->memcachedConfig)) {
       $resolver = new MemcachedResolver($this->memcachedConfig);
       return $resolver->provide();
     }
     return null;
   }
 
   public function getFileSystemDir(): ?string {
-    if(!\is_null($this->filesystemConfig)) {
+    if(!is_null($this->filesystemConfig)) {
       return Shapes::idx($this->filesystemConfig, 'cacheStoreDir');
     }
     return null;
   }
 
   public function getRedis(): ?Redis {
-    if(!\is_null($this->redisConfig)) {
+    if(!is_null($this->redisConfig)) {
       $resolver = new RedisResolver($this->redisConfig);
       return $resolver->provide();
     }

src/Cache/CacheServiceModule.php

@@ -17,21 +17,16 @@
  */
 namespace Nazg\Cache;
 
-use Memcached;
-use Redis;
-use Nazg\Cache\CacheConfiguration;
-use Nazg\HCache\CacheManager;
-use Nazg\HCache\CacheProvider;
-use Nazg\HCache\Driver\{
-    MapCache,
+use type Nazg\Cache\CacheConfiguration;
+use type Nazg\HCache\CacheManager;
+use type Nazg\HCache\CacheProvider;
+use     type Nazg\HCache\Driver\{
     FileSystemCache,
-    ApcCache,
     MemcachedCache,
     RedisCache,
-    VoidCache
 };
-use Ytake\HHContainer\ServiceModule;
-use Ytake\HHContainer\FactoryContainer;
+use type Ytake\HHContainer\ServiceModule;
+use type Ytake\HHContainer\FactoryContainer;
 
 abstract class CacheServiceModule extends ServiceModule {
 
@@ -66,7 +61,7 @@ abstract protected function cacheConfigure(
   ): CacheConfiguration;
 
   protected function detectCacheProvider(
-    ?CacheProvider $provider, 
+    ?CacheProvider $provider,
     CacheConfiguration $cacheConfigure
   ): CacheProvider {
     invariant($provider instanceof CacheProvider, "provider type error");

src/Cache/Resolver/MemcachedResolver.php

@@ -17,11 +17,13 @@
  */
 namespace Nazg\Cache\Resolver;
 
-use Memcached;
-use Nazg\Cache\MemcachedConfig;
+use type Memcached;
+use type Nazg\Cache\MemcachedConfig;
+
+use function is_null;
 
 class MemcachedResolver {
-  
+
   const type T = Memcached;
 
   public function __construct(
@@ -32,7 +34,7 @@ public function provide(): this::T {
     $config = $this->config;
     $m = new Memcached(Shapes::idx($config, 'persistentId'));
     $servers = Shapes::idx($config, 'servers');
-    if(!\is_null($servers)) {
+    if(!is_null($servers)) {
       $m->addServers($servers->toArray());
     }
     return $m;

src/Cache/Resolver/RedisResolver.php

@@ -17,11 +17,11 @@
  */
 namespace Nazg\Cache\Resolver;
 
-use Redis;
-use Nazg\Cache\RedisConfig;
+use type Redis;
+use type Nazg\Cache\RedisConfig;
 
 class RedisResolver {
-  
+
   const type T = Redis;
 
   public function __construct(
@@ -50,7 +50,7 @@ public function provide(): this::T {
     $this->redisConnectOption($redis, $config);
     return $redis;
   }
-  
+
   protected function redisConnectOption(Redis $redis, RedisConfig $config): void {
     $password = Shapes::idx($config, 'password', null);
     if (!\is_null($password)) {

src/Foundation/Application.php

@@ -17,20 +17,22 @@
  */
 namespace Nazg\Foundation;
 
-use Facebook\HackRouter\BaseRouter;
-use Nazg\Http\HttpMethod;
-use Nazg\Heredity\Heredity;
-use Nazg\Heredity\{MiddlewareStack, PsrContainerResolver};
-use Nazg\Response\Emitter;
-use Nazg\RequestHandler\FallbackHandler;
-use Nazg\Foundation\Middleware\Dispatcher;
-use Nazg\Foundation\Bootstrap\BootstrapRegister;
-use Nazg\Foundation\Dependency\DependencyInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Container\ContainerInterface;
+use type Facebook\HackRouter\BaseRouter;
+use type Nazg\Heredity\Heredity;
+use type Nazg\Heredity\{MiddlewareStack, PsrContainerResolver};
+use type Nazg\Response\Emitter;
+use type Nazg\RequestHandler\FallbackHandler;
+use type Nazg\Foundation\Middleware\Dispatcher;
+use type Nazg\Foundation\Bootstrap\BootstrapRegister;
+use type Nazg\Foundation\Dependency\DependencyInterface;
+use type Psr\Http\Server\RequestHandlerInterface;
+use type Psr\Http\Message\ServerRequestInterface;
+use type Psr\Http\Message\ResponseInterface;
+use type Psr\Container\ContainerInterface;
+
+use function get_class;
+use function is_array;
+use function array_key_exists;
 
 class Application {
 
@@ -52,7 +54,7 @@ public function run(ServerRequestInterface $serverRequest): void {
     invariant(
       $router instanceof BaseRouter,
       "%s class must extend %s",
-      \get_class($router),
+      get_class($router),
       BaseRouter::class,
     );
     list($middleware, $attributes) =
@@ -63,7 +65,7 @@ public function run(ServerRequestInterface $serverRequest): void {
       }
     }
     $heredity = $this->middlewareProcessor(
-      $middleware['middleware'], 
+      $middleware['middleware'],
       $container
     );
     $this->send(
@@ -127,8 +129,8 @@ protected function middleware(): ImmVector<\Nazg\Types\TMiddlewareClass> {
   }
 
   private function registerDependencies(mixed $config): void {
-    if (\is_array($config)) {
-      if (\array_key_exists(Service::MODULES, $config)) {
+    if (is_array($config)) {
+      if (array_key_exists(Service::MODULES, $config)) {
         if ($this->dependency instanceof \Nazg\Foundation\Dependency\Dependency) {
           $vModule = $config[Service::MODULES];
           if ($vModule instanceof ImmVector) {
@@ -140,8 +142,8 @@ private function registerDependencies(mixed $config): void {
   }
 
   private function registerMiddlewares(mixed $config): void {
-    if (\is_array($config)) {
-      if (\array_key_exists(Service::MIDDLEWARES, $config)) {
+    if (is_array($config)) {
+      if (array_key_exists(Service::MIDDLEWARES, $config)) {
         if ($config[Service::MIDDLEWARES] instanceof ImmVector) {
           $this->im = $config[Service::MIDDLEWARES];
         }

src/Foundation/Bootstrap/BootstrapRegister.php

@@ -17,7 +17,7 @@
  */
 namespace Nazg\Foundation\Bootstrap;
 
-use Psr\Container\ContainerInterface;
+use type Psr\Container\ContainerInterface;
 
 type Bootstrap = classname<BootstrapRegisterInterface>;
 

src/Foundation/Bootstrap/BootstrapRegisterInterface.php

@@ -17,7 +17,6 @@
  */
 namespace Nazg\Foundation\Bootstrap;
 
-use Nazg\Exceptions\ExceptionHandleInterface;
 
 interface BootstrapRegisterInterface {