Adapt to the latest version of Hyperf (#87)

Author: huangdijia

.gitignore

@@ -12,3 +12,4 @@ vendor/
 .phpunit*
 *.cache
 composer.lock
+.vscode/

.php-cs-fixer.php

@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  [email protected]
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
 $header = <<<'EOF'
 This file is part of Hyperf.
 
@@ -23,13 +32,18 @@
             'location' => 'after_declare_strict',
         ],
         'array_syntax' => [
-            'syntax' => 'short'
+            'syntax' => 'short',
         ],
         'list_syntax' => [
-            'syntax' => 'short'
+            'syntax' => 'short',
         ],
         'concat_space' => [
-            'spacing' => 'one'
+            'spacing' => 'one',
+        ],
+        'global_namespace_import' => [
+            'import_classes' => true,
+            'import_constants' => true,
+            'import_functions' => null,
         ],
         'blank_line_before_statement' => [
             'statements' => [
@@ -38,7 +52,7 @@
         ],
         'general_phpdoc_annotation_remove' => [
             'annotations' => [
-                'author'
+                'author',
             ],
         ],
         'ordered_imports' => [

app/Listener/DbQueryExecutedListener.php

@@ -11,11 +11,11 @@
  */
 namespace App\Listener;
 
+use Hyperf\Collection\Arr;
 use Hyperf\Database\Events\QueryExecuted;
 use Hyperf\Event\Annotation\Listener;
 use Hyperf\Event\Contract\ListenerInterface;
 use Hyperf\Logger\LoggerFactory;
-use Hyperf\Utils\Arr;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 

config/autoload/cache.php

@@ -12,7 +12,7 @@
 return [
     'default' => [
         'driver' => Hyperf\Cache\Driver\RedisDriver::class,
-        'packer' => Hyperf\Utils\Packer\PhpSerializerPacker::class,
+        'packer' => Hyperf\Codec\Packer\PhpSerializerPacker::class,
         'prefix' => 'c:',
     ],
 ];

config/autoload/databases.php

@@ -9,6 +9,8 @@
  * @contact  [email protected]
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+use function Hyperf\Support\env;
+
 return [
     'default' => [
         'driver' => env('DB_DRIVER', 'mysql'),

config/config.php

@@ -12,6 +12,8 @@
 use Hyperf\Contract\StdoutLoggerInterface;
 use Psr\Log\LogLevel;
 
+use function Hyperf\Support\env;
+
 return [
     'app_name' => env('APP_NAME', 'skeleton'),
     'app_env' => env('APP_ENV', 'dev'),

config/container.php

@@ -12,9 +12,9 @@
  * @contact  [email protected]
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+use Hyperf\Context\ApplicationContext;
 use Hyperf\Di\Container;
 use Hyperf\Di\Definition\DefinitionSourceFactory;
-use Hyperf\Utils\ApplicationContext;
 
 $container = new Container((new DefinitionSourceFactory())());
 

installer/OptionalPackages.php

@@ -20,6 +20,7 @@
 use Composer\Package\RootPackageInterface;
 use Composer\Package\Version\VersionParser;
 use FilesystemIterator;
+use InvalidArgumentException;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 
@@ -128,7 +129,7 @@ public function installHyperfScript()
             implode('', $ask),
             function ($value) {
                 if ($value === 'y' || $value === 'yes') {
-                    throw new \InvalidArgumentException('You should type a time zone name, like Asia/Shanghai. Or type n to skip.');
+                    throw new InvalidArgumentException('You should type a time zone name, like Asia/Shanghai. Or type n to skip.');
                 }
 
                 return trim($value);

installer/resources/config_center/config_etcd.php

@@ -18,7 +18,7 @@
     'drivers' => [
         'etcd' => [
             'driver' => Hyperf\ConfigEtcd\EtcdDriver::class,
-            'packer' => Hyperf\Utils\Packer\JsonPacker::class,
+            'packer' => Hyperf\Codec\Packer\JsonPacker::class,
             'namespaces' => [
                 '/application',
             ],