diff --git a/.php_cs b/.php_cs index cba99a01d..4f364e6ce 100644 --- a/.php_cs +++ b/.php_cs @@ -81,6 +81,7 @@ return PhpCsFixer\Config::create() ]) ->setFinder( PhpCsFixer\Finder::create() + ->exclude('bin') ->exclude('public') ->exclude('runtime') ->exclude('vendor') diff --git a/CHANGELOG.md b/CHANGELOG.md index ac2ed1d06..5537e72a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,23 @@ -# v1.1.26 - TBD +# v1.1.27 - TBD + +# v1.1.26 - 2020-04-16 + +## Added + +- [#1578](https://github.com/hyperf/hyperf/pull/1578) Support `getStream` method in `UploadedFile.php`. ## Fixed -- [#1563](https://github.com/hyperf/hyperf/pull/1563) Fixed crontab's `onOneServer` option not resetting mutex on shutdown +- [#1563](https://github.com/hyperf/hyperf/pull/1563) Fixed crontab's `onOneServer` option not resetting mutex on shutdown. +- [#1565](https://github.com/hyperf/hyperf/pull/1565) Reset transaction level to zero, when reconnent to mysql server. +- [#1572](https://github.com/hyperf/hyperf/pull/1572) Fixed parent class does not exists in `Hyperf\GrpcServer\CoreMiddleware`. +- [#1577](https://github.com/hyperf/hyperf/pull/1577) Fixed `describe:routes` command's `server` option not take effect. +- [#1579](https://github.com/hyperf/hyperf/pull/1579) Fixed `migrate:refresh` command's `step` is int. + +## Changed + +- [#1560](https://github.com/hyperf/hyperf/pull/1560) Changed functions of file to `filesystem` for `FileSystemDriver` in `hyperf/cache`. +- [#1568](https://github.com/hyperf/hyperf/pull/1568) Changed `\Redis` to `RedisProxy` for `RedisDriver` in `async-queue`. # v1.1.25 - 2020-04-09 diff --git a/bootstrap.php b/bootstrap.php index 50de85d88..4b5da9186 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - ! defined('BASE_PATH') && define('BASE_PATH', __DIR__); ! defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', SWOOLE_HOOK_ALL); diff --git a/doc/zh-cn/async-queue.md b/doc/zh-cn/async-queue.md index ac5b8e5a7..dd232e626 100644 --- a/doc/zh-cn/async-queue.md +++ b/doc/zh-cn/async-queue.md @@ -18,6 +18,7 @@ composer require hyperf/async-queue |:----------------:|:---------:|:-------------------------------------------:|:---------------------------------------:| | driver | string | Hyperf\AsyncQueue\Driver\RedisDriver::class | 无 | | channel | string | queue | 队列前缀 | +| redis.pool | string | default | redis连接池 | | timeout | int | 2 | pop 消息的超时时间 | | retry_seconds | int,array | 5 | 失败后重新尝试间隔 | | handle_timeout | int | 10 | 消息处理超时时间 | @@ -31,6 +32,9 @@ composer require hyperf/async-queue return [ 'default' => [ 'driver' => Hyperf\AsyncQueue\Driver\RedisDriver::class, + 'redis' => [ + 'pool' => 'default' + ], 'channel' => 'queue', 'timeout' => 2, 'retry_seconds' => 5, diff --git a/doc/zh-cn/changelog.md b/doc/zh-cn/changelog.md index 79297f966..ed45956ab 100644 --- a/doc/zh-cn/changelog.md +++ b/doc/zh-cn/changelog.md @@ -1,5 +1,24 @@ # 版本更新记录 +# v1.1.26 - 2020-04-16 + +## Added + +- [#1578](https://github.com/hyperf/hyperf/pull/1578) `UploadedFile` 支持 `getStream` 方法。 + +## Fixed + +- [#1563](https://github.com/hyperf/hyperf/pull/1563) 修复服务关停后，定时器的 `onOneServer` 配置不会被重置。 +- [#1565](https://github.com/hyperf/hyperf/pull/1565) 当 `DB` 组件重连 `Mysql` 时，重置事务等级为 0。 +- [#1572](https://github.com/hyperf/hyperf/pull/1572) 修复 `Hyperf\GrpcServer\CoreMiddleware` 中，自定义类的父类找不到时报错的BUG。 +- [#1577](https://github.com/hyperf/hyperf/pull/1577) 修复 `describe:routes` 脚本 `server` 配置不生效的BUG。 +- [#1579](https://github.com/hyperf/hyperf/pull/1579) 修复 `migrate:refresh` 脚本 `step` 参数不为 `int` 时会报错的BUG。 + +## Changed + +- [#1560](https://github.com/hyperf/hyperf/pull/1560) 修改 `hyperf/cache` 组件文件缓存引擎中 原生的文件操作为 `Filesystem`。 +- [#1568](https://github.com/hyperf/hyperf/pull/1568) 修改 `hyperf/async-queue` 组件 `Redis` 引擎中的 `\Redis` 为 `RedisProxy`。 + # v1.1.25 - 2020-04-09 ## Fixed diff --git a/doc/zh-cn/filesystem.md b/doc/zh-cn/filesystem.md index b47bd7013..9bae2b381 100644 --- a/doc/zh-cn/filesystem.md +++ b/doc/zh-cn/filesystem.md @@ -101,6 +101,23 @@ class IndexController } ``` +### 配置静态资源 + +如果您希望通过 http 访问上传到本地的文件，请在 `config/autoload/server.php` 配置中增加以下配置。 + +``` +return [ + 'settings' => [ + ... + // 将 public 替换为上传目录 + 'document_root' => BASE_PATH . '/public', + 'static_handler_locations' => ['/'], + 'enable_static_handler' => true, + ], +]; + +``` + ## 注意事项 1. S3 存储请确认安装 `hyperf/guzzle` 组件以提供协程化支持。阿里云、七牛云存储请[开启 Curl Hook](/zh-cn/coroutine?id=swoole-runtime-hook-level)来使用协程。因 Curl Hook 的参数支持性问题，请使用 Swoole 4.4.13 以上版本。 @@ -217,4 +234,4 @@ return [ ], ], ]; -``` \ No newline at end of file +``` diff --git a/doc/zh-cn/utils.md b/doc/zh-cn/utils.md index 3bdb8fa46..fc04fb8f7 100644 --- a/doc/zh-cn/utils.md +++ b/doc/zh-cn/utils.md @@ -30,14 +30,17 @@ Hyperf 提供了大量便捷的辅助类，这里会列出一些常用的好用 ```php yield(); //所有OnWorkerStart事件回调完成后唤醒。 +Coroutine::create(function() { + // 所有OnWorkerStart事件回调完成后唤醒 + CoordinatorManager::until(Constants::WORKER_START)->yield(); echo 'worker started'; // 分配资源 - CM::until(C::WORKER_EXIT)->yield(); //所有OnWorkerExit事件回调完成后唤醒。 + // 所有OnWorkerExit事件回调完成后唤醒 + CoordinatorManager::until(Constants::WORKER_EXIT)->yield(); echo 'worker exited'; // 回收资源 }); diff --git a/doc/zh-hk/async-queue.md b/doc/zh-hk/async-queue.md index 81cf35739..13b15a339 100644 --- a/doc/zh-hk/async-queue.md +++ b/doc/zh-hk/async-queue.md @@ -18,6 +18,7 @@ composer require hyperf/async-queue |:----------------:|:---------:|:-------------------------------------------:|:---------------------------------------:| | driver | string | Hyperf\AsyncQueue\Driver\RedisDriver::class | 無 | | channel | string | queue | 隊列前綴 | +| redis.pool | string | default | redis連接池 | | timeout | int | 2 | pop 消息的超時時間 | | retry_seconds | int,array | 5 | 失敗後重新嘗試間隔 | | handle_timeout | int | 10 | 消息處理超時時間 | @@ -31,6 +32,9 @@ composer require hyperf/async-queue return [ 'default' => [ 'driver' => Hyperf\AsyncQueue\Driver\RedisDriver::class, + 'redis' => [ + 'pool' => 'default' + ], 'channel' => 'queue', 'timeout' => 2, 'retry_seconds' => 5, diff --git a/doc/zh-hk/changelog.md b/doc/zh-hk/changelog.md index 9d95bc74c..1bf717c89 100644 --- a/doc/zh-hk/changelog.md +++ b/doc/zh-hk/changelog.md @@ -1,5 +1,24 @@ # 版本更新記錄 +# v1.1.26 - 2020-04-16 + +## Added + +- [#1578](https://github.com/hyperf/hyperf/pull/1578) `UploadedFile` 支持 `getStream` 方法。 + +## Fixed + +- [#1563](https://github.com/hyperf/hyperf/pull/1563) 修復服務關停後，定時器的 `onOneServer` 配置不會被重置。 +- [#1565](https://github.com/hyperf/hyperf/pull/1565) 當 `DB` 組件重連 `Mysql` 時，重置事務等級為 0。 +- [#1572](https://github.com/hyperf/hyperf/pull/1572) 修復 `Hyperf\GrpcServer\CoreMiddleware` 中，自定義類的父類找不到時報錯的BUG。 +- [#1577](https://github.com/hyperf/hyperf/pull/1577) 修復 `describe:routes` 腳本 `server` 配置不生效的BUG。 +- [#1579](https://github.com/hyperf/hyperf/pull/1579) 修復 `migrate:refresh` 腳本 `step` 參數不為 `int` 時會報錯的BUG。 + +## Changed + +- [#1560](https://github.com/hyperf/hyperf/pull/1560) 修改 `hyperf/cache` 組件文件緩存引擎中 原生的文件操作為 `Filesystem`。 +- [#1568](https://github.com/hyperf/hyperf/pull/1568) 修改 `hyperf/async-queue` 組件 `Redis` 引擎中的 `\Redis` 為 `RedisProxy`。 + # v1.1.25 - 2020-04-09 ## Fixed diff --git a/doc/zh-hk/filesystem.md b/doc/zh-hk/filesystem.md index 161fa5892..a0b951c05 100644 --- a/doc/zh-hk/filesystem.md +++ b/doc/zh-hk/filesystem.md @@ -101,6 +101,23 @@ class IndexController } ``` +### 配置靜態資源 + +如果您希望通過 http 訪問上傳到本地的文件，請在 `config/autoload/server.php` 配置中增加以下配置。 + +``` +return [ + 'settings' => [ + ... + // 將 public 替換為上傳目錄 + 'document_root' => BASE_PATH . '/public', + 'static_handler_locations' => ['/'], + 'enable_static_handler' => true, + ], +]; + +``` + ## 注意事項 1. S3 存儲請確認安裝 `hyperf/guzzle` 組件以提供協程化支持。阿里雲、七牛雲存儲請[開啟 Curl Hook](/zh-cn/coroutine?id=swoole-runtime-hook-level)來使用協程。因 Curl Hook 的參數支持性問題，請使用 Swoole 4.4.13 以上版本。 @@ -217,4 +234,4 @@ return [ ], ], ]; -``` \ No newline at end of file +``` diff --git a/doc/zh-hk/utils.md b/doc/zh-hk/utils.md index 667345ed8..b9c087837 100644 --- a/doc/zh-hk/utils.md +++ b/doc/zh-hk/utils.md @@ -23,3 +23,25 @@ Hyperf 提供了大量便捷的輔助類，這裏會列出一些常用的好用 ### Hyperf\Utils\Context 用於處理協程上下文，本質上是對 `Swoole\Coroutine::getContext()` 方法的一個封裝，但區別在於這裏兼容了非協程環境下的運行。 + +### Hyperf\Utils\Coordinator\CoordinatorManager + +該輔助類用於指揮協程等待事件發生。 + +```php +yield(); + echo 'worker started'; + // 分配資源 + // 所有OnWorkerExit事件回調完成後喚醒 + CoordinatorManager::until(Constants::WORKER_EXIT)->yield(); + echo 'worker exited'; + // 回收資源 +}); +``` diff --git a/doc/zh-tw/async-queue.md b/doc/zh-tw/async-queue.md index 81d0e6a92..6aea885c0 100644 --- a/doc/zh-tw/async-queue.md +++ b/doc/zh-tw/async-queue.md @@ -18,6 +18,7 @@ composer require hyperf/async-queue |:----------------:|:---------:|:-------------------------------------------:|:---------------------------------------:| | driver | string | Hyperf\AsyncQueue\Driver\RedisDriver::class | 無 | | channel | string | queue | 佇列字首 | +| redis.pool | string | default | redis連線池 | | timeout | int | 2 | pop 訊息的超時時間 | | retry_seconds | int,array | 5 | 失敗後重新嘗試間隔 | | handle_timeout | int | 10 | 訊息處理超時時間 | @@ -31,6 +32,9 @@ composer require hyperf/async-queue return [ 'default' => [ 'driver' => Hyperf\AsyncQueue\Driver\RedisDriver::class, + 'redis' => [ + 'pool' => 'default' + ], 'channel' => 'queue', 'timeout' => 2, 'retry_seconds' => 5, diff --git a/doc/zh-tw/changelog.md b/doc/zh-tw/changelog.md index fc3b19773..27c91d68e 100644 --- a/doc/zh-tw/changelog.md +++ b/doc/zh-tw/changelog.md @@ -1,5 +1,24 @@ # 版本更新記錄 +# v1.1.26 - 2020-04-16 + +## Added + +- [#1578](https://github.com/hyperf/hyperf/pull/1578) `UploadedFile` 支援 `getStream` 方法。 + +## Fixed + +- [#1563](https://github.com/hyperf/hyperf/pull/1563) 修復服務關停後，定時器的 `onOneServer` 配置不會被重置。 +- [#1565](https://github.com/hyperf/hyperf/pull/1565) 當 `DB` 元件重連 `Mysql` 時，重置事務等級為 0。 +- [#1572](https://github.com/hyperf/hyperf/pull/1572) 修復 `Hyperf\GrpcServer\CoreMiddleware` 中，自定義類的父類找不到時報錯的BUG。 +- [#1577](https://github.com/hyperf/hyperf/pull/1577) 修復 `describe:routes` 指令碼 `server` 配置不生效的BUG。 +- [#1579](https://github.com/hyperf/hyperf/pull/1579) 修復 `migrate:refresh` 指令碼 `step` 引數不為 `int` 時會報錯的BUG。 + +## Changed + +- [#1560](https://github.com/hyperf/hyperf/pull/1560) 修改 `hyperf/cache` 元件檔案快取引擎中 原生的檔案操作為 `Filesystem`。 +- [#1568](https://github.com/hyperf/hyperf/pull/1568) 修改 `hyperf/async-queue` 元件 `Redis` 引擎中的 `\Redis` 為 `RedisProxy`。 + # v1.1.25 - 2020-04-09 ## Fixed diff --git a/doc/zh-tw/filesystem.md b/doc/zh-tw/filesystem.md index aeff455ec..e9c118358 100644 --- a/doc/zh-tw/filesystem.md +++ b/doc/zh-tw/filesystem.md @@ -101,6 +101,23 @@ class IndexController } ``` +### 配置靜態資源 + +如果您希望通過 http 訪問上傳到本地的檔案，請在 `config/autoload/server.php` 配置中增加以下配置。 + +``` +return [ + 'settings' => [ + ... + // 將 public 替換為上傳目錄 + 'document_root' => BASE_PATH . '/public', + 'static_handler_locations' => ['/'], + 'enable_static_handler' => true, + ], +]; + +``` + ## 注意事項 1. S3 儲存請確認安裝 `hyperf/guzzle` 元件以提供協程化支援。阿里雲、七牛雲端儲存請[開啟 Curl Hook](/zh-cn/coroutine?id=swoole-runtime-hook-level)來使用協程。因 Curl Hook 的引數支援性問題，請使用 Swoole 4.4.13 以上版本。 @@ -217,4 +234,4 @@ return [ ], ], ]; -``` \ No newline at end of file +``` diff --git a/doc/zh-tw/utils.md b/doc/zh-tw/utils.md index b2b9c1c38..a9dc6ea69 100644 --- a/doc/zh-tw/utils.md +++ b/doc/zh-tw/utils.md @@ -23,3 +23,25 @@ Hyperf 提供了大量便捷的輔助類，這裡會列出一些常用的好用 ### Hyperf\Utils\Context 用於處理協程上下文，本質上是對 `Swoole\Coroutine::getContext()` 方法的一個封裝，但區別在於這裡相容了非協程環境下的執行。 + +### Hyperf\Utils\Coordinator\CoordinatorManager + +該輔助類用於指揮協程等待事件發生。 + +```php +yield(); + echo 'worker started'; + // 分配資源 + // 所有OnWorkerExit事件回撥完成後喚醒 + CoordinatorManager::until(Constants::WORKER_EXIT)->yield(); + echo 'worker exited'; + // 回收資源 +}); +``` diff --git a/src/amqp/publish/amqp.php b/src/amqp/publish/amqp.php index 8cd5527be..dd5bc8c06 100644 --- a/src/amqp/publish/amqp.php +++ b/src/amqp/publish/amqp.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'default' => [ 'host' => env('AMQP_HOST', 'localhost'), diff --git a/src/amqp/src/Annotation/Consumer.php b/src/amqp/src/Annotation/Consumer.php index ddb2f0c69..805cd872e 100644 --- a/src/amqp/src/Annotation/Consumer.php +++ b/src/amqp/src/Annotation/Consumer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/amqp/src/Annotation/Producer.php b/src/amqp/src/Annotation/Producer.php index b8ccf140b..a22925afc 100644 --- a/src/amqp/src/Annotation/Producer.php +++ b/src/amqp/src/Annotation/Producer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/amqp/src/Builder.php b/src/amqp/src/Builder.php index d8f23d619..b5204460f 100644 --- a/src/amqp/src/Builder.php +++ b/src/amqp/src/Builder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp; use Hyperf\Amqp\Message\MessageInterface; diff --git a/src/amqp/src/Builder/Builder.php b/src/amqp/src/Builder/Builder.php index 8aa617e94..d44767416 100644 --- a/src/amqp/src/Builder/Builder.php +++ b/src/amqp/src/Builder/Builder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Builder; use PhpAmqpLib\Wire\AMQPTable; diff --git a/src/amqp/src/Builder/ExchangeBuilder.php b/src/amqp/src/Builder/ExchangeBuilder.php index c5105a9d8..90a980f7f 100644 --- a/src/amqp/src/Builder/ExchangeBuilder.php +++ b/src/amqp/src/Builder/ExchangeBuilder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Builder; class ExchangeBuilder extends Builder diff --git a/src/amqp/src/Builder/QueueBuilder.php b/src/amqp/src/Builder/QueueBuilder.php index b4c9514fc..737cae261 100644 --- a/src/amqp/src/Builder/QueueBuilder.php +++ b/src/amqp/src/Builder/QueueBuilder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Builder; class QueueBuilder extends Builder diff --git a/src/amqp/src/ConfigProvider.php b/src/amqp/src/ConfigProvider.php index 4379b6154..185d20922 100644 --- a/src/amqp/src/ConfigProvider.php +++ b/src/amqp/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp; use Hyperf\Amqp\Listener\BeforeMainServerStartListener; diff --git a/src/amqp/src/Connection.php b/src/amqp/src/Connection.php index bd5ee49d6..2771ba143 100644 --- a/src/amqp/src/Connection.php +++ b/src/amqp/src/Connection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp; use Hyperf\Amqp\Connection\AMQPSwooleConnection; diff --git a/src/amqp/src/Connection/AMQPSwooleConnection.php b/src/amqp/src/Connection/AMQPSwooleConnection.php index 8a824ae09..c3dfc0b91 100644 --- a/src/amqp/src/Connection/AMQPSwooleConnection.php +++ b/src/amqp/src/Connection/AMQPSwooleConnection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Connection; use PhpAmqpLib\Connection\AbstractConnection; diff --git a/src/amqp/src/Connection/KeepaliveIO.php b/src/amqp/src/Connection/KeepaliveIO.php index 1dacdb1ac..8c5f1d811 100644 --- a/src/amqp/src/Connection/KeepaliveIO.php +++ b/src/amqp/src/Connection/KeepaliveIO.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Connection; use InvalidArgumentException; diff --git a/src/amqp/src/Connection/Socket.php b/src/amqp/src/Connection/Socket.php index 313dcc5db..457ef77a7 100644 --- a/src/amqp/src/Connection/Socket.php +++ b/src/amqp/src/Connection/Socket.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Connection; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/amqp/src/Connection/SwooleIO.php b/src/amqp/src/Connection/SwooleIO.php index a1cb7e128..0d9690d50 100644 --- a/src/amqp/src/Connection/SwooleIO.php +++ b/src/amqp/src/Connection/SwooleIO.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Connection; use InvalidArgumentException; diff --git a/src/amqp/src/Constants.php b/src/amqp/src/Constants.php index 0b7639fbc..b0a3e0881 100644 --- a/src/amqp/src/Constants.php +++ b/src/amqp/src/Constants.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp; class Constants diff --git a/src/amqp/src/Consumer.php b/src/amqp/src/Consumer.php index 45e8b0f45..ce7501744 100644 --- a/src/amqp/src/Consumer.php +++ b/src/amqp/src/Consumer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp; use Hyperf\Amqp\Event\AfterConsume; diff --git a/src/amqp/src/ConsumerFactory.php b/src/amqp/src/ConsumerFactory.php index d98e9a1f5..2d5b75fde 100644 --- a/src/amqp/src/ConsumerFactory.php +++ b/src/amqp/src/ConsumerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp; use Hyperf\Amqp\Pool\PoolFactory; diff --git a/src/amqp/src/ConsumerManager.php b/src/amqp/src/ConsumerManager.php index 801d75a84..7f4da690a 100644 --- a/src/amqp/src/ConsumerManager.php +++ b/src/amqp/src/ConsumerManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp; use Hyperf\Amqp\Annotation\Consumer as ConsumerAnnotation; diff --git a/src/amqp/src/Context.php b/src/amqp/src/Context.php index 2a747c875..fb68a1a20 100644 --- a/src/amqp/src/Context.php +++ b/src/amqp/src/Context.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp; use Hyperf\Contract\ConnectionInterface; diff --git a/src/amqp/src/Event/AfterConsume.php b/src/amqp/src/Event/AfterConsume.php index 669b66fae..66292c0ff 100644 --- a/src/amqp/src/Event/AfterConsume.php +++ b/src/amqp/src/Event/AfterConsume.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Event; use Hyperf\Amqp\Message\ConsumerMessageInterface; diff --git a/src/amqp/src/Event/BeforeConsume.php b/src/amqp/src/Event/BeforeConsume.php index 180677875..76cf3e535 100644 --- a/src/amqp/src/Event/BeforeConsume.php +++ b/src/amqp/src/Event/BeforeConsume.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Event; class BeforeConsume extends ConsumeEvent diff --git a/src/amqp/src/Event/ConsumeEvent.php b/src/amqp/src/Event/ConsumeEvent.php index 3c409993f..a7ede0b22 100644 --- a/src/amqp/src/Event/ConsumeEvent.php +++ b/src/amqp/src/Event/ConsumeEvent.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Event; use Hyperf\Amqp\Message\ConsumerMessageInterface; diff --git a/src/amqp/src/Event/FailToConsume.php b/src/amqp/src/Event/FailToConsume.php index adb3618eb..93138eb1d 100644 --- a/src/amqp/src/Event/FailToConsume.php +++ b/src/amqp/src/Event/FailToConsume.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Event; use Hyperf\Amqp\Message\ConsumerMessageInterface; diff --git a/src/amqp/src/Exception/MessageException.php b/src/amqp/src/Exception/MessageException.php index 0e36fbc19..75740d693 100644 --- a/src/amqp/src/Exception/MessageException.php +++ b/src/amqp/src/Exception/MessageException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Exception; use Exception; diff --git a/src/amqp/src/Listener/BeforeMainServerStartListener.php b/src/amqp/src/Listener/BeforeMainServerStartListener.php index 01feac0a6..7926d70d4 100644 --- a/src/amqp/src/Listener/BeforeMainServerStartListener.php +++ b/src/amqp/src/Listener/BeforeMainServerStartListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Listener; use Hyperf\Amqp\ConsumerManager; diff --git a/src/amqp/src/Listener/MainWorkerStartListener.php b/src/amqp/src/Listener/MainWorkerStartListener.php index 4705f82d7..c407afae3 100644 --- a/src/amqp/src/Listener/MainWorkerStartListener.php +++ b/src/amqp/src/Listener/MainWorkerStartListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Listener; use Doctrine\Instantiator\Instantiator; diff --git a/src/amqp/src/Message/ConsumerMessage.php b/src/amqp/src/Message/ConsumerMessage.php index d72b91bb3..e1253aa0c 100644 --- a/src/amqp/src/Message/ConsumerMessage.php +++ b/src/amqp/src/Message/ConsumerMessage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Message; use Hyperf\Amqp\Builder\QueueBuilder; diff --git a/src/amqp/src/Message/ConsumerMessageInterface.php b/src/amqp/src/Message/ConsumerMessageInterface.php index 500a6d2df..35dfffa7d 100644 --- a/src/amqp/src/Message/ConsumerMessageInterface.php +++ b/src/amqp/src/Message/ConsumerMessageInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Message; use Hyperf\Amqp\Builder\QueueBuilder; diff --git a/src/amqp/src/Message/Message.php b/src/amqp/src/Message/Message.php index 03864a737..15d169f74 100644 --- a/src/amqp/src/Message/Message.php +++ b/src/amqp/src/Message/Message.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Message; use Hyperf\Amqp\Builder\ExchangeBuilder; diff --git a/src/amqp/src/Message/MessageInterface.php b/src/amqp/src/Message/MessageInterface.php index 411d0cbc5..5e1dd71cc 100644 --- a/src/amqp/src/Message/MessageInterface.php +++ b/src/amqp/src/Message/MessageInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Message; use Hyperf\Amqp\Builder\ExchangeBuilder; diff --git a/src/amqp/src/Message/ProducerMessage.php b/src/amqp/src/Message/ProducerMessage.php index 8260b98b8..68f07ab6c 100644 --- a/src/amqp/src/Message/ProducerMessage.php +++ b/src/amqp/src/Message/ProducerMessage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Message; use Hyperf\Amqp\Constants; diff --git a/src/amqp/src/Message/ProducerMessageInterface.php b/src/amqp/src/Message/ProducerMessageInterface.php index 82de82c0a..f1e30c1a4 100644 --- a/src/amqp/src/Message/ProducerMessageInterface.php +++ b/src/amqp/src/Message/ProducerMessageInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Message; interface ProducerMessageInterface extends MessageInterface diff --git a/src/amqp/src/Message/Type.php b/src/amqp/src/Message/Type.php index abbe8baf1..e9c0cab99 100644 --- a/src/amqp/src/Message/Type.php +++ b/src/amqp/src/Message/Type.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Message; class Type diff --git a/src/amqp/src/Packer/Packer.php b/src/amqp/src/Packer/Packer.php index 1c260ac52..09f253828 100644 --- a/src/amqp/src/Packer/Packer.php +++ b/src/amqp/src/Packer/Packer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Packer; use Hyperf\Contract\PackerInterface; diff --git a/src/amqp/src/Params.php b/src/amqp/src/Params.php index 60a7bfdaa..e741d7759 100644 --- a/src/amqp/src/Params.php +++ b/src/amqp/src/Params.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp; class Params diff --git a/src/amqp/src/Pool/AmqpConnectionPool.php b/src/amqp/src/Pool/AmqpConnectionPool.php index e3b1f62b7..00235599c 100644 --- a/src/amqp/src/Pool/AmqpConnectionPool.php +++ b/src/amqp/src/Pool/AmqpConnectionPool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Pool; use Hyperf\Amqp\Connection; diff --git a/src/amqp/src/Pool/Frequency.php b/src/amqp/src/Pool/Frequency.php index 0cbb39c8a..0623e67d7 100644 --- a/src/amqp/src/Pool/Frequency.php +++ b/src/amqp/src/Pool/Frequency.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Pool; use Hyperf\Pool\Frequency as DefaultFrequency; diff --git a/src/amqp/src/Pool/PoolFactory.php b/src/amqp/src/Pool/PoolFactory.php index 867a517ac..a545f58c6 100644 --- a/src/amqp/src/Pool/PoolFactory.php +++ b/src/amqp/src/Pool/PoolFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp\Pool; use Hyperf\Di\Container; diff --git a/src/amqp/src/Producer.php b/src/amqp/src/Producer.php index 2d3bf7fa4..d8e3139c7 100644 --- a/src/amqp/src/Producer.php +++ b/src/amqp/src/Producer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp; use Hyperf\Amqp\Message\ProducerMessageInterface; diff --git a/src/amqp/src/Result.php b/src/amqp/src/Result.php index 8a3f937d5..e23536093 100644 --- a/src/amqp/src/Result.php +++ b/src/amqp/src/Result.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Amqp; class Result diff --git a/src/amqp/tests/ConsumerManagerTest.php b/src/amqp/tests/ConsumerManagerTest.php index 3a66eef60..345c67783 100644 --- a/src/amqp/tests/ConsumerManagerTest.php +++ b/src/amqp/tests/ConsumerManagerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Amqp; use Hyperf\Amqp\Annotation\Consumer; diff --git a/src/amqp/tests/KeepaliveIOTest.php b/src/amqp/tests/KeepaliveIOTest.php index b442fc4ae..4a0a4106b 100644 --- a/src/amqp/tests/KeepaliveIOTest.php +++ b/src/amqp/tests/KeepaliveIOTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Amqp; use Hyperf\Amqp\Connection\KeepaliveIO; diff --git a/src/amqp/tests/Message/ConsumerMessageTest.php b/src/amqp/tests/Message/ConsumerMessageTest.php index 2d54bc158..38dc9c726 100644 --- a/src/amqp/tests/Message/ConsumerMessageTest.php +++ b/src/amqp/tests/Message/ConsumerMessageTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Amqp\Message; use Hyperf\Amqp\Consumer; diff --git a/src/amqp/tests/Message/MessageTest.php b/src/amqp/tests/Message/MessageTest.php index 9177e3c25..6055204bc 100644 --- a/src/amqp/tests/Message/MessageTest.php +++ b/src/amqp/tests/Message/MessageTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Amqp\Message; use HyperfTest\Amqp\Stub\DemoConsumer; diff --git a/src/amqp/tests/ParamsTest.php b/src/amqp/tests/ParamsTest.php index b7f5c2492..6b654b113 100644 --- a/src/amqp/tests/ParamsTest.php +++ b/src/amqp/tests/ParamsTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Amqp; use Hyperf\Amqp\Params; diff --git a/src/amqp/tests/Stub/ContainerStub.php b/src/amqp/tests/Stub/ContainerStub.php index 8957246d3..3b45d5abb 100644 --- a/src/amqp/tests/Stub/ContainerStub.php +++ b/src/amqp/tests/Stub/ContainerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Amqp\Stub; use Hyperf\Amqp\Consumer; diff --git a/src/amqp/tests/Stub/DemoConsumer.php b/src/amqp/tests/Stub/DemoConsumer.php index f72f7e110..6bfc8cd7e 100644 --- a/src/amqp/tests/Stub/DemoConsumer.php +++ b/src/amqp/tests/Stub/DemoConsumer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Amqp\Stub; use Hyperf\Amqp\Message\ConsumerMessage; diff --git a/src/amqp/tests/Stub/DemoProducer.php b/src/amqp/tests/Stub/DemoProducer.php index 72df99954..a78b2216d 100644 --- a/src/amqp/tests/Stub/DemoProducer.php +++ b/src/amqp/tests/Stub/DemoProducer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Amqp\Stub; use Hyperf\Amqp\Message\ProducerMessage; diff --git a/src/amqp/tests/Stub/QosConsumer.php b/src/amqp/tests/Stub/QosConsumer.php index 08935ede8..a2c7a9dc7 100644 --- a/src/amqp/tests/Stub/QosConsumer.php +++ b/src/amqp/tests/Stub/QosConsumer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Amqp\Stub; use Hyperf\Amqp\Message\ConsumerMessage; diff --git a/src/amqp/tests/Stub/SocketStub.php b/src/amqp/tests/Stub/SocketStub.php index 561086518..d98ebdc5d 100644 --- a/src/amqp/tests/Stub/SocketStub.php +++ b/src/amqp/tests/Stub/SocketStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Amqp\Stub; use Hyperf\Amqp\Connection\Socket; diff --git a/src/amqp/tests/Stub/SocketWithoutIOStub.php b/src/amqp/tests/Stub/SocketWithoutIOStub.php index 3fe7a25c8..fde73b54e 100644 --- a/src/amqp/tests/Stub/SocketWithoutIOStub.php +++ b/src/amqp/tests/Stub/SocketWithoutIOStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Amqp\Stub; use Hyperf\Amqp\Connection\Socket; diff --git a/src/async-queue/publish/async_queue.php b/src/async-queue/publish/async_queue.php index d2fc34443..dabfe52f2 100644 --- a/src/async-queue/publish/async_queue.php +++ b/src/async-queue/publish/async_queue.php @@ -9,10 +9,12 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'default' => [ 'driver' => \Hyperf\AsyncQueue\Driver\RedisDriver::class, + 'redis' => [ + 'pool' => 'default', + ], 'channel' => 'queue', 'timeout' => 2, 'retry_seconds' => 5, diff --git a/src/async-queue/src/Annotation/AsyncQueueMessage.php b/src/async-queue/src/Annotation/AsyncQueueMessage.php index 8e9c0d976..54a59bda1 100644 --- a/src/async-queue/src/Annotation/AsyncQueueMessage.php +++ b/src/async-queue/src/Annotation/AsyncQueueMessage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/async-queue/src/AnnotationJob.php b/src/async-queue/src/AnnotationJob.php index 8348d6e54..699d67130 100644 --- a/src/async-queue/src/AnnotationJob.php +++ b/src/async-queue/src/AnnotationJob.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue; use Hyperf\Contract\CompressInterface; diff --git a/src/async-queue/src/Aspect/AsyncQueueAspect.php b/src/async-queue/src/Aspect/AsyncQueueAspect.php index f77d1dae6..b0e55d7c1 100644 --- a/src/async-queue/src/Aspect/AsyncQueueAspect.php +++ b/src/async-queue/src/Aspect/AsyncQueueAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Aspect; use Hyperf\AsyncQueue\Annotation\AsyncQueueMessage; diff --git a/src/async-queue/src/Command/FlushFailedMessageCommand.php b/src/async-queue/src/Command/FlushFailedMessageCommand.php index 47132f8ce..6c8ff43c7 100644 --- a/src/async-queue/src/Command/FlushFailedMessageCommand.php +++ b/src/async-queue/src/Command/FlushFailedMessageCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Command; use Hyperf\AsyncQueue\Driver\DriverFactory; diff --git a/src/async-queue/src/Command/InfoCommand.php b/src/async-queue/src/Command/InfoCommand.php index 2e2581963..290fcb102 100644 --- a/src/async-queue/src/Command/InfoCommand.php +++ b/src/async-queue/src/Command/InfoCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Command; use Hyperf\AsyncQueue\Driver\DriverFactory; diff --git a/src/async-queue/src/Command/ReloadFailedMessageCommand.php b/src/async-queue/src/Command/ReloadFailedMessageCommand.php index bbf33486b..785a5b681 100644 --- a/src/async-queue/src/Command/ReloadFailedMessageCommand.php +++ b/src/async-queue/src/Command/ReloadFailedMessageCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Command; use Hyperf\AsyncQueue\Driver\DriverFactory; diff --git a/src/async-queue/src/ConfigProvider.php b/src/async-queue/src/ConfigProvider.php index 8cf3a0f69..413775218 100644 --- a/src/async-queue/src/ConfigProvider.php +++ b/src/async-queue/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue; class ConfigProvider diff --git a/src/async-queue/src/Driver/ChannelConfig.php b/src/async-queue/src/Driver/ChannelConfig.php index eea855ba6..a49ae22a8 100644 --- a/src/async-queue/src/Driver/ChannelConfig.php +++ b/src/async-queue/src/Driver/ChannelConfig.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Driver; use Hyperf\AsyncQueue\Exception\InvalidQueueException; diff --git a/src/async-queue/src/Driver/Driver.php b/src/async-queue/src/Driver/Driver.php index 6b4bf0e95..d6e360048 100644 --- a/src/async-queue/src/Driver/Driver.php +++ b/src/async-queue/src/Driver/Driver.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Driver; use Hyperf\AsyncQueue\Environment; diff --git a/src/async-queue/src/Driver/DriverFactory.php b/src/async-queue/src/Driver/DriverFactory.php index 8c3e230a7..635d54b52 100644 --- a/src/async-queue/src/Driver/DriverFactory.php +++ b/src/async-queue/src/Driver/DriverFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Driver; use Hyperf\AsyncQueue\Exception\InvalidDriverException; diff --git a/src/async-queue/src/Driver/DriverInterface.php b/src/async-queue/src/Driver/DriverInterface.php index f837d7401..c65d0c4f9 100644 --- a/src/async-queue/src/Driver/DriverInterface.php +++ b/src/async-queue/src/Driver/DriverInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Driver; use Hyperf\AsyncQueue\JobInterface; diff --git a/src/async-queue/src/Driver/RedisDriver.php b/src/async-queue/src/Driver/RedisDriver.php index b252b47df..b87cb5172 100644 --- a/src/async-queue/src/Driver/RedisDriver.php +++ b/src/async-queue/src/Driver/RedisDriver.php @@ -9,15 +9,14 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Driver; use Hyperf\AsyncQueue\Exception\InvalidQueueException; use Hyperf\AsyncQueue\JobInterface; use Hyperf\AsyncQueue\Message; use Hyperf\AsyncQueue\MessageInterface; +use Hyperf\Redis\RedisFactory; use Psr\Container\ContainerInterface; -use Redis; class RedisDriver extends Driver { @@ -53,8 +52,7 @@ class RedisDriver extends Driver { parent::__construct($container, $config); $channel = $config['channel'] ?? 'queue'; - - $this->redis = $container->get(Redis::class); + $this->redis = $container->get(RedisFactory::class)->get($config['redis']['pool'] ?? 'default'); $this->timeout = $config['timeout'] ?? 5; $this->retrySeconds = $config['retry_seconds'] ?? 10; $this->handleTimeout = $config['handle_timeout'] ?? 10; diff --git a/src/async-queue/src/Environment.php b/src/async-queue/src/Environment.php index 846237f78..b2882d6ca 100644 --- a/src/async-queue/src/Environment.php +++ b/src/async-queue/src/Environment.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue; class Environment diff --git a/src/async-queue/src/Event/AfterHandle.php b/src/async-queue/src/Event/AfterHandle.php index 68c57465d..f79b7f3b7 100644 --- a/src/async-queue/src/Event/AfterHandle.php +++ b/src/async-queue/src/Event/AfterHandle.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Event; class AfterHandle extends Event diff --git a/src/async-queue/src/Event/BeforeHandle.php b/src/async-queue/src/Event/BeforeHandle.php index 7205e6a4f..0d6214412 100644 --- a/src/async-queue/src/Event/BeforeHandle.php +++ b/src/async-queue/src/Event/BeforeHandle.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Event; class BeforeHandle extends Event diff --git a/src/async-queue/src/Event/Event.php b/src/async-queue/src/Event/Event.php index 22d866d7e..ac47f8fe6 100644 --- a/src/async-queue/src/Event/Event.php +++ b/src/async-queue/src/Event/Event.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Event; use Hyperf\AsyncQueue\MessageInterface; diff --git a/src/async-queue/src/Event/FailedHandle.php b/src/async-queue/src/Event/FailedHandle.php index 665d30022..4409909e7 100644 --- a/src/async-queue/src/Event/FailedHandle.php +++ b/src/async-queue/src/Event/FailedHandle.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Event; use Hyperf\AsyncQueue\MessageInterface; diff --git a/src/async-queue/src/Event/QueueLength.php b/src/async-queue/src/Event/QueueLength.php index 9b74ea516..d099736e0 100644 --- a/src/async-queue/src/Event/QueueLength.php +++ b/src/async-queue/src/Event/QueueLength.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Event; use Hyperf\AsyncQueue\Driver\DriverInterface; diff --git a/src/async-queue/src/Event/RetryHandle.php b/src/async-queue/src/Event/RetryHandle.php index bf73f8bc8..0a7ee58c7 100644 --- a/src/async-queue/src/Event/RetryHandle.php +++ b/src/async-queue/src/Event/RetryHandle.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Event; use Hyperf\AsyncQueue\MessageInterface; diff --git a/src/async-queue/src/Exception/InvalidDriverException.php b/src/async-queue/src/Exception/InvalidDriverException.php index 52baea5a1..b7438ef7f 100644 --- a/src/async-queue/src/Exception/InvalidDriverException.php +++ b/src/async-queue/src/Exception/InvalidDriverException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Exception; class InvalidDriverException extends \RuntimeException diff --git a/src/async-queue/src/Exception/InvalidPackerException.php b/src/async-queue/src/Exception/InvalidPackerException.php index 4ab4a2434..ce1fd1b9e 100644 --- a/src/async-queue/src/Exception/InvalidPackerException.php +++ b/src/async-queue/src/Exception/InvalidPackerException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Exception; class InvalidPackerException extends \RuntimeException diff --git a/src/async-queue/src/Exception/InvalidQueueException.php b/src/async-queue/src/Exception/InvalidQueueException.php index 03e686326..7c8494c37 100644 --- a/src/async-queue/src/Exception/InvalidQueueException.php +++ b/src/async-queue/src/Exception/InvalidQueueException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Exception; class InvalidQueueException extends \RuntimeException diff --git a/src/async-queue/src/Job.php b/src/async-queue/src/Job.php index b40c3f99d..c7b281ea2 100644 --- a/src/async-queue/src/Job.php +++ b/src/async-queue/src/Job.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue; use Hyperf\Contract\CompressInterface; diff --git a/src/async-queue/src/JobInterface.php b/src/async-queue/src/JobInterface.php index 78296aff1..c898e52ee 100644 --- a/src/async-queue/src/JobInterface.php +++ b/src/async-queue/src/JobInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue; interface JobInterface diff --git a/src/async-queue/src/Listener/QueueLengthListener.php b/src/async-queue/src/Listener/QueueLengthListener.php index fdc8ac47d..ddef4d8db 100644 --- a/src/async-queue/src/Listener/QueueLengthListener.php +++ b/src/async-queue/src/Listener/QueueLengthListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Listener; use Hyperf\AsyncQueue\Event\QueueLength; diff --git a/src/async-queue/src/Message.php b/src/async-queue/src/Message.php index 2091c3175..1f91ce37b 100644 --- a/src/async-queue/src/Message.php +++ b/src/async-queue/src/Message.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue; use Hyperf\Contract\CompressInterface; diff --git a/src/async-queue/src/MessageInterface.php b/src/async-queue/src/MessageInterface.php index 1637860f1..243a9ca96 100644 --- a/src/async-queue/src/MessageInterface.php +++ b/src/async-queue/src/MessageInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue; interface MessageInterface diff --git a/src/async-queue/src/Process/ConsumerProcess.php b/src/async-queue/src/Process/ConsumerProcess.php index 73671012a..ade593cd3 100644 --- a/src/async-queue/src/Process/ConsumerProcess.php +++ b/src/async-queue/src/Process/ConsumerProcess.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\AsyncQueue\Process; use Hyperf\AsyncQueue\Driver\DriverFactory; diff --git a/src/async-queue/tests/AsyncQueueAspectTest.php b/src/async-queue/tests/AsyncQueueAspectTest.php index 3b1e9fef1..167fb5e33 100644 --- a/src/async-queue/tests/AsyncQueueAspectTest.php +++ b/src/async-queue/tests/AsyncQueueAspectTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\AsyncQueue; use Hyperf\AsyncQueue\Annotation\AsyncQueueMessage; diff --git a/src/async-queue/tests/DriverTest.php b/src/async-queue/tests/DriverTest.php index c898dc54e..425b476f4 100644 --- a/src/async-queue/tests/DriverTest.php +++ b/src/async-queue/tests/DriverTest.php @@ -9,11 +9,11 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\AsyncQueue; use Hyperf\AsyncQueue\Driver\ChannelConfig; use Hyperf\Di\Container; +use Hyperf\Redis\RedisFactory; use Hyperf\Utils\ApplicationContext; use Hyperf\Utils\Coroutine\Concurrent; use Hyperf\Utils\Packer\PhpSerializerPacker; @@ -60,6 +60,11 @@ class DriverTest extends TestCase $container->shouldReceive('make')->with(ChannelConfig::class, Mockery::any())->andReturnUsing(function ($class, $args) { return new ChannelConfig($args['channel']); }); + $container->shouldReceive('get')->with(RedisFactory::class)->andReturnUsing(function ($_) { + $factory = Mockery::mock(RedisFactory::class); + $factory->shouldReceive('get')->with('default')->andReturn(new Redis()); + return $factory; + }); ApplicationContext::setContainer($container); diff --git a/src/async-queue/tests/RedisDriverTest.php b/src/async-queue/tests/RedisDriverTest.php index ba43bac31..8df408297 100644 --- a/src/async-queue/tests/RedisDriverTest.php +++ b/src/async-queue/tests/RedisDriverTest.php @@ -9,13 +9,13 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\AsyncQueue; use Hyperf\AsyncQueue\Driver\ChannelConfig; use Hyperf\AsyncQueue\Driver\RedisDriver; use Hyperf\AsyncQueue\Message; use Hyperf\Di\Container; +use Hyperf\Redis\RedisFactory; use Hyperf\Utils\ApplicationContext; use Hyperf\Utils\Context; use Hyperf\Utils\Packer\PhpSerializerPacker; @@ -118,13 +118,18 @@ class RedisDriverTest extends TestCase $container = Mockery::mock(Container::class); $container->shouldReceive('get')->with(PhpSerializerPacker::class)->andReturn($packer); $container->shouldReceive('get')->once()->with(EventDispatcherInterface::class)->andReturn(null); - $container->shouldReceive('get')->once()->with(\Redis::class)->andReturn(new Redis()); + $container->shouldReceive('get')->with(\Redis::class)->andReturn(new Redis()); $container->shouldReceive('make')->with(ChannelConfig::class, Mockery::any())->andReturnUsing(function ($class, $args) { return new ChannelConfig($args['channel']); }); $container->shouldReceive('make')->with(Message::class, Mockery::any())->andReturnUsing(function ($class, $args) { return new Message(...$args); }); + $container->shouldReceive('get')->with(RedisFactory::class)->andReturnUsing(function ($_) { + $factory = Mockery::mock(RedisFactory::class); + $factory->shouldReceive('get')->with('default')->andReturn(new Redis()); + return $factory; + }); ApplicationContext::setContainer($container); diff --git a/src/async-queue/tests/Stub/DemoJob.php b/src/async-queue/tests/Stub/DemoJob.php index 9e6b2469c..4400a7e36 100644 --- a/src/async-queue/tests/Stub/DemoJob.php +++ b/src/async-queue/tests/Stub/DemoJob.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\AsyncQueue\Stub; use Hyperf\AsyncQueue\Job; diff --git a/src/async-queue/tests/Stub/DemoModel.php b/src/async-queue/tests/Stub/DemoModel.php index d56becb47..2fc183d50 100644 --- a/src/async-queue/tests/Stub/DemoModel.php +++ b/src/async-queue/tests/Stub/DemoModel.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\AsyncQueue\Stub; use Hyperf\Contract\CompressInterface; diff --git a/src/async-queue/tests/Stub/DemoModelMeta.php b/src/async-queue/tests/Stub/DemoModelMeta.php index 6e160c40f..5ca24d17a 100644 --- a/src/async-queue/tests/Stub/DemoModelMeta.php +++ b/src/async-queue/tests/Stub/DemoModelMeta.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\AsyncQueue\Stub; use Hyperf\Contract\CompressInterface; diff --git a/src/async-queue/tests/Stub/FooProxy.php b/src/async-queue/tests/Stub/FooProxy.php index 4de871897..dd829b7f0 100644 --- a/src/async-queue/tests/Stub/FooProxy.php +++ b/src/async-queue/tests/Stub/FooProxy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\AsyncQueue\Stub; use Hyperf\AsyncQueue\Annotation\AsyncQueueMessage; diff --git a/src/async-queue/tests/Stub/Redis.php b/src/async-queue/tests/Stub/Redis.php index 7230ae889..dd74e1bc0 100644 --- a/src/async-queue/tests/Stub/Redis.php +++ b/src/async-queue/tests/Stub/Redis.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\AsyncQueue\Stub; use Hyperf\Utils\Context; diff --git a/src/async-queue/tests/Stub/RedisDriverStub.php b/src/async-queue/tests/Stub/RedisDriverStub.php index 184757eb4..a79801fb0 100644 --- a/src/async-queue/tests/Stub/RedisDriverStub.php +++ b/src/async-queue/tests/Stub/RedisDriverStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\AsyncQueue\Stub; use Hyperf\AsyncQueue\Driver\RedisDriver; diff --git a/src/cache/publish/cache.php b/src/cache/publish/cache.php index cd2784a3c..42d7a8a00 100644 --- a/src/cache/publish/cache.php +++ b/src/cache/publish/cache.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'default' => [ 'driver' => Hyperf\Cache\Driver\RedisDriver::class, diff --git a/src/cache/src/Annotation/CacheEvict.php b/src/cache/src/Annotation/CacheEvict.php index 545d3f4dd..fea94ba35 100644 --- a/src/cache/src/Annotation/CacheEvict.php +++ b/src/cache/src/Annotation/CacheEvict.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/cache/src/Annotation/CachePut.php b/src/cache/src/Annotation/CachePut.php index 67d325e23..d861b78eb 100644 --- a/src/cache/src/Annotation/CachePut.php +++ b/src/cache/src/Annotation/CachePut.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/cache/src/Annotation/Cacheable.php b/src/cache/src/Annotation/Cacheable.php index ea8483fa6..42d32199a 100644 --- a/src/cache/src/Annotation/Cacheable.php +++ b/src/cache/src/Annotation/Cacheable.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Annotation; use Hyperf\Cache\CacheListenerCollector; diff --git a/src/cache/src/Annotation/FailCache.php b/src/cache/src/Annotation/FailCache.php index a3fa33dac..bd378344b 100644 --- a/src/cache/src/Annotation/FailCache.php +++ b/src/cache/src/Annotation/FailCache.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Annotation; use Hyperf\Cache\CacheListenerCollector; diff --git a/src/cache/src/AnnotationManager.php b/src/cache/src/AnnotationManager.php index 89a5ebccb..ba0e90dc6 100644 --- a/src/cache/src/AnnotationManager.php +++ b/src/cache/src/AnnotationManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache; use Hyperf\Cache\Annotation\Cacheable; diff --git a/src/cache/src/Aspect/CacheEvictAspect.php b/src/cache/src/Aspect/CacheEvictAspect.php index 79a7eca40..69a72385a 100644 --- a/src/cache/src/Aspect/CacheEvictAspect.php +++ b/src/cache/src/Aspect/CacheEvictAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Aspect; use Hyperf\Cache\Annotation\CacheEvict; diff --git a/src/cache/src/Aspect/CachePutAspect.php b/src/cache/src/Aspect/CachePutAspect.php index a8db92577..45bf07376 100644 --- a/src/cache/src/Aspect/CachePutAspect.php +++ b/src/cache/src/Aspect/CachePutAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Aspect; use Hyperf\Cache\Annotation\CachePut; diff --git a/src/cache/src/Aspect/CacheableAspect.php b/src/cache/src/Aspect/CacheableAspect.php index ed66c5e76..3129ab9ef 100644 --- a/src/cache/src/Aspect/CacheableAspect.php +++ b/src/cache/src/Aspect/CacheableAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Aspect; use Hyperf\Cache\Annotation\Cacheable; diff --git a/src/cache/src/Aspect/FailCacheAspect.php b/src/cache/src/Aspect/FailCacheAspect.php index 55ca82a7c..ffd5fe163 100644 --- a/src/cache/src/Aspect/FailCacheAspect.php +++ b/src/cache/src/Aspect/FailCacheAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Aspect; use Hyperf\Cache\Annotation\FailCache; diff --git a/src/cache/src/Cache.php b/src/cache/src/Cache.php index cac644019..4acc4940f 100644 --- a/src/cache/src/Cache.php +++ b/src/cache/src/Cache.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache; use Psr\SimpleCache\CacheInterface; diff --git a/src/cache/src/CacheListenerCollector.php b/src/cache/src/CacheListenerCollector.php index b28d8c7dd..e9cee117d 100644 --- a/src/cache/src/CacheListenerCollector.php +++ b/src/cache/src/CacheListenerCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache; use Hyperf\Di\MetadataCollector; diff --git a/src/cache/src/CacheManager.php b/src/cache/src/CacheManager.php index c8a499918..20bc39315 100644 --- a/src/cache/src/CacheManager.php +++ b/src/cache/src/CacheManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache; use Hyperf\Cache\Driver\DriverInterface; diff --git a/src/cache/src/Collector/CoroutineMemory.php b/src/cache/src/Collector/CoroutineMemory.php index 47dcb3996..9c456e524 100644 --- a/src/cache/src/Collector/CoroutineMemory.php +++ b/src/cache/src/Collector/CoroutineMemory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Collector; use Hyperf\Utils\Collection; diff --git a/src/cache/src/Collector/CoroutineMemoryKey.php b/src/cache/src/Collector/CoroutineMemoryKey.php index 31b09ef56..b699a3c86 100644 --- a/src/cache/src/Collector/CoroutineMemoryKey.php +++ b/src/cache/src/Collector/CoroutineMemoryKey.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Collector; use Hyperf\Utils\Collection; diff --git a/src/cache/src/Collector/FileStorage.php b/src/cache/src/Collector/FileStorage.php index a27349417..2223555d8 100644 --- a/src/cache/src/Collector/FileStorage.php +++ b/src/cache/src/Collector/FileStorage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Collector; class FileStorage diff --git a/src/cache/src/ConfigProvider.php b/src/cache/src/ConfigProvider.php index e587d8177..7b65c65fb 100644 --- a/src/cache/src/ConfigProvider.php +++ b/src/cache/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache; use Hyperf\Cache\Listener\DeleteListener; diff --git a/src/cache/src/Driver/CoroutineMemoryDriver.php b/src/cache/src/Driver/CoroutineMemoryDriver.php index f39ee0b0b..039d992cb 100644 --- a/src/cache/src/Driver/CoroutineMemoryDriver.php +++ b/src/cache/src/Driver/CoroutineMemoryDriver.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Driver; use Hyperf\Cache\Collector\CoroutineMemory; diff --git a/src/cache/src/Driver/Driver.php b/src/cache/src/Driver/Driver.php index e07fbaea6..88bf32535 100644 --- a/src/cache/src/Driver/Driver.php +++ b/src/cache/src/Driver/Driver.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Driver; use Hyperf\Contract\PackerInterface; diff --git a/src/cache/src/Driver/DriverInterface.php b/src/cache/src/Driver/DriverInterface.php index 4afb36c53..eee95557e 100644 --- a/src/cache/src/Driver/DriverInterface.php +++ b/src/cache/src/Driver/DriverInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Driver; use Psr\Container\ContainerInterface; diff --git a/src/cache/src/Driver/FileSystemDriver.php b/src/cache/src/Driver/FileSystemDriver.php index eeae68394..27639cc4d 100644 --- a/src/cache/src/Driver/FileSystemDriver.php +++ b/src/cache/src/Driver/FileSystemDriver.php @@ -9,12 +9,12 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Driver; use Hyperf\Cache\Collector\FileStorage; use Hyperf\Cache\Exception\CacheException; use Hyperf\Cache\Exception\InvalidArgumentException; +use Hyperf\Utils\Filesystem\Filesystem; use Psr\Container\ContainerInterface; class FileSystemDriver extends Driver @@ -24,6 +24,11 @@ class FileSystemDriver extends Driver */ protected $storePath = BASE_PATH . '/runtime/caches'; + /** + * @var Filesystem + */ + private $filesystem; + public function __construct(ContainerInterface $container, array $config) { parent::__construct($container, $config); @@ -33,6 +38,7 @@ class FileSystemDriver extends Driver throw new CacheException('Has no permission to create cache directory!'); } } + $this->filesystem = $container->get(Filesystem::class); } public function getCacheKey(string $key) @@ -48,7 +54,7 @@ class FileSystemDriver extends Driver } /** @var FileStorage $obj */ - $obj = $this->packer->unpack(file_get_contents($file)); + $obj = $this->packer->unpack($this->filesystem->get($file)); if ($obj->isExpired()) { return $default; } @@ -64,7 +70,7 @@ class FileSystemDriver extends Driver } /** @var FileStorage $obj */ - $obj = $this->packer->unpack(file_get_contents($file)); + $obj = $this->packer->unpack($this->filesystem->get($file)); if ($obj->isExpired()) { return [false, $default]; } @@ -78,7 +84,7 @@ class FileSystemDriver extends Driver $file = $this->getCacheKey($key); $content = $this->packer->pack(new FileStorage($value, $seconds)); - $result = file_put_contents($file, $content, FILE_BINARY); + $result = $this->filesystem->put($file, $content); return (bool) $result; } diff --git a/src/cache/src/Driver/KeyCollectorInterface.php b/src/cache/src/Driver/KeyCollectorInterface.php index 1cf07020c..924857fa9 100644 --- a/src/cache/src/Driver/KeyCollectorInterface.php +++ b/src/cache/src/Driver/KeyCollectorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Driver; interface KeyCollectorInterface diff --git a/src/cache/src/Driver/RedisDriver.php b/src/cache/src/Driver/RedisDriver.php index 2e4d0b7bb..d0cc8b3a8 100644 --- a/src/cache/src/Driver/RedisDriver.php +++ b/src/cache/src/Driver/RedisDriver.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Driver; use Hyperf\Cache\Exception\InvalidArgumentException; diff --git a/src/cache/src/Exception/CacheException.php b/src/cache/src/Exception/CacheException.php index acb29fbb0..de2deab42 100644 --- a/src/cache/src/Exception/CacheException.php +++ b/src/cache/src/Exception/CacheException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Exception; use RuntimeException; diff --git a/src/cache/src/Exception/InvalidArgumentException.php b/src/cache/src/Exception/InvalidArgumentException.php index 425c75361..362ffbd0d 100644 --- a/src/cache/src/Exception/InvalidArgumentException.php +++ b/src/cache/src/Exception/InvalidArgumentException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Exception; class InvalidArgumentException extends CacheException implements \Psr\SimpleCache\InvalidArgumentException diff --git a/src/cache/src/Helper/StringHelper.php b/src/cache/src/Helper/StringHelper.php index f1c600dff..73ac16292 100644 --- a/src/cache/src/Helper/StringHelper.php +++ b/src/cache/src/Helper/StringHelper.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Helper; use Hyperf\Utils\Str; diff --git a/src/cache/src/Listener/DeleteEvent.php b/src/cache/src/Listener/DeleteEvent.php index 63e183aed..fcca2e700 100644 --- a/src/cache/src/Listener/DeleteEvent.php +++ b/src/cache/src/Listener/DeleteEvent.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Listener; class DeleteEvent diff --git a/src/cache/src/Listener/DeleteListener.php b/src/cache/src/Listener/DeleteListener.php index 2da5e79e3..f703c52d4 100644 --- a/src/cache/src/Listener/DeleteListener.php +++ b/src/cache/src/Listener/DeleteListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Listener; use Hyperf\Cache\Annotation\Cacheable; diff --git a/src/cache/src/Listener/DeleteListenerEvent.php b/src/cache/src/Listener/DeleteListenerEvent.php index bd81b6986..b3ccc4536 100644 --- a/src/cache/src/Listener/DeleteListenerEvent.php +++ b/src/cache/src/Listener/DeleteListenerEvent.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Cache\Listener; use Hyperf\Cache\CacheListenerCollector; diff --git a/src/cache/tests/Cases/AnnotationTest.php b/src/cache/tests/Cases/AnnotationTest.php index dd7e08e04..c452b11a5 100644 --- a/src/cache/tests/Cases/AnnotationTest.php +++ b/src/cache/tests/Cases/AnnotationTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Cache\Cases; use Hyperf\Cache\Annotation\Cacheable; diff --git a/src/cache/tests/Cases/CoroutineMemoryDriverTest.php b/src/cache/tests/Cases/CoroutineMemoryDriverTest.php index 9d685d103..921426d70 100644 --- a/src/cache/tests/Cases/CoroutineMemoryDriverTest.php +++ b/src/cache/tests/Cases/CoroutineMemoryDriverTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Cache\Cases; use Hyperf\Cache\Driver\CoroutineMemoryDriver; diff --git a/src/cache/tests/Cases/FileSystemDriverTest.php b/src/cache/tests/Cases/FileSystemDriverTest.php index 47d467282..aaae24a89 100644 --- a/src/cache/tests/Cases/FileSystemDriverTest.php +++ b/src/cache/tests/Cases/FileSystemDriverTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Cache\Cases; use Hyperf\Cache\CacheManager; @@ -18,6 +17,7 @@ use Hyperf\Config\Config; use Hyperf\Contract\StdoutLoggerInterface; use Hyperf\Di\Container; use Hyperf\Utils\ApplicationContext; +use Hyperf\Utils\Filesystem\Filesystem; use Hyperf\Utils\Packer\PhpSerializerPacker; use HyperfTest\Cache\Stub\Foo; use Mockery; @@ -112,6 +112,7 @@ class FileSystemDriverTest extends TestCase $logger->shouldReceive(Mockery::any())->andReturn(null); $container->shouldReceive('get')->with(CacheManager::class)->andReturn(new CacheManager($config, $logger)); + $container->shouldReceive('get')->with(Filesystem::class)->andReturn(new Filesystem()); $container->shouldReceive('make')->with(FileSystemDriver::class, Mockery::any())->andReturnUsing(function ($class, $args) use ($container) { return new FileSystemDriver($container, $args['config']); }); diff --git a/src/cache/tests/Cases/RedisDriverTest.php b/src/cache/tests/Cases/RedisDriverTest.php index 042c42ac4..87c7e7ac3 100644 --- a/src/cache/tests/Cases/RedisDriverTest.php +++ b/src/cache/tests/Cases/RedisDriverTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Cache\Cases; use Hyperf\Cache\CacheManager; diff --git a/src/cache/tests/Cases/StringHelperTest.php b/src/cache/tests/Cases/StringHelperTest.php index 508f9a356..bd60fa32c 100644 --- a/src/cache/tests/Cases/StringHelperTest.php +++ b/src/cache/tests/Cases/StringHelperTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Cache\Cases; use Hyperf\Cache\Helper\StringHelper; diff --git a/src/cache/tests/Stub/Foo.php b/src/cache/tests/Stub/Foo.php index f0aab07c4..3bb1ef61c 100644 --- a/src/cache/tests/Stub/Foo.php +++ b/src/cache/tests/Stub/Foo.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Cache\Stub; class Foo diff --git a/src/circuit-breaker/src/Annotation/CircuitBreaker.php b/src/circuit-breaker/src/Annotation/CircuitBreaker.php index d3a83b8d3..15442e8f2 100644 --- a/src/circuit-breaker/src/Annotation/CircuitBreaker.php +++ b/src/circuit-breaker/src/Annotation/CircuitBreaker.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker\Annotation; use Doctrine\Common\Annotations\Annotation\Target; diff --git a/src/circuit-breaker/src/Aspect/BreakerAnnotationAspect.php b/src/circuit-breaker/src/Aspect/BreakerAnnotationAspect.php index 972085866..fa52f9ece 100644 --- a/src/circuit-breaker/src/Aspect/BreakerAnnotationAspect.php +++ b/src/circuit-breaker/src/Aspect/BreakerAnnotationAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker\Aspect; use Hyperf\CircuitBreaker\Annotation\CircuitBreaker; diff --git a/src/circuit-breaker/src/Attempt.php b/src/circuit-breaker/src/Attempt.php index e0d5da208..85ddb4184 100644 --- a/src/circuit-breaker/src/Attempt.php +++ b/src/circuit-breaker/src/Attempt.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker; class Attempt diff --git a/src/circuit-breaker/src/CircuitBreaker.php b/src/circuit-breaker/src/CircuitBreaker.php index 8b54c5e84..486a7576f 100644 --- a/src/circuit-breaker/src/CircuitBreaker.php +++ b/src/circuit-breaker/src/CircuitBreaker.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker; use Psr\Container\ContainerInterface; @@ -86,33 +85,21 @@ class CircuitBreaker implements CircuitBreakerInterface $this->state->halfOpen(); } - /** - * @return float - */ public function getDuration(): float { return microtime(true) - $this->timestamp; } - /** - * @return int - */ public function getFailCounter(): int { return $this->failCounter; } - /** - * @return int - */ public function getSuccessCounter(): int { return $this->successCounter; } - /** - * @return float - */ public function getTimestamp(): float { return $this->timestamp; diff --git a/src/circuit-breaker/src/CircuitBreakerFactory.php b/src/circuit-breaker/src/CircuitBreakerFactory.php index aee418be6..041503b0d 100644 --- a/src/circuit-breaker/src/CircuitBreakerFactory.php +++ b/src/circuit-breaker/src/CircuitBreakerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker; use Psr\Container\ContainerInterface; diff --git a/src/circuit-breaker/src/CircuitBreakerInterface.php b/src/circuit-breaker/src/CircuitBreakerInterface.php index b8266e38b..789cd951d 100644 --- a/src/circuit-breaker/src/CircuitBreakerInterface.php +++ b/src/circuit-breaker/src/CircuitBreakerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker; interface CircuitBreakerInterface diff --git a/src/circuit-breaker/src/ConfigProvider.php b/src/circuit-breaker/src/ConfigProvider.php index f9da1040d..ecfcb4fb2 100644 --- a/src/circuit-breaker/src/ConfigProvider.php +++ b/src/circuit-breaker/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker; class ConfigProvider diff --git a/src/circuit-breaker/src/Exception/CircuitBreakerException.php b/src/circuit-breaker/src/Exception/CircuitBreakerException.php index f61bfcf66..783cdcee9 100644 --- a/src/circuit-breaker/src/Exception/CircuitBreakerException.php +++ b/src/circuit-breaker/src/Exception/CircuitBreakerException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker\Exception; class CircuitBreakerException extends \RuntimeException diff --git a/src/circuit-breaker/src/Exception/InvalidConfigException.php b/src/circuit-breaker/src/Exception/InvalidConfigException.php index 86ee5e7da..9042bcb6d 100644 --- a/src/circuit-breaker/src/Exception/InvalidConfigException.php +++ b/src/circuit-breaker/src/Exception/InvalidConfigException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker\Exception; class InvalidConfigException extends \RuntimeException diff --git a/src/circuit-breaker/src/Exception/TimeoutException.php b/src/circuit-breaker/src/Exception/TimeoutException.php index 0661f74a3..a2bafe640 100644 --- a/src/circuit-breaker/src/Exception/TimeoutException.php +++ b/src/circuit-breaker/src/Exception/TimeoutException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker\Exception; class TimeoutException extends CircuitBreakerException diff --git a/src/circuit-breaker/src/FallbackInterface.php b/src/circuit-breaker/src/FallbackInterface.php index efbcfb89e..13202c8bc 100644 --- a/src/circuit-breaker/src/FallbackInterface.php +++ b/src/circuit-breaker/src/FallbackInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker; use Hyperf\Di\Aop\ProceedingJoinPoint; diff --git a/src/circuit-breaker/src/Handler/AbstractHandler.php b/src/circuit-breaker/src/Handler/AbstractHandler.php index cb98c7e44..e48e318ad 100644 --- a/src/circuit-breaker/src/Handler/AbstractHandler.php +++ b/src/circuit-breaker/src/Handler/AbstractHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker\Handler; use Hyperf\CircuitBreaker\Annotation\CircuitBreaker as Annotation; diff --git a/src/circuit-breaker/src/Handler/HandlerInterface.php b/src/circuit-breaker/src/Handler/HandlerInterface.php index 5e38ac6fa..2fb08ef8a 100644 --- a/src/circuit-breaker/src/Handler/HandlerInterface.php +++ b/src/circuit-breaker/src/Handler/HandlerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker\Handler; use Hyperf\CircuitBreaker\Annotation\CircuitBreaker; diff --git a/src/circuit-breaker/src/Handler/TimeoutHandler.php b/src/circuit-breaker/src/Handler/TimeoutHandler.php index 0c92938b3..40ada5067 100644 --- a/src/circuit-breaker/src/Handler/TimeoutHandler.php +++ b/src/circuit-breaker/src/Handler/TimeoutHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker\Handler; use Hyperf\CircuitBreaker\Annotation\CircuitBreaker as Annotation; diff --git a/src/circuit-breaker/src/State.php b/src/circuit-breaker/src/State.php index 30c438734..3be2b2f9e 100644 --- a/src/circuit-breaker/src/State.php +++ b/src/circuit-breaker/src/State.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\CircuitBreaker; class State diff --git a/src/command/src/Annotation/Command.php b/src/command/src/Annotation/Command.php index e9872fa4f..5329ab9cd 100644 --- a/src/command/src/Annotation/Command.php +++ b/src/command/src/Annotation/Command.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Command\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/command/src/Command.php b/src/command/src/Command.php index 38d178c75..49a478bb5 100644 --- a/src/command/src/Command.php +++ b/src/command/src/Command.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Command; use Hyperf\Utils\Contracts\Arrayable; diff --git a/src/command/src/ConfirmableTrait.php b/src/command/src/ConfirmableTrait.php index c0a9a287f..e663070af 100644 --- a/src/command/src/ConfirmableTrait.php +++ b/src/command/src/ConfirmableTrait.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Command; use Closure; diff --git a/src/command/src/Event/AfterExecute.php b/src/command/src/Event/AfterExecute.php index 90ce47503..335727b37 100644 --- a/src/command/src/Event/AfterExecute.php +++ b/src/command/src/Event/AfterExecute.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Command\Event; class AfterExecute extends Event diff --git a/src/command/src/Event/AfterHandle.php b/src/command/src/Event/AfterHandle.php index 5248bce44..3c4f23b09 100644 --- a/src/command/src/Event/AfterHandle.php +++ b/src/command/src/Event/AfterHandle.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Command\Event; class AfterHandle extends Event diff --git a/src/command/src/Event/BeforeHandle.php b/src/command/src/Event/BeforeHandle.php index 8fd585189..e9d062289 100644 --- a/src/command/src/Event/BeforeHandle.php +++ b/src/command/src/Event/BeforeHandle.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Command\Event; class BeforeHandle extends Event diff --git a/src/command/src/Event/Event.php b/src/command/src/Event/Event.php index ae55af36b..f20345d6a 100644 --- a/src/command/src/Event/Event.php +++ b/src/command/src/Event/Event.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Command\Event; use Hyperf\Command\Command; diff --git a/src/command/src/Event/FailToHandle.php b/src/command/src/Event/FailToHandle.php index a9fdfb183..6760f76dd 100644 --- a/src/command/src/Event/FailToHandle.php +++ b/src/command/src/Event/FailToHandle.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Command\Event; use Hyperf\Command\Command; diff --git a/src/command/src/Listener/ClearTimerListener.php b/src/command/src/Listener/ClearTimerListener.php index ad0d82bbd..459a1d9b7 100644 --- a/src/command/src/Listener/ClearTimerListener.php +++ b/src/command/src/Listener/ClearTimerListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Command\Listener; use Hyperf\Command\Event\AfterExecute; diff --git a/src/command/tests/Command/DefaultSwooleFlagsCommand.php b/src/command/tests/Command/DefaultSwooleFlagsCommand.php index da1e21c17..7683c936a 100644 --- a/src/command/tests/Command/DefaultSwooleFlagsCommand.php +++ b/src/command/tests/Command/DefaultSwooleFlagsCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Command\Command; use Hyperf\Command\Command; diff --git a/src/command/tests/Command/SwooleFlagsCommand.php b/src/command/tests/Command/SwooleFlagsCommand.php index e6ea3d581..224b46f47 100644 --- a/src/command/tests/Command/SwooleFlagsCommand.php +++ b/src/command/tests/Command/SwooleFlagsCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Command\Command; use Hyperf\Command\Command; diff --git a/src/command/tests/CommandTest.php b/src/command/tests/CommandTest.php index 0c8ae1fd4..f004130e0 100644 --- a/src/command/tests/CommandTest.php +++ b/src/command/tests/CommandTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Command; use HyperfTest\Command\Command\DefaultSwooleFlagsCommand; diff --git a/src/config-aliyun-acm/publish/aliyun_acm.php b/src/config-aliyun-acm/publish/aliyun_acm.php index 3f2cbe51c..9d40165e0 100644 --- a/src/config-aliyun-acm/publish/aliyun_acm.php +++ b/src/config-aliyun-acm/publish/aliyun_acm.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'enable' => false, 'use_standalone_process' => true, diff --git a/src/config-aliyun-acm/src/Client.php b/src/config-aliyun-acm/src/Client.php index 5d00dbbe1..30fcc2af7 100644 --- a/src/config-aliyun-acm/src/Client.php +++ b/src/config-aliyun-acm/src/Client.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigAliyunAcm; use Closure; diff --git a/src/config-aliyun-acm/src/ClientInterface.php b/src/config-aliyun-acm/src/ClientInterface.php index d14ab67e5..bece6525c 100644 --- a/src/config-aliyun-acm/src/ClientInterface.php +++ b/src/config-aliyun-acm/src/ClientInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigAliyunAcm; interface ClientInterface diff --git a/src/config-aliyun-acm/src/ConfigProvider.php b/src/config-aliyun-acm/src/ConfigProvider.php index 32da5f232..708a04a2f 100644 --- a/src/config-aliyun-acm/src/ConfigProvider.php +++ b/src/config-aliyun-acm/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigAliyunAcm; use Hyperf\ConfigAliyunAcm\Listener\BootProcessListener; diff --git a/src/config-aliyun-acm/src/Listener/BootProcessListener.php b/src/config-aliyun-acm/src/Listener/BootProcessListener.php index 4850407e4..693c34a72 100644 --- a/src/config-aliyun-acm/src/Listener/BootProcessListener.php +++ b/src/config-aliyun-acm/src/Listener/BootProcessListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigAliyunAcm\Listener; use Hyperf\Command\Event\BeforeHandle; diff --git a/src/config-aliyun-acm/src/Listener/OnPipeMessageListener.php b/src/config-aliyun-acm/src/Listener/OnPipeMessageListener.php index 6bdd2c3ff..9d2810623 100644 --- a/src/config-aliyun-acm/src/Listener/OnPipeMessageListener.php +++ b/src/config-aliyun-acm/src/Listener/OnPipeMessageListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigAliyunAcm\Listener; use Hyperf\ConfigAliyunAcm\ClientInterface; diff --git a/src/config-aliyun-acm/src/PipeMessage.php b/src/config-aliyun-acm/src/PipeMessage.php index 3765b7286..3345775e5 100644 --- a/src/config-aliyun-acm/src/PipeMessage.php +++ b/src/config-aliyun-acm/src/PipeMessage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigAliyunAcm; class PipeMessage diff --git a/src/config-aliyun-acm/src/Process/ConfigFetcherProcess.php b/src/config-aliyun-acm/src/Process/ConfigFetcherProcess.php index b57880078..a1b11869f 100644 --- a/src/config-aliyun-acm/src/Process/ConfigFetcherProcess.php +++ b/src/config-aliyun-acm/src/Process/ConfigFetcherProcess.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigAliyunAcm\Process; use Hyperf\ConfigAliyunAcm\ClientInterface; diff --git a/src/config-aliyun-acm/tests/ClientTest.php b/src/config-aliyun-acm/tests/ClientTest.php index 2905c4710..6d799f66d 100644 --- a/src/config-aliyun-acm/tests/ClientTest.php +++ b/src/config-aliyun-acm/tests/ClientTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ConfigAliyunAcm; use Hyperf\Config\Config; diff --git a/src/config-apollo/publish/apollo.php b/src/config-apollo/publish/apollo.php index cdae92e37..510611693 100644 --- a/src/config-apollo/publish/apollo.php +++ b/src/config-apollo/publish/apollo.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'enable' => false, 'use_standalone_process' => true, diff --git a/src/config-apollo/src/Client.php b/src/config-apollo/src/Client.php index 4fc6fc51f..7706634b6 100644 --- a/src/config-apollo/src/Client.php +++ b/src/config-apollo/src/Client.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigApollo; use Closure; diff --git a/src/config-apollo/src/ClientFactory.php b/src/config-apollo/src/ClientFactory.php index e1ece7b5f..1301036b6 100644 --- a/src/config-apollo/src/ClientFactory.php +++ b/src/config-apollo/src/ClientFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigApollo; use Hyperf\Contract\ConfigInterface; diff --git a/src/config-apollo/src/ClientInterface.php b/src/config-apollo/src/ClientInterface.php index 6f19f1db7..07975df5c 100644 --- a/src/config-apollo/src/ClientInterface.php +++ b/src/config-apollo/src/ClientInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigApollo; interface ClientInterface diff --git a/src/config-apollo/src/ConfigProvider.php b/src/config-apollo/src/ConfigProvider.php index 6e66b4cf2..01578d592 100644 --- a/src/config-apollo/src/ConfigProvider.php +++ b/src/config-apollo/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigApollo; use Hyperf\ConfigApollo\Listener\BootProcessListener; diff --git a/src/config-apollo/src/Listener/BootProcessListener.php b/src/config-apollo/src/Listener/BootProcessListener.php index f225ecf2a..cff67e093 100644 --- a/src/config-apollo/src/Listener/BootProcessListener.php +++ b/src/config-apollo/src/Listener/BootProcessListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigApollo\Listener; use Hyperf\Command\Event\BeforeHandle; diff --git a/src/config-apollo/src/Listener/OnPipeMessageListener.php b/src/config-apollo/src/Listener/OnPipeMessageListener.php index c9253a5fb..879d2542b 100644 --- a/src/config-apollo/src/Listener/OnPipeMessageListener.php +++ b/src/config-apollo/src/Listener/OnPipeMessageListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigApollo\Listener; use Hyperf\ConfigApollo\ClientInterface; diff --git a/src/config-apollo/src/Option.php b/src/config-apollo/src/Option.php index fadb21681..e009a93fb 100644 --- a/src/config-apollo/src/Option.php +++ b/src/config-apollo/src/Option.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigApollo; use Hyperf\Utils\Str; diff --git a/src/config-apollo/src/PipeMessage.php b/src/config-apollo/src/PipeMessage.php index ecde25ba4..ee9876804 100644 --- a/src/config-apollo/src/PipeMessage.php +++ b/src/config-apollo/src/PipeMessage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigApollo; class PipeMessage diff --git a/src/config-apollo/src/Process/ConfigFetcherProcess.php b/src/config-apollo/src/Process/ConfigFetcherProcess.php index ffa39696b..5b3104a6e 100644 --- a/src/config-apollo/src/Process/ConfigFetcherProcess.php +++ b/src/config-apollo/src/Process/ConfigFetcherProcess.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigApollo\Process; use Hyperf\ConfigApollo\ClientInterface; diff --git a/src/config-apollo/src/ReleaseKey.php b/src/config-apollo/src/ReleaseKey.php index f0b0c45c8..e2aa8f0af 100644 --- a/src/config-apollo/src/ReleaseKey.php +++ b/src/config-apollo/src/ReleaseKey.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigApollo; use Hyperf\Utils\Traits\Container; diff --git a/src/config-apollo/tests/ClientTest.php b/src/config-apollo/tests/ClientTest.php index 281220d02..d370beb25 100644 --- a/src/config-apollo/tests/ClientTest.php +++ b/src/config-apollo/tests/ClientTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ConfigApollo; use Hyperf\Config\Config; diff --git a/src/config-apollo/tests/OptionTest.php b/src/config-apollo/tests/OptionTest.php index 166b06be1..e4497c8b1 100644 --- a/src/config-apollo/tests/OptionTest.php +++ b/src/config-apollo/tests/OptionTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ConfigApollo; use Hyperf\ConfigApollo\Option; diff --git a/src/config-etcd/publish/config_etcd.php b/src/config-etcd/publish/config_etcd.php index a9f8b7749..2c6619ba4 100644 --- a/src/config-etcd/publish/config_etcd.php +++ b/src/config-etcd/publish/config_etcd.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'enable' => false, 'packer' => Hyperf\Utils\Packer\JsonPacker::class, diff --git a/src/config-etcd/src/Client.php b/src/config-etcd/src/Client.php index b1d5d5817..a281aa53a 100644 --- a/src/config-etcd/src/Client.php +++ b/src/config-etcd/src/Client.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigEtcd; use Hyperf\Contract\ConfigInterface; diff --git a/src/config-etcd/src/ClientInterface.php b/src/config-etcd/src/ClientInterface.php index c750c31dd..28315d422 100644 --- a/src/config-etcd/src/ClientInterface.php +++ b/src/config-etcd/src/ClientInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigEtcd; interface ClientInterface diff --git a/src/config-etcd/src/ConfigProvider.php b/src/config-etcd/src/ConfigProvider.php index e6e2dae1b..a6baefd9e 100644 --- a/src/config-etcd/src/ConfigProvider.php +++ b/src/config-etcd/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigEtcd; use Hyperf\ConfigEtcd\Listener\BootProcessListener; diff --git a/src/config-etcd/src/KV.php b/src/config-etcd/src/KV.php index 56518fc8e..b856d0d1e 100644 --- a/src/config-etcd/src/KV.php +++ b/src/config-etcd/src/KV.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigEtcd; class KV diff --git a/src/config-etcd/src/Listener/BootProcessListener.php b/src/config-etcd/src/Listener/BootProcessListener.php index 0bc389509..696fcf82d 100644 --- a/src/config-etcd/src/Listener/BootProcessListener.php +++ b/src/config-etcd/src/Listener/BootProcessListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigEtcd\Listener; use Hyperf\Command\Event\BeforeHandle; diff --git a/src/config-etcd/src/Listener/OnPipeMessageListener.php b/src/config-etcd/src/Listener/OnPipeMessageListener.php index 6dd1961b0..314d0e342 100644 --- a/src/config-etcd/src/Listener/OnPipeMessageListener.php +++ b/src/config-etcd/src/Listener/OnPipeMessageListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigEtcd\Listener; use Hyperf\ConfigEtcd\KV; diff --git a/src/config-etcd/src/PipeMessage.php b/src/config-etcd/src/PipeMessage.php index 43cd8779c..579541cdf 100644 --- a/src/config-etcd/src/PipeMessage.php +++ b/src/config-etcd/src/PipeMessage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigEtcd; class PipeMessage diff --git a/src/config-etcd/src/Process/ConfigFetcherProcess.php b/src/config-etcd/src/Process/ConfigFetcherProcess.php index 95c500083..d7a46d946 100644 --- a/src/config-etcd/src/Process/ConfigFetcherProcess.php +++ b/src/config-etcd/src/Process/ConfigFetcherProcess.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigEtcd\Process; use Hyperf\ConfigEtcd\ClientInterface; diff --git a/src/config-zookeeper/publish/zookeeper.php b/src/config-zookeeper/publish/zookeeper.php index 0f3aecf74..887033da4 100644 --- a/src/config-zookeeper/publish/zookeeper.php +++ b/src/config-zookeeper/publish/zookeeper.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'enable' => false, 'use_standalone_process' => true, diff --git a/src/config-zookeeper/src/Client.php b/src/config-zookeeper/src/Client.php index f9b92bd7a..afb7787b7 100644 --- a/src/config-zookeeper/src/Client.php +++ b/src/config-zookeeper/src/Client.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigZookeeper; use Hyperf\Contract\ConfigInterface; diff --git a/src/config-zookeeper/src/ClientInterface.php b/src/config-zookeeper/src/ClientInterface.php index 3b4160b84..6dfdac8f2 100644 --- a/src/config-zookeeper/src/ClientInterface.php +++ b/src/config-zookeeper/src/ClientInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigZookeeper; interface ClientInterface diff --git a/src/config-zookeeper/src/ConfigProvider.php b/src/config-zookeeper/src/ConfigProvider.php index 15bec46b9..569ee7bd8 100644 --- a/src/config-zookeeper/src/ConfigProvider.php +++ b/src/config-zookeeper/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigZookeeper; use Hyperf\ConfigZookeeper\Listener\BootProcessListener; diff --git a/src/config-zookeeper/src/Listener/BootProcessListener.php b/src/config-zookeeper/src/Listener/BootProcessListener.php index 73ea3b252..daabf5f21 100644 --- a/src/config-zookeeper/src/Listener/BootProcessListener.php +++ b/src/config-zookeeper/src/Listener/BootProcessListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigZookeeper\Listener; use Hyperf\Command\Event\BeforeHandle; diff --git a/src/config-zookeeper/src/Listener/OnPipeMessageListener.php b/src/config-zookeeper/src/Listener/OnPipeMessageListener.php index f03e2e89a..bd92e96e7 100644 --- a/src/config-zookeeper/src/Listener/OnPipeMessageListener.php +++ b/src/config-zookeeper/src/Listener/OnPipeMessageListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigZookeeper\Listener; use Hyperf\ConfigZookeeper\PipeMessage; diff --git a/src/config-zookeeper/src/PipeMessage.php b/src/config-zookeeper/src/PipeMessage.php index dc1469b1e..6d06d1265 100644 --- a/src/config-zookeeper/src/PipeMessage.php +++ b/src/config-zookeeper/src/PipeMessage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigZookeeper; class PipeMessage diff --git a/src/config-zookeeper/src/Process/ConfigFetcherProcess.php b/src/config-zookeeper/src/Process/ConfigFetcherProcess.php index eef9f5e00..16b067415 100644 --- a/src/config-zookeeper/src/Process/ConfigFetcherProcess.php +++ b/src/config-zookeeper/src/Process/ConfigFetcherProcess.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ConfigZookeeper\Process; use Hyperf\ConfigZookeeper\ClientInterface; diff --git a/src/config-zookeeper/tests/ClientTest.php b/src/config-zookeeper/tests/ClientTest.php index 2736bd521..f924c51c7 100644 --- a/src/config-zookeeper/tests/ClientTest.php +++ b/src/config-zookeeper/tests/ClientTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ConfigZookeeper; use Hyperf\Config\Config; diff --git a/src/config-zookeeper/tests/Stub/Server.php b/src/config-zookeeper/tests/Stub/Server.php index 6efab9d08..ca58f13b8 100644 --- a/src/config-zookeeper/tests/Stub/Server.php +++ b/src/config-zookeeper/tests/Stub/Server.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ConfigZookeeper\Stub; class Server extends \Swoole\Server diff --git a/src/config/src/Annotation/Value.php b/src/config/src/Annotation/Value.php index ef57f8911..0a6616e84 100644 --- a/src/config/src/Annotation/Value.php +++ b/src/config/src/Annotation/Value.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Config\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/config/src/Config.php b/src/config/src/Config.php index 08e608d6a..e184fc7e4 100644 --- a/src/config/src/Config.php +++ b/src/config/src/Config.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Config; use Hyperf\Contract\ConfigInterface; diff --git a/src/config/src/ConfigFactory.php b/src/config/src/ConfigFactory.php index 75545b52d..619257d57 100644 --- a/src/config/src/ConfigFactory.php +++ b/src/config/src/ConfigFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Config; use Dotenv\Dotenv; diff --git a/src/config/src/ConfigProvider.php b/src/config/src/ConfigProvider.php index 8d1d95a5e..a1fc890a5 100644 --- a/src/config/src/ConfigProvider.php +++ b/src/config/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Config; use Hyperf\Config\Listener\RegisterPropertyHandlerListener; diff --git a/src/config/src/Functions.php b/src/config/src/Functions.php index fe91a095b..2018e2377 100644 --- a/src/config/src/Functions.php +++ b/src/config/src/Functions.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - use Hyperf\Contract\ConfigInterface; use Hyperf\Utils\ApplicationContext; diff --git a/src/config/src/Listener/RegisterPropertyHandlerListener.php b/src/config/src/Listener/RegisterPropertyHandlerListener.php index 5ae45ba40..42ae5e751 100644 --- a/src/config/src/Listener/RegisterPropertyHandlerListener.php +++ b/src/config/src/Listener/RegisterPropertyHandlerListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Config\Listener; use Hyperf\Config\Annotation\Value; diff --git a/src/config/src/ProviderConfig.php b/src/config/src/ProviderConfig.php index 58280930b..c5913cce6 100644 --- a/src/config/src/ProviderConfig.php +++ b/src/config/src/ProviderConfig.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Config; use Hyperf\Utils\Composer; diff --git a/src/config/tests/ProviderConfigTest.php b/src/config/tests/ProviderConfigTest.php index e85f0b5db..9e28d72b9 100644 --- a/src/config/tests/ProviderConfigTest.php +++ b/src/config/tests/ProviderConfigTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Config; use Hyperf\Utils\Arr; diff --git a/src/config/tests/Stub/Foo.php b/src/config/tests/Stub/Foo.php index bfe2b9a49..f558583e5 100644 --- a/src/config/tests/Stub/Foo.php +++ b/src/config/tests/Stub/Foo.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Config\Stub; class Foo diff --git a/src/config/tests/Stub/FooConfigProvider.php b/src/config/tests/Stub/FooConfigProvider.php index 5e3c96746..901928b0e 100644 --- a/src/config/tests/Stub/FooConfigProvider.php +++ b/src/config/tests/Stub/FooConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Config\Stub; class FooConfigProvider diff --git a/src/config/tests/Stub/ProviderConfig.php b/src/config/tests/Stub/ProviderConfig.php index bf1b68cfd..67dd3d1c4 100644 --- a/src/config/tests/Stub/ProviderConfig.php +++ b/src/config/tests/Stub/ProviderConfig.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Config\Stub; class ProviderConfig extends \Hyperf\Config\ProviderConfig diff --git a/src/constants/src/AbstractConstants.php b/src/constants/src/AbstractConstants.php index cc4d9c0cb..4e3f6301a 100644 --- a/src/constants/src/AbstractConstants.php +++ b/src/constants/src/AbstractConstants.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Constants; use Hyperf\Constants\Exception\ConstantsException; diff --git a/src/constants/src/Annotation/Constants.php b/src/constants/src/Annotation/Constants.php index 6002bcb88..9401438b9 100644 --- a/src/constants/src/Annotation/Constants.php +++ b/src/constants/src/Annotation/Constants.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Constants\Annotation; use Hyperf\Constants\AnnotationReader; diff --git a/src/constants/src/AnnotationReader.php b/src/constants/src/AnnotationReader.php index 7c3179460..a4b37785c 100644 --- a/src/constants/src/AnnotationReader.php +++ b/src/constants/src/AnnotationReader.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Constants; use Hyperf\Utils\Str; diff --git a/src/constants/src/ConfigProvider.php b/src/constants/src/ConfigProvider.php index 4fde8db3f..ef64c2610 100644 --- a/src/constants/src/ConfigProvider.php +++ b/src/constants/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Constants; class ConfigProvider diff --git a/src/constants/src/ConstantsCollector.php b/src/constants/src/ConstantsCollector.php index 2198fa66d..b2694e317 100644 --- a/src/constants/src/ConstantsCollector.php +++ b/src/constants/src/ConstantsCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Constants; use Hyperf\Di\MetadataCollector; diff --git a/src/constants/src/Exception/ConstantsException.php b/src/constants/src/Exception/ConstantsException.php index db2ffa25f..a95cd676b 100644 --- a/src/constants/src/Exception/ConstantsException.php +++ b/src/constants/src/Exception/ConstantsException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Constants\Exception; use Exception; diff --git a/src/constants/tests/AnnotationReaderTest.php b/src/constants/tests/AnnotationReaderTest.php index 5506b2604..f70c8730b 100644 --- a/src/constants/tests/AnnotationReaderTest.php +++ b/src/constants/tests/AnnotationReaderTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Constants; use Hyperf\Constants\AnnotationReader; diff --git a/src/constants/tests/Stub/ErrorCodeStub.php b/src/constants/tests/Stub/ErrorCodeStub.php index ae0327fe7..1f5854200 100644 --- a/src/constants/tests/Stub/ErrorCodeStub.php +++ b/src/constants/tests/Stub/ErrorCodeStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Constants\Stub; use Hyperf\Constants\AbstractConstants; diff --git a/src/consul/publish/consul.php b/src/consul/publish/consul.php index 4da659148..2d5998a85 100644 --- a/src/consul/publish/consul.php +++ b/src/consul/publish/consul.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'uri' => 'http://127.0.0.1:8500', ]; diff --git a/src/consul/src/Agent.php b/src/consul/src/Agent.php index fe608d268..ca181d8ff 100644 --- a/src/consul/src/Agent.php +++ b/src/consul/src/Agent.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; class Agent extends Client implements AgentInterface diff --git a/src/consul/src/AgentInterface.php b/src/consul/src/AgentInterface.php index 28696a3d0..2d4e7f324 100644 --- a/src/consul/src/AgentInterface.php +++ b/src/consul/src/AgentInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; interface AgentInterface diff --git a/src/consul/src/Catalog.php b/src/consul/src/Catalog.php index 5b35048e1..506fdda01 100644 --- a/src/consul/src/Catalog.php +++ b/src/consul/src/Catalog.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; class Catalog extends Client implements CatalogInterface diff --git a/src/consul/src/CatalogInterface.php b/src/consul/src/CatalogInterface.php index 5bc50400d..834cfbed1 100644 --- a/src/consul/src/CatalogInterface.php +++ b/src/consul/src/CatalogInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; interface CatalogInterface diff --git a/src/consul/src/Client.php b/src/consul/src/Client.php index 59153471a..ea31ac18e 100644 --- a/src/consul/src/Client.php +++ b/src/consul/src/Client.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; use GuzzleHttp\ClientInterface; @@ -48,7 +47,7 @@ abstract class Client { // Add key of ACL token to $availableOptions $availableOptions[] = 'token'; - + return array_intersect_key($options, array_flip($availableOptions)); } diff --git a/src/consul/src/ConfigProvider.php b/src/consul/src/ConfigProvider.php index 8f17c5be9..9274951f4 100644 --- a/src/consul/src/ConfigProvider.php +++ b/src/consul/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; class ConfigProvider diff --git a/src/consul/src/ConsulResponse.php b/src/consul/src/ConsulResponse.php index 2ebe68dd1..228d50c36 100644 --- a/src/consul/src/ConsulResponse.php +++ b/src/consul/src/ConsulResponse.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; use Hyperf\Consul\Exception\ServerException; diff --git a/src/consul/src/Exception/ClientException.php b/src/consul/src/Exception/ClientException.php index 972962e06..203ebedc9 100644 --- a/src/consul/src/Exception/ClientException.php +++ b/src/consul/src/Exception/ClientException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul\Exception; class ClientException extends \RuntimeException implements ConsulException diff --git a/src/consul/src/Exception/ConsulException.php b/src/consul/src/Exception/ConsulException.php index 1daaa9ac6..c4c4b3514 100644 --- a/src/consul/src/Exception/ConsulException.php +++ b/src/consul/src/Exception/ConsulException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul\Exception; interface ConsulException diff --git a/src/consul/src/Exception/InvalidArgumentException.php b/src/consul/src/Exception/InvalidArgumentException.php index ac3a25b19..4ac7ed339 100644 --- a/src/consul/src/Exception/InvalidArgumentException.php +++ b/src/consul/src/Exception/InvalidArgumentException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul\Exception; class InvalidArgumentException extends \InvalidArgumentException implements ConsulException diff --git a/src/consul/src/Exception/ServerException.php b/src/consul/src/Exception/ServerException.php index 674d1ce44..1066484c3 100644 --- a/src/consul/src/Exception/ServerException.php +++ b/src/consul/src/Exception/ServerException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul\Exception; class ServerException extends \RuntimeException implements ConsulException diff --git a/src/consul/src/Health.php b/src/consul/src/Health.php index e1de98470..a84548555 100644 --- a/src/consul/src/Health.php +++ b/src/consul/src/Health.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; class Health extends Client implements HealthInterface diff --git a/src/consul/src/HealthInterface.php b/src/consul/src/HealthInterface.php index e03a4cf0f..a0cc8fc5c 100644 --- a/src/consul/src/HealthInterface.php +++ b/src/consul/src/HealthInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; interface HealthInterface diff --git a/src/consul/src/KV.php b/src/consul/src/KV.php index 26e9f25d7..8c045a992 100644 --- a/src/consul/src/KV.php +++ b/src/consul/src/KV.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; class KV extends Client implements KVInterface diff --git a/src/consul/src/KVInterface.php b/src/consul/src/KVInterface.php index f04e476e6..193a273ac 100644 --- a/src/consul/src/KVInterface.php +++ b/src/consul/src/KVInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; interface KVInterface diff --git a/src/consul/src/Session.php b/src/consul/src/Session.php index 54e7eaad9..879bf0c6f 100644 --- a/src/consul/src/Session.php +++ b/src/consul/src/Session.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; class Session extends Client implements SessionInterface diff --git a/src/consul/src/SessionInterface.php b/src/consul/src/SessionInterface.php index d98d07c90..b7f221e37 100644 --- a/src/consul/src/SessionInterface.php +++ b/src/consul/src/SessionInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; interface SessionInterface diff --git a/src/consul/src/Utils.php b/src/consul/src/Utils.php index e33891252..9da4b12c3 100644 --- a/src/consul/src/Utils.php +++ b/src/consul/src/Utils.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Consul; use Psr\Http\Message\RequestInterface; diff --git a/src/consul/tests/AgentTest.php b/src/consul/tests/AgentTest.php index ebb805235..d86624f8f 100644 --- a/src/consul/tests/AgentTest.php +++ b/src/consul/tests/AgentTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Consul; use GuzzleHttp\Client; diff --git a/src/consul/tests/ClientTest.php b/src/consul/tests/ClientTest.php index b060aac3c..f6c3d32d1 100644 --- a/src/consul/tests/ClientTest.php +++ b/src/consul/tests/ClientTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Consul; use HyperfTest\Consul\Stub\Client; diff --git a/src/consul/tests/KVTest.php b/src/consul/tests/KVTest.php index bea9f8b20..c05c0dc45 100644 --- a/src/consul/tests/KVTest.php +++ b/src/consul/tests/KVTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Consul; use GuzzleHttp\Client; diff --git a/src/consul/tests/Stub/Client.php b/src/consul/tests/Stub/Client.php index 507449e5f..739841039 100644 --- a/src/consul/tests/Stub/Client.php +++ b/src/consul/tests/Stub/Client.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Consul\Stub; class Client extends \Hyperf\Consul\Client diff --git a/src/contract/src/ApplicationInterface.php b/src/contract/src/ApplicationInterface.php index e99b0a215..50083e06f 100644 --- a/src/contract/src/ApplicationInterface.php +++ b/src/contract/src/ApplicationInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface ApplicationInterface diff --git a/src/contract/src/CompressInterface.php b/src/contract/src/CompressInterface.php index a76a68e33..bfb801175 100644 --- a/src/contract/src/CompressInterface.php +++ b/src/contract/src/CompressInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface CompressInterface diff --git a/src/contract/src/ConfigInterface.php b/src/contract/src/ConfigInterface.php index be3cf3149..2826488c3 100644 --- a/src/contract/src/ConfigInterface.php +++ b/src/contract/src/ConfigInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface ConfigInterface diff --git a/src/contract/src/ConnectionInterface.php b/src/contract/src/ConnectionInterface.php index 808a4e57e..04fb006cf 100644 --- a/src/contract/src/ConnectionInterface.php +++ b/src/contract/src/ConnectionInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface ConnectionInterface diff --git a/src/contract/src/ContainerInterface.php b/src/contract/src/ContainerInterface.php index 7a17ab676..6763e702c 100644 --- a/src/contract/src/ContainerInterface.php +++ b/src/contract/src/ContainerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; use Psr\Container\ContainerInterface as PsrContainerInterface; diff --git a/src/contract/src/DispatcherInterface.php b/src/contract/src/DispatcherInterface.php index e1b7f93e5..72a0770a3 100644 --- a/src/contract/src/DispatcherInterface.php +++ b/src/contract/src/DispatcherInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface DispatcherInterface diff --git a/src/contract/src/FrequencyInterface.php b/src/contract/src/FrequencyInterface.php index dfe922a40..a2bd01e51 100644 --- a/src/contract/src/FrequencyInterface.php +++ b/src/contract/src/FrequencyInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface FrequencyInterface diff --git a/src/contract/src/IdGeneratorInterface.php b/src/contract/src/IdGeneratorInterface.php index 8f657794d..2c073548a 100644 --- a/src/contract/src/IdGeneratorInterface.php +++ b/src/contract/src/IdGeneratorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface IdGeneratorInterface diff --git a/src/contract/src/LengthAwarePaginatorInterface.php b/src/contract/src/LengthAwarePaginatorInterface.php index 8749b454e..865aaefc7 100644 --- a/src/contract/src/LengthAwarePaginatorInterface.php +++ b/src/contract/src/LengthAwarePaginatorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface LengthAwarePaginatorInterface extends PaginatorInterface diff --git a/src/contract/src/MiddlewareInitializerInterface.php b/src/contract/src/MiddlewareInitializerInterface.php index ca643e23d..796477f04 100644 --- a/src/contract/src/MiddlewareInitializerInterface.php +++ b/src/contract/src/MiddlewareInitializerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface MiddlewareInitializerInterface diff --git a/src/contract/src/NormalizerInterface.php b/src/contract/src/NormalizerInterface.php index ccc327291..bda3353cd 100644 --- a/src/contract/src/NormalizerInterface.php +++ b/src/contract/src/NormalizerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface NormalizerInterface diff --git a/src/contract/src/OnCloseInterface.php b/src/contract/src/OnCloseInterface.php index 5322976b5..b971cf31a 100644 --- a/src/contract/src/OnCloseInterface.php +++ b/src/contract/src/OnCloseInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; use Swoole\Server; diff --git a/src/contract/src/OnHandShakeInterface.php b/src/contract/src/OnHandShakeInterface.php index 2b21ca5b0..459ff5a17 100644 --- a/src/contract/src/OnHandShakeInterface.php +++ b/src/contract/src/OnHandShakeInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; use Swoole\Http\Request; diff --git a/src/contract/src/OnMessageInterface.php b/src/contract/src/OnMessageInterface.php index 52f38a6bb..2acff83fc 100644 --- a/src/contract/src/OnMessageInterface.php +++ b/src/contract/src/OnMessageInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; use Swoole\Websocket\Frame; diff --git a/src/contract/src/OnOpenInterface.php b/src/contract/src/OnOpenInterface.php index 13a44c396..b8949fbfd 100644 --- a/src/contract/src/OnOpenInterface.php +++ b/src/contract/src/OnOpenInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; use Swoole\Http\Request; diff --git a/src/contract/src/OnReceiveInterface.php b/src/contract/src/OnReceiveInterface.php index 73433709a..40df80040 100644 --- a/src/contract/src/OnReceiveInterface.php +++ b/src/contract/src/OnReceiveInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; use Swoole\Server as SwooleServer; diff --git a/src/contract/src/OnRequestInterface.php b/src/contract/src/OnRequestInterface.php index 1b184cc51..26492620e 100644 --- a/src/contract/src/OnRequestInterface.php +++ b/src/contract/src/OnRequestInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; use Swoole\Http\Request as SwooleRequest; diff --git a/src/contract/src/PackerInterface.php b/src/contract/src/PackerInterface.php index 3732f7bc6..db46855a9 100644 --- a/src/contract/src/PackerInterface.php +++ b/src/contract/src/PackerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface PackerInterface diff --git a/src/contract/src/PaginatorInterface.php b/src/contract/src/PaginatorInterface.php index c4847f8a7..d84e475e4 100644 --- a/src/contract/src/PaginatorInterface.php +++ b/src/contract/src/PaginatorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface PaginatorInterface diff --git a/src/contract/src/PoolInterface.php b/src/contract/src/PoolInterface.php index f5ec41e46..745f6e27f 100644 --- a/src/contract/src/PoolInterface.php +++ b/src/contract/src/PoolInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface PoolInterface diff --git a/src/contract/src/PoolOptionInterface.php b/src/contract/src/PoolOptionInterface.php index b6cec7e20..20005f887 100644 --- a/src/contract/src/PoolOptionInterface.php +++ b/src/contract/src/PoolOptionInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface PoolOptionInterface diff --git a/src/contract/src/ProcessInterface.php b/src/contract/src/ProcessInterface.php index af2e5e780..b484ccd73 100644 --- a/src/contract/src/ProcessInterface.php +++ b/src/contract/src/ProcessInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; use Swoole\Server; diff --git a/src/contract/src/Sendable.php b/src/contract/src/Sendable.php index c75652284..33bf812f5 100644 --- a/src/contract/src/Sendable.php +++ b/src/contract/src/Sendable.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface Sendable diff --git a/src/contract/src/SessionInterface.php b/src/contract/src/SessionInterface.php index 31618ed0a..e9a6f8e09 100644 --- a/src/contract/src/SessionInterface.php +++ b/src/contract/src/SessionInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface SessionInterface diff --git a/src/contract/src/StdoutLoggerInterface.php b/src/contract/src/StdoutLoggerInterface.php index 0787d36d3..add290737 100644 --- a/src/contract/src/StdoutLoggerInterface.php +++ b/src/contract/src/StdoutLoggerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; use Psr\Log\LoggerInterface; diff --git a/src/contract/src/TranslatorInterface.php b/src/contract/src/TranslatorInterface.php index 4a70d793d..ba21486a5 100644 --- a/src/contract/src/TranslatorInterface.php +++ b/src/contract/src/TranslatorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface TranslatorInterface diff --git a/src/contract/src/TranslatorLoaderInterface.php b/src/contract/src/TranslatorLoaderInterface.php index a2b98c10b..af7700375 100644 --- a/src/contract/src/TranslatorLoaderInterface.php +++ b/src/contract/src/TranslatorLoaderInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface TranslatorLoaderInterface diff --git a/src/contract/src/UnCompressInterface.php b/src/contract/src/UnCompressInterface.php index d8cf135c7..fee5f13d3 100644 --- a/src/contract/src/UnCompressInterface.php +++ b/src/contract/src/UnCompressInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; interface UnCompressInterface diff --git a/src/contract/src/ValidatorInterface.php b/src/contract/src/ValidatorInterface.php index cbd267d9a..f40270dc7 100644 --- a/src/contract/src/ValidatorInterface.php +++ b/src/contract/src/ValidatorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Contract; use Hyperf\Utils\Contracts\MessageBag; diff --git a/src/crontab/src/Annotation/Crontab.php b/src/crontab/src/Annotation/Crontab.php index d2691ace0..60c602859 100644 --- a/src/crontab/src/Annotation/Crontab.php +++ b/src/crontab/src/Annotation/Crontab.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/crontab/src/ConfigProvider.php b/src/crontab/src/ConfigProvider.php index 2fb93c7b6..0b490aa87 100644 --- a/src/crontab/src/ConfigProvider.php +++ b/src/crontab/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab; use Hyperf\Crontab\Listener\CrontabRegisterListener; diff --git a/src/crontab/src/Crontab.php b/src/crontab/src/Crontab.php index cf475263f..d4b656959 100644 --- a/src/crontab/src/Crontab.php +++ b/src/crontab/src/Crontab.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab; use Carbon\Carbon; diff --git a/src/crontab/src/CrontabManager.php b/src/crontab/src/CrontabManager.php index cbbc1eead..91f9cbc90 100644 --- a/src/crontab/src/CrontabManager.php +++ b/src/crontab/src/CrontabManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab; class CrontabManager diff --git a/src/crontab/src/Event/CrontabDispatcherStarted.php b/src/crontab/src/Event/CrontabDispatcherStarted.php index 7e0be9811..00e109fc2 100644 --- a/src/crontab/src/Event/CrontabDispatcherStarted.php +++ b/src/crontab/src/Event/CrontabDispatcherStarted.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Event; class CrontabDispatcherStarted diff --git a/src/crontab/src/Listener/CrontabRegisterListener.php b/src/crontab/src/Listener/CrontabRegisterListener.php index 0b9bdec98..38d50565e 100644 --- a/src/crontab/src/Listener/CrontabRegisterListener.php +++ b/src/crontab/src/Listener/CrontabRegisterListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Listener; use Hyperf\Contract\ConfigInterface; diff --git a/src/crontab/src/Listener/OnPipeMessageListener.php b/src/crontab/src/Listener/OnPipeMessageListener.php index 42e73c5c2..adb47e591 100644 --- a/src/crontab/src/Listener/OnPipeMessageListener.php +++ b/src/crontab/src/Listener/OnPipeMessageListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Listener; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/crontab/src/LoggerInterface.php b/src/crontab/src/LoggerInterface.php index 056eda991..32ae8851b 100644 --- a/src/crontab/src/LoggerInterface.php +++ b/src/crontab/src/LoggerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab; interface LoggerInterface diff --git a/src/crontab/src/Mutex/RedisServerMutex.php b/src/crontab/src/Mutex/RedisServerMutex.php index 22b856737..3e7f50461 100644 --- a/src/crontab/src/Mutex/RedisServerMutex.php +++ b/src/crontab/src/Mutex/RedisServerMutex.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Mutex; use Hyperf\Crontab\Crontab; @@ -53,9 +52,9 @@ class RedisServerMutex implements ServerMutex $result = (bool) $redis->set($mutexName, $this->macAddress, ['NX', 'EX' => $crontab->getMutexExpires()]); if ($result === true) { - Coroutine::create(function() use ($crontab, $redis, $mutexName) { - $exited = CoordinatorManager::until(Constants::WORKER_EXIT)->yield($crontab->getMutexExpires()); - $exited && $redis->del($mutexName); + Coroutine::create(function () use ($crontab, $redis, $mutexName) { + $exited = CoordinatorManager::until(Constants::WORKER_EXIT)->yield($crontab->getMutexExpires()); + $exited && $redis->del($mutexName); }); return $result; } diff --git a/src/crontab/src/Mutex/RedisTaskMutex.php b/src/crontab/src/Mutex/RedisTaskMutex.php index c99a0b494..906c4160c 100644 --- a/src/crontab/src/Mutex/RedisTaskMutex.php +++ b/src/crontab/src/Mutex/RedisTaskMutex.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Mutex; use Hyperf\Crontab\Crontab; diff --git a/src/crontab/src/Mutex/ServerMutex.php b/src/crontab/src/Mutex/ServerMutex.php index cd98551fb..97e20a6d4 100644 --- a/src/crontab/src/Mutex/ServerMutex.php +++ b/src/crontab/src/Mutex/ServerMutex.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Mutex; use Hyperf\Crontab\Crontab; diff --git a/src/crontab/src/Mutex/TaskMutex.php b/src/crontab/src/Mutex/TaskMutex.php index 7f32b68c0..7bec81436 100644 --- a/src/crontab/src/Mutex/TaskMutex.php +++ b/src/crontab/src/Mutex/TaskMutex.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Mutex; use Hyperf\Crontab\Crontab; diff --git a/src/crontab/src/Parser.php b/src/crontab/src/Parser.php index d1a34e4ea..af1871b27 100644 --- a/src/crontab/src/Parser.php +++ b/src/crontab/src/Parser.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab; use Carbon\Carbon; diff --git a/src/crontab/src/PipeMessage.php b/src/crontab/src/PipeMessage.php index a97251ab1..9cb756391 100644 --- a/src/crontab/src/PipeMessage.php +++ b/src/crontab/src/PipeMessage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab; class PipeMessage diff --git a/src/crontab/src/Process/CrontabDispatcherProcess.php b/src/crontab/src/Process/CrontabDispatcherProcess.php index 713cf4f2c..01e595236 100644 --- a/src/crontab/src/Process/CrontabDispatcherProcess.php +++ b/src/crontab/src/Process/CrontabDispatcherProcess.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Process; use Hyperf\Contract\ConfigInterface; diff --git a/src/crontab/src/Scheduler.php b/src/crontab/src/Scheduler.php index 46a59e706..23895b531 100644 --- a/src/crontab/src/Scheduler.php +++ b/src/crontab/src/Scheduler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab; class Scheduler diff --git a/src/crontab/src/Strategy/AbstractStrategy.php b/src/crontab/src/Strategy/AbstractStrategy.php index 7ffbffa65..b75470f83 100644 --- a/src/crontab/src/Strategy/AbstractStrategy.php +++ b/src/crontab/src/Strategy/AbstractStrategy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Strategy; use Psr\Container\ContainerInterface; diff --git a/src/crontab/src/Strategy/CoroutineStrategy.php b/src/crontab/src/Strategy/CoroutineStrategy.php index 00fdb8fff..66e0ed81d 100644 --- a/src/crontab/src/Strategy/CoroutineStrategy.php +++ b/src/crontab/src/Strategy/CoroutineStrategy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Strategy; use Carbon\Carbon; diff --git a/src/crontab/src/Strategy/Executor.php b/src/crontab/src/Strategy/Executor.php index 1c11a24ed..580fc778f 100644 --- a/src/crontab/src/Strategy/Executor.php +++ b/src/crontab/src/Strategy/Executor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Strategy; use Carbon\Carbon; diff --git a/src/crontab/src/Strategy/ProcessStrategy.php b/src/crontab/src/Strategy/ProcessStrategy.php index 50b937b03..7e57175c7 100644 --- a/src/crontab/src/Strategy/ProcessStrategy.php +++ b/src/crontab/src/Strategy/ProcessStrategy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Strategy; use Swoole\Server; diff --git a/src/crontab/src/Strategy/StrategyInterface.php b/src/crontab/src/Strategy/StrategyInterface.php index b8779ccda..21b0150ca 100644 --- a/src/crontab/src/Strategy/StrategyInterface.php +++ b/src/crontab/src/Strategy/StrategyInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Strategy; use Hyperf\Crontab\Crontab; diff --git a/src/crontab/src/Strategy/TaskWorkerStrategy.php b/src/crontab/src/Strategy/TaskWorkerStrategy.php index 7e26835fb..c629bc902 100644 --- a/src/crontab/src/Strategy/TaskWorkerStrategy.php +++ b/src/crontab/src/Strategy/TaskWorkerStrategy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Strategy; use Carbon\Carbon; diff --git a/src/crontab/src/Strategy/WorkerStrategy.php b/src/crontab/src/Strategy/WorkerStrategy.php index 191ed8536..bd676336b 100644 --- a/src/crontab/src/Strategy/WorkerStrategy.php +++ b/src/crontab/src/Strategy/WorkerStrategy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Crontab\Strategy; use Carbon\Carbon; diff --git a/src/crontab/tests/ExecutorTest.php b/src/crontab/tests/ExecutorTest.php index c676c7958..aebb4597d 100644 Binary files a/src/crontab/tests/ExecutorTest.php and b/src/crontab/tests/ExecutorTest.php differ diff --git a/src/crontab/tests/ParserCronNumberTest.php b/src/crontab/tests/ParserCronNumberTest.php index a23353438..7efb249a7 100644 --- a/src/crontab/tests/ParserCronNumberTest.php +++ b/src/crontab/tests/ParserCronNumberTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Crontab; use Hyperf\Crontab\Parser; diff --git a/src/crontab/tests/ParserTest.php b/src/crontab/tests/ParserTest.php index 25c7cc084..96e881248 100644 --- a/src/crontab/tests/ParserTest.php +++ b/src/crontab/tests/ParserTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Crontab; use Carbon\Carbon; diff --git a/src/crontab/tests/SchedulerTest.php b/src/crontab/tests/SchedulerTest.php index 08281d104..c7e0e0272 100644 --- a/src/crontab/tests/SchedulerTest.php +++ b/src/crontab/tests/SchedulerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Crontab; use Hyperf\Crontab\CrontabManager; diff --git a/src/database/src/Commands/Ast/ModelRewriteConnectionVisitor.php b/src/database/src/Commands/Ast/ModelRewriteConnectionVisitor.php index b67dfa0ae..0657cd4f7 100644 --- a/src/database/src/Commands/Ast/ModelRewriteConnectionVisitor.php +++ b/src/database/src/Commands/Ast/ModelRewriteConnectionVisitor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Ast; use PhpParser\Node; diff --git a/src/database/src/Commands/Ast/ModelRewriteInheritanceVisitor.php b/src/database/src/Commands/Ast/ModelRewriteInheritanceVisitor.php index 855a54b77..85ae553c6 100644 --- a/src/database/src/Commands/Ast/ModelRewriteInheritanceVisitor.php +++ b/src/database/src/Commands/Ast/ModelRewriteInheritanceVisitor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Ast; use Hyperf\Database\Commands\ModelData; diff --git a/src/database/src/Commands/Ast/ModelUpdateVisitor.php b/src/database/src/Commands/Ast/ModelUpdateVisitor.php index b4b2a21eb..94b4d5f12 100644 --- a/src/database/src/Commands/Ast/ModelUpdateVisitor.php +++ b/src/database/src/Commands/Ast/ModelUpdateVisitor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Ast; use Hyperf\Database\Commands\ModelOption; diff --git a/src/database/src/Commands/Migrations/BaseCommand.php b/src/database/src/Commands/Migrations/BaseCommand.php index 6288c4705..ed9dda0e7 100755 --- a/src/database/src/Commands/Migrations/BaseCommand.php +++ b/src/database/src/Commands/Migrations/BaseCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Migrations; use Hyperf\Command\Command; diff --git a/src/database/src/Commands/Migrations/FreshCommand.php b/src/database/src/Commands/Migrations/FreshCommand.php index f47c4ea19..373b502f8 100644 --- a/src/database/src/Commands/Migrations/FreshCommand.php +++ b/src/database/src/Commands/Migrations/FreshCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Migrations; use Hyperf\Command\Command; diff --git a/src/database/src/Commands/Migrations/GenMigrateCommand.php b/src/database/src/Commands/Migrations/GenMigrateCommand.php index 7b558bb65..e4cf07208 100644 --- a/src/database/src/Commands/Migrations/GenMigrateCommand.php +++ b/src/database/src/Commands/Migrations/GenMigrateCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Migrations; use Hyperf\Database\Migrations\MigrationCreator; diff --git a/src/database/src/Commands/Migrations/InstallCommand.php b/src/database/src/Commands/Migrations/InstallCommand.php index d0a49b16a..1068df209 100755 --- a/src/database/src/Commands/Migrations/InstallCommand.php +++ b/src/database/src/Commands/Migrations/InstallCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Migrations; use Hyperf\Database\Migrations\MigrationRepositoryInterface; diff --git a/src/database/src/Commands/Migrations/MigrateCommand.php b/src/database/src/Commands/Migrations/MigrateCommand.php index 124e97035..3e0c76916 100755 --- a/src/database/src/Commands/Migrations/MigrateCommand.php +++ b/src/database/src/Commands/Migrations/MigrateCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Migrations; use Hyperf\Command\ConfirmableTrait; diff --git a/src/database/src/Commands/Migrations/RefreshCommand.php b/src/database/src/Commands/Migrations/RefreshCommand.php index 53348d6e2..e0e17f561 100755 --- a/src/database/src/Commands/Migrations/RefreshCommand.php +++ b/src/database/src/Commands/Migrations/RefreshCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Migrations; use Hyperf\Command\Command; @@ -53,7 +52,7 @@ class RefreshCommand extends Command // If the "step" option is specified it means we only want to rollback a small // number of migrations before migrating again. For example, the user might // only rollback and remigrate the latest four migrations instead of all. - $step = $this->input->getOption('step') ?: 0; + $step = (int) $this->input->getOption('step') ?: 0; if ($step > 0) { $this->runRollback($connection, $path, $step); diff --git a/src/database/src/Commands/Migrations/ResetCommand.php b/src/database/src/Commands/Migrations/ResetCommand.php index f431c8422..a9f251a70 100755 --- a/src/database/src/Commands/Migrations/ResetCommand.php +++ b/src/database/src/Commands/Migrations/ResetCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Migrations; use Hyperf\Command\ConfirmableTrait; diff --git a/src/database/src/Commands/Migrations/RollbackCommand.php b/src/database/src/Commands/Migrations/RollbackCommand.php index 3eaac537c..d4fb7dd68 100755 --- a/src/database/src/Commands/Migrations/RollbackCommand.php +++ b/src/database/src/Commands/Migrations/RollbackCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Migrations; use Hyperf\Command\ConfirmableTrait; diff --git a/src/database/src/Commands/Migrations/StatusCommand.php b/src/database/src/Commands/Migrations/StatusCommand.php index 073e8e324..6064b9b96 100644 --- a/src/database/src/Commands/Migrations/StatusCommand.php +++ b/src/database/src/Commands/Migrations/StatusCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Migrations; use Hyperf\Database\Migrations\Migrator; diff --git a/src/database/src/Commands/Migrations/TableGuesser.php b/src/database/src/Commands/Migrations/TableGuesser.php index edb5da02d..831587a54 100644 --- a/src/database/src/Commands/Migrations/TableGuesser.php +++ b/src/database/src/Commands/Migrations/TableGuesser.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Migrations; class TableGuesser diff --git a/src/database/src/Commands/ModelCommand.php b/src/database/src/Commands/ModelCommand.php index 83de02f1c..b055eee47 100644 --- a/src/database/src/Commands/ModelCommand.php +++ b/src/database/src/Commands/ModelCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands; use Hyperf\Command\Command; diff --git a/src/database/src/Commands/ModelData.php b/src/database/src/Commands/ModelData.php index b46b84439..a178e2b79 100644 --- a/src/database/src/Commands/ModelData.php +++ b/src/database/src/Commands/ModelData.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands; class ModelData diff --git a/src/database/src/Commands/ModelOption.php b/src/database/src/Commands/ModelOption.php index fa6cf91db..d0c9db8c0 100644 --- a/src/database/src/Commands/ModelOption.php +++ b/src/database/src/Commands/ModelOption.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands; class ModelOption diff --git a/src/database/src/Commands/Seeders/BaseCommand.php b/src/database/src/Commands/Seeders/BaseCommand.php index ce6486d79..9055c414c 100644 --- a/src/database/src/Commands/Seeders/BaseCommand.php +++ b/src/database/src/Commands/Seeders/BaseCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Seeders; use Hyperf\Command\Command; diff --git a/src/database/src/Commands/Seeders/GenSeederCommand.php b/src/database/src/Commands/Seeders/GenSeederCommand.php index df99015d5..db246488c 100644 --- a/src/database/src/Commands/Seeders/GenSeederCommand.php +++ b/src/database/src/Commands/Seeders/GenSeederCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Seeders; use Hyperf\Database\Seeders\SeederCreator; diff --git a/src/database/src/Commands/Seeders/SeedCommand.php b/src/database/src/Commands/Seeders/SeedCommand.php index a9c10cd21..4c88b0a8a 100644 --- a/src/database/src/Commands/Seeders/SeedCommand.php +++ b/src/database/src/Commands/Seeders/SeedCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Commands\Seeders; use Hyperf\Command\ConfirmableTrait; diff --git a/src/database/src/Concerns/BuildsQueries.php b/src/database/src/Concerns/BuildsQueries.php index 20e11feef..4c31e7f7d 100644 --- a/src/database/src/Concerns/BuildsQueries.php +++ b/src/database/src/Concerns/BuildsQueries.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Concerns; use Hyperf\Contract\LengthAwarePaginatorInterface; diff --git a/src/database/src/Concerns/ManagesTransactions.php b/src/database/src/Concerns/ManagesTransactions.php index 171f7f5c6..ce4b223ff 100644 --- a/src/database/src/Concerns/ManagesTransactions.php +++ b/src/database/src/Concerns/ManagesTransactions.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Concerns; use Closure; diff --git a/src/database/src/Connection.php b/src/database/src/Connection.php index 74c99f547..d9b6402ef 100755 --- a/src/database/src/Connection.php +++ b/src/database/src/Connection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database; use Closure; diff --git a/src/database/src/ConnectionInterface.php b/src/database/src/ConnectionInterface.php index 4d9f5189f..da5abcb04 100755 --- a/src/database/src/ConnectionInterface.php +++ b/src/database/src/ConnectionInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database; use Closure; diff --git a/src/database/src/ConnectionResolver.php b/src/database/src/ConnectionResolver.php index f3eb79eb6..30bb86e59 100755 --- a/src/database/src/ConnectionResolver.php +++ b/src/database/src/ConnectionResolver.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database; class ConnectionResolver implements ConnectionResolverInterface diff --git a/src/database/src/ConnectionResolverInterface.php b/src/database/src/ConnectionResolverInterface.php index 948e26ead..58958f02a 100755 --- a/src/database/src/ConnectionResolverInterface.php +++ b/src/database/src/ConnectionResolverInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database; interface ConnectionResolverInterface diff --git a/src/database/src/Connectors/ConnectionFactory.php b/src/database/src/Connectors/ConnectionFactory.php index 82ce2a9a8..10317cb4a 100755 --- a/src/database/src/Connectors/ConnectionFactory.php +++ b/src/database/src/Connectors/ConnectionFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Connectors; use Hyperf\Database\Connection; diff --git a/src/database/src/Connectors/Connector.php b/src/database/src/Connectors/Connector.php index 3543c8c17..3b6bf570d 100755 --- a/src/database/src/Connectors/Connector.php +++ b/src/database/src/Connectors/Connector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Connectors; use Doctrine\DBAL\Driver\PDOConnection; diff --git a/src/database/src/Connectors/ConnectorInterface.php b/src/database/src/Connectors/ConnectorInterface.php index 589014771..881cac9dd 100755 --- a/src/database/src/Connectors/ConnectorInterface.php +++ b/src/database/src/Connectors/ConnectorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Connectors; interface ConnectorInterface diff --git a/src/database/src/Connectors/MySqlConnector.php b/src/database/src/Connectors/MySqlConnector.php index 39f7dea41..70684bff5 100755 --- a/src/database/src/Connectors/MySqlConnector.php +++ b/src/database/src/Connectors/MySqlConnector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Connectors; use PDO; diff --git a/src/database/src/DetectsDeadlocks.php b/src/database/src/DetectsDeadlocks.php index b36cd74e8..abaf52038 100644 --- a/src/database/src/DetectsDeadlocks.php +++ b/src/database/src/DetectsDeadlocks.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database; use Exception; diff --git a/src/database/src/DetectsLostConnections.php b/src/database/src/DetectsLostConnections.php index 3ab7f0095..f30da1d68 100644 --- a/src/database/src/DetectsLostConnections.php +++ b/src/database/src/DetectsLostConnections.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database; use Hyperf\Utils\Str; diff --git a/src/database/src/Events/ConnectionEvent.php b/src/database/src/Events/ConnectionEvent.php index 26cea74a8..262ead05c 100644 --- a/src/database/src/Events/ConnectionEvent.php +++ b/src/database/src/Events/ConnectionEvent.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Events; abstract class ConnectionEvent diff --git a/src/database/src/Events/QueryExecuted.php b/src/database/src/Events/QueryExecuted.php index 43e047652..1ffed335f 100644 --- a/src/database/src/Events/QueryExecuted.php +++ b/src/database/src/Events/QueryExecuted.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Events; use Hyperf\Database\ConnectionInterface; diff --git a/src/database/src/Events/StatementPrepared.php b/src/database/src/Events/StatementPrepared.php index 6252f7371..5bee76d2c 100644 --- a/src/database/src/Events/StatementPrepared.php +++ b/src/database/src/Events/StatementPrepared.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Events; class StatementPrepared diff --git a/src/database/src/Events/TransactionBeginning.php b/src/database/src/Events/TransactionBeginning.php index b11921d11..9c3cda9ca 100644 --- a/src/database/src/Events/TransactionBeginning.php +++ b/src/database/src/Events/TransactionBeginning.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Events; class TransactionBeginning extends ConnectionEvent diff --git a/src/database/src/Events/TransactionCommitted.php b/src/database/src/Events/TransactionCommitted.php index dbdb2ff09..d122f5ab9 100644 --- a/src/database/src/Events/TransactionCommitted.php +++ b/src/database/src/Events/TransactionCommitted.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Events; class TransactionCommitted extends ConnectionEvent diff --git a/src/database/src/Events/TransactionRolledBack.php b/src/database/src/Events/TransactionRolledBack.php index 9ecbd3dd5..3e241f361 100644 --- a/src/database/src/Events/TransactionRolledBack.php +++ b/src/database/src/Events/TransactionRolledBack.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Events; class TransactionRolledBack extends ConnectionEvent diff --git a/src/database/src/Exception/QueryException.php b/src/database/src/Exception/QueryException.php index 805254c21..f8599d06d 100644 --- a/src/database/src/Exception/QueryException.php +++ b/src/database/src/Exception/QueryException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Exception; use Exception; diff --git a/src/database/src/Grammar.php b/src/database/src/Grammar.php index 54b753ef8..b3fc2b22e 100755 --- a/src/database/src/Grammar.php +++ b/src/database/src/Grammar.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database; use Hyperf\Database\Query\Expression; diff --git a/src/database/src/Migrations/DatabaseMigrationRepository.php b/src/database/src/Migrations/DatabaseMigrationRepository.php index ecc65b7fc..26b66cc9e 100755 --- a/src/database/src/Migrations/DatabaseMigrationRepository.php +++ b/src/database/src/Migrations/DatabaseMigrationRepository.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Migrations; use Hyperf\Database\ConnectionResolverInterface as Resolver; diff --git a/src/database/src/Migrations/Migration.php b/src/database/src/Migrations/Migration.php index 923b46733..f534b2932 100755 --- a/src/database/src/Migrations/Migration.php +++ b/src/database/src/Migrations/Migration.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Migrations; abstract class Migration diff --git a/src/database/src/Migrations/MigrationCreator.php b/src/database/src/Migrations/MigrationCreator.php index 91f3b7ab7..fe02c982f 100755 --- a/src/database/src/Migrations/MigrationCreator.php +++ b/src/database/src/Migrations/MigrationCreator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Migrations; use Closure; diff --git a/src/database/src/Migrations/MigrationRepositoryInterface.php b/src/database/src/Migrations/MigrationRepositoryInterface.php index 843bb8204..69ee7be69 100755 --- a/src/database/src/Migrations/MigrationRepositoryInterface.php +++ b/src/database/src/Migrations/MigrationRepositoryInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Migrations; interface MigrationRepositoryInterface diff --git a/src/database/src/Migrations/Migrator.php b/src/database/src/Migrations/Migrator.php index 1454ffb21..4f1fc71bd 100755 --- a/src/database/src/Migrations/Migrator.php +++ b/src/database/src/Migrations/Migrator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Migrations; use Hyperf\Database\Connection; diff --git a/src/database/src/Model/Booted.php b/src/database/src/Model/Booted.php index cf83a4844..d7cdd6be3 100644 --- a/src/database/src/Model/Booted.php +++ b/src/database/src/Model/Booted.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; class Booted diff --git a/src/database/src/Model/Builder.php b/src/database/src/Model/Builder.php index b6603a74e..346161a12 100755 --- a/src/database/src/Model/Builder.php +++ b/src/database/src/Model/Builder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use BadMethodCallException; diff --git a/src/database/src/Model/Collection.php b/src/database/src/Model/Collection.php index 169d63f31..862e0e617 100755 --- a/src/database/src/Model/Collection.php +++ b/src/database/src/Model/Collection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use Hyperf\Contract\CompressInterface; diff --git a/src/database/src/Model/CollectionMeta.php b/src/database/src/Model/CollectionMeta.php index 0d94d5db6..2470d1046 100644 --- a/src/database/src/Model/CollectionMeta.php +++ b/src/database/src/Model/CollectionMeta.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use Hyperf\Contract\CompressInterface; diff --git a/src/database/src/Model/Concerns/CamelCase.php b/src/database/src/Model/Concerns/CamelCase.php index f440c8f69..5eed2257e 100644 --- a/src/database/src/Model/Concerns/CamelCase.php +++ b/src/database/src/Model/Concerns/CamelCase.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Concerns; use Hyperf\Utils\Str; diff --git a/src/database/src/Model/Concerns/GuardsAttributes.php b/src/database/src/Model/Concerns/GuardsAttributes.php index 5bc299b01..9da166e49 100644 --- a/src/database/src/Model/Concerns/GuardsAttributes.php +++ b/src/database/src/Model/Concerns/GuardsAttributes.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Concerns; use Hyperf\Utils\Str; diff --git a/src/database/src/Model/Concerns/HasAttributes.php b/src/database/src/Model/Concerns/HasAttributes.php index 8110c8737..b616bf141 100644 --- a/src/database/src/Model/Concerns/HasAttributes.php +++ b/src/database/src/Model/Concerns/HasAttributes.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Concerns; use Carbon\Carbon; diff --git a/src/database/src/Model/Concerns/HasEvents.php b/src/database/src/Model/Concerns/HasEvents.php index 81f0ac8ca..9cda3d4bd 100644 --- a/src/database/src/Model/Concerns/HasEvents.php +++ b/src/database/src/Model/Concerns/HasEvents.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Concerns; use Hyperf\Database\Model\Events\Booted; diff --git a/src/database/src/Model/Concerns/HasGlobalScopes.php b/src/database/src/Model/Concerns/HasGlobalScopes.php index 2b406bb10..e5f974caa 100644 --- a/src/database/src/Model/Concerns/HasGlobalScopes.php +++ b/src/database/src/Model/Concerns/HasGlobalScopes.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Concerns; use Closure; diff --git a/src/database/src/Model/Concerns/HasRelationships.php b/src/database/src/Model/Concerns/HasRelationships.php index d2d53c3e7..fdfcee9aa 100644 --- a/src/database/src/Model/Concerns/HasRelationships.php +++ b/src/database/src/Model/Concerns/HasRelationships.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Concerns; use Hyperf\Database\Model\Builder; diff --git a/src/database/src/Model/Concerns/HasTimestamps.php b/src/database/src/Model/Concerns/HasTimestamps.php index b4bd4f957..e8e69f48b 100644 --- a/src/database/src/Model/Concerns/HasTimestamps.php +++ b/src/database/src/Model/Concerns/HasTimestamps.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Concerns; use Carbon\Carbon; diff --git a/src/database/src/Model/Concerns/HidesAttributes.php b/src/database/src/Model/Concerns/HidesAttributes.php index 5abe38812..b854341f3 100644 --- a/src/database/src/Model/Concerns/HidesAttributes.php +++ b/src/database/src/Model/Concerns/HidesAttributes.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Concerns; trait HidesAttributes diff --git a/src/database/src/Model/Concerns/QueriesRelationships.php b/src/database/src/Model/Concerns/QueriesRelationships.php index 6423a92f7..4eaf0d3a3 100644 --- a/src/database/src/Model/Concerns/QueriesRelationships.php +++ b/src/database/src/Model/Concerns/QueriesRelationships.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Concerns; use Closure; diff --git a/src/database/src/Model/Events/Booted.php b/src/database/src/Model/Events/Booted.php index 6848585f2..e426963e3 100644 --- a/src/database/src/Model/Events/Booted.php +++ b/src/database/src/Model/Events/Booted.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Booted extends Event diff --git a/src/database/src/Model/Events/Booting.php b/src/database/src/Model/Events/Booting.php index f9a1770e2..13676b1f3 100644 --- a/src/database/src/Model/Events/Booting.php +++ b/src/database/src/Model/Events/Booting.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Booting extends Event diff --git a/src/database/src/Model/Events/Created.php b/src/database/src/Model/Events/Created.php index 4e4213058..02fad5fc7 100644 --- a/src/database/src/Model/Events/Created.php +++ b/src/database/src/Model/Events/Created.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Created extends Event diff --git a/src/database/src/Model/Events/Creating.php b/src/database/src/Model/Events/Creating.php index 4d7b75f63..c02c5941f 100644 --- a/src/database/src/Model/Events/Creating.php +++ b/src/database/src/Model/Events/Creating.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Creating extends Event diff --git a/src/database/src/Model/Events/Deleted.php b/src/database/src/Model/Events/Deleted.php index 29d0f38a9..881b0abfb 100644 --- a/src/database/src/Model/Events/Deleted.php +++ b/src/database/src/Model/Events/Deleted.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Deleted extends Event diff --git a/src/database/src/Model/Events/Deleting.php b/src/database/src/Model/Events/Deleting.php index b55b1f184..c091e8832 100644 --- a/src/database/src/Model/Events/Deleting.php +++ b/src/database/src/Model/Events/Deleting.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Deleting extends Event diff --git a/src/database/src/Model/Events/Event.php b/src/database/src/Model/Events/Event.php index 96bf1a23f..fbe0ccf11 100644 --- a/src/database/src/Model/Events/Event.php +++ b/src/database/src/Model/Events/Event.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; use Hyperf\Database\Model\Model; diff --git a/src/database/src/Model/Events/ForceDeleted.php b/src/database/src/Model/Events/ForceDeleted.php index ffb58da09..a479ea3be 100644 --- a/src/database/src/Model/Events/ForceDeleted.php +++ b/src/database/src/Model/Events/ForceDeleted.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class ForceDeleted extends Event diff --git a/src/database/src/Model/Events/Restored.php b/src/database/src/Model/Events/Restored.php index eea1bffc4..cc87b0a0d 100644 --- a/src/database/src/Model/Events/Restored.php +++ b/src/database/src/Model/Events/Restored.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Restored extends Event diff --git a/src/database/src/Model/Events/Restoring.php b/src/database/src/Model/Events/Restoring.php index a3daf2d87..88e0beba4 100644 --- a/src/database/src/Model/Events/Restoring.php +++ b/src/database/src/Model/Events/Restoring.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Restoring extends Event diff --git a/src/database/src/Model/Events/Retrieved.php b/src/database/src/Model/Events/Retrieved.php index c847e780a..2044258ee 100644 --- a/src/database/src/Model/Events/Retrieved.php +++ b/src/database/src/Model/Events/Retrieved.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Retrieved extends Event diff --git a/src/database/src/Model/Events/Saved.php b/src/database/src/Model/Events/Saved.php index ce5efc309..05ee44e71 100644 --- a/src/database/src/Model/Events/Saved.php +++ b/src/database/src/Model/Events/Saved.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Saved extends Event diff --git a/src/database/src/Model/Events/Saving.php b/src/database/src/Model/Events/Saving.php index 2e8a8011a..41ee8d4ba 100644 --- a/src/database/src/Model/Events/Saving.php +++ b/src/database/src/Model/Events/Saving.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Saving extends Event diff --git a/src/database/src/Model/Events/Updated.php b/src/database/src/Model/Events/Updated.php index 2b1d2ea1c..bc3c4d502 100644 --- a/src/database/src/Model/Events/Updated.php +++ b/src/database/src/Model/Events/Updated.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Updated extends Event diff --git a/src/database/src/Model/Events/Updating.php b/src/database/src/Model/Events/Updating.php index aa8da91cb..4fb8e7888 100644 --- a/src/database/src/Model/Events/Updating.php +++ b/src/database/src/Model/Events/Updating.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Events; class Updating extends Event diff --git a/src/database/src/Model/Factory.php b/src/database/src/Model/Factory.php index 21753979d..25663878c 100644 --- a/src/database/src/Model/Factory.php +++ b/src/database/src/Model/Factory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use ArrayAccess; diff --git a/src/database/src/Model/FactoryBuilder.php b/src/database/src/Model/FactoryBuilder.php index 96f115212..c128b642a 100644 --- a/src/database/src/Model/FactoryBuilder.php +++ b/src/database/src/Model/FactoryBuilder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use Faker\Generator as Faker; diff --git a/src/database/src/Model/GlobalScope.php b/src/database/src/Model/GlobalScope.php index 966951092..71ddf7841 100644 --- a/src/database/src/Model/GlobalScope.php +++ b/src/database/src/Model/GlobalScope.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; class GlobalScope diff --git a/src/database/src/Model/IgnoreOnTouch.php b/src/database/src/Model/IgnoreOnTouch.php index 0bdcc436f..f3618ab25 100644 --- a/src/database/src/Model/IgnoreOnTouch.php +++ b/src/database/src/Model/IgnoreOnTouch.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; class IgnoreOnTouch diff --git a/src/database/src/Model/JsonEncodingException.php b/src/database/src/Model/JsonEncodingException.php index 03080ea03..0198fe017 100644 --- a/src/database/src/Model/JsonEncodingException.php +++ b/src/database/src/Model/JsonEncodingException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use RuntimeException; diff --git a/src/database/src/Model/MassAssignmentException.php b/src/database/src/Model/MassAssignmentException.php index 20cfd1e36..4d77f293c 100755 --- a/src/database/src/Model/MassAssignmentException.php +++ b/src/database/src/Model/MassAssignmentException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use RuntimeException; diff --git a/src/database/src/Model/Model.php b/src/database/src/Model/Model.php index d9e098932..492d216e8 100644 --- a/src/database/src/Model/Model.php +++ b/src/database/src/Model/Model.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use ArrayAccess; diff --git a/src/database/src/Model/ModelMeta.php b/src/database/src/Model/ModelMeta.php index dad5675ff..3f8032858 100644 --- a/src/database/src/Model/ModelMeta.php +++ b/src/database/src/Model/ModelMeta.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use Hyperf\Contract\CompressInterface; diff --git a/src/database/src/Model/ModelNotFoundException.php b/src/database/src/Model/ModelNotFoundException.php index 1b6cce640..ef13d1a71 100755 --- a/src/database/src/Model/ModelNotFoundException.php +++ b/src/database/src/Model/ModelNotFoundException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use Hyperf\Utils\Arr; diff --git a/src/database/src/Model/Register.php b/src/database/src/Model/Register.php index a490f4ef8..12e0dae43 100644 --- a/src/database/src/Model/Register.php +++ b/src/database/src/Model/Register.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use Hyperf\Database\ConnectionInterface; diff --git a/src/database/src/Model/RelationNotFoundException.php b/src/database/src/Model/RelationNotFoundException.php index a7b418f74..8545cc5fd 100755 --- a/src/database/src/Model/RelationNotFoundException.php +++ b/src/database/src/Model/RelationNotFoundException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use RuntimeException; diff --git a/src/database/src/Model/Relations/BelongsTo.php b/src/database/src/Model/Relations/BelongsTo.php index 9b56963a2..dfb7a23ba 100755 --- a/src/database/src/Model/Relations/BelongsTo.php +++ b/src/database/src/Model/Relations/BelongsTo.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Database\Model\Builder; diff --git a/src/database/src/Model/Relations/BelongsToMany.php b/src/database/src/Model/Relations/BelongsToMany.php index 1aa89eb02..62fdf8dfd 100755 --- a/src/database/src/Model/Relations/BelongsToMany.php +++ b/src/database/src/Model/Relations/BelongsToMany.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Contract\LengthAwarePaginatorInterface; diff --git a/src/database/src/Model/Relations/Concerns/AsPivot.php b/src/database/src/Model/Relations/Concerns/AsPivot.php index 091f6a2e0..89488adc4 100644 --- a/src/database/src/Model/Relations/Concerns/AsPivot.php +++ b/src/database/src/Model/Relations/Concerns/AsPivot.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations\Concerns; use Hyperf\Database\Model\Builder; diff --git a/src/database/src/Model/Relations/Concerns/InteractsWithPivotTable.php b/src/database/src/Model/Relations/Concerns/InteractsWithPivotTable.php index d42ef7e0e..e8810ddda 100644 --- a/src/database/src/Model/Relations/Concerns/InteractsWithPivotTable.php +++ b/src/database/src/Model/Relations/Concerns/InteractsWithPivotTable.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations\Concerns; use Hyperf\Database\Model\Collection; diff --git a/src/database/src/Model/Relations/Concerns/SupportsDefaultModels.php b/src/database/src/Model/Relations/Concerns/SupportsDefaultModels.php index 23c34cfe2..ad6ce5229 100644 --- a/src/database/src/Model/Relations/Concerns/SupportsDefaultModels.php +++ b/src/database/src/Model/Relations/Concerns/SupportsDefaultModels.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations\Concerns; use Hyperf\Database\Model\Model; diff --git a/src/database/src/Model/Relations/HasMany.php b/src/database/src/Model/Relations/HasMany.php index 421ca3057..315d72732 100755 --- a/src/database/src/Model/Relations/HasMany.php +++ b/src/database/src/Model/Relations/HasMany.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Database\Model\Collection; diff --git a/src/database/src/Model/Relations/HasManyThrough.php b/src/database/src/Model/Relations/HasManyThrough.php index 0fed6ab34..8c01df27b 100644 --- a/src/database/src/Model/Relations/HasManyThrough.php +++ b/src/database/src/Model/Relations/HasManyThrough.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Contract\LengthAwarePaginatorInterface; diff --git a/src/database/src/Model/Relations/HasOne.php b/src/database/src/Model/Relations/HasOne.php index ab0fca22c..20e03e5d4 100755 --- a/src/database/src/Model/Relations/HasOne.php +++ b/src/database/src/Model/Relations/HasOne.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Database\Model\Collection; diff --git a/src/database/src/Model/Relations/HasOneOrMany.php b/src/database/src/Model/Relations/HasOneOrMany.php index aae6072ec..ad0f9e5ab 100755 --- a/src/database/src/Model/Relations/HasOneOrMany.php +++ b/src/database/src/Model/Relations/HasOneOrMany.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Database\Model\Builder; diff --git a/src/database/src/Model/Relations/HasOneThrough.php b/src/database/src/Model/Relations/HasOneThrough.php index d84997c76..651434c50 100644 --- a/src/database/src/Model/Relations/HasOneThrough.php +++ b/src/database/src/Model/Relations/HasOneThrough.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Database\Model\Collection; diff --git a/src/database/src/Model/Relations/MorphMany.php b/src/database/src/Model/Relations/MorphMany.php index 18778ffa4..1422f7df2 100755 --- a/src/database/src/Model/Relations/MorphMany.php +++ b/src/database/src/Model/Relations/MorphMany.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Database\Model\Collection; diff --git a/src/database/src/Model/Relations/MorphOne.php b/src/database/src/Model/Relations/MorphOne.php index bc679f4f5..526a8a83f 100755 --- a/src/database/src/Model/Relations/MorphOne.php +++ b/src/database/src/Model/Relations/MorphOne.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Database\Model\Collection; diff --git a/src/database/src/Model/Relations/MorphOneOrMany.php b/src/database/src/Model/Relations/MorphOneOrMany.php index 73176387e..b6f492735 100755 --- a/src/database/src/Model/Relations/MorphOneOrMany.php +++ b/src/database/src/Model/Relations/MorphOneOrMany.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Database\Model\Builder; diff --git a/src/database/src/Model/Relations/MorphPivot.php b/src/database/src/Model/Relations/MorphPivot.php index 0ebb399e7..4826a3a07 100644 --- a/src/database/src/Model/Relations/MorphPivot.php +++ b/src/database/src/Model/Relations/MorphPivot.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Database\Model\Builder; diff --git a/src/database/src/Model/Relations/MorphTo.php b/src/database/src/Model/Relations/MorphTo.php index 05fc246bc..4a740d867 100644 --- a/src/database/src/Model/Relations/MorphTo.php +++ b/src/database/src/Model/Relations/MorphTo.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use BadMethodCallException; diff --git a/src/database/src/Model/Relations/MorphToMany.php b/src/database/src/Model/Relations/MorphToMany.php index 889c15786..ae9e5e5ee 100644 --- a/src/database/src/Model/Relations/MorphToMany.php +++ b/src/database/src/Model/Relations/MorphToMany.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Database\Model\Builder; diff --git a/src/database/src/Model/Relations/Pivot.php b/src/database/src/Model/Relations/Pivot.php index b41574c23..a278ee160 100755 --- a/src/database/src/Model/Relations/Pivot.php +++ b/src/database/src/Model/Relations/Pivot.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Hyperf\Database\Model\Model; diff --git a/src/database/src/Model/Relations/Relation.php b/src/database/src/Model/Relations/Relation.php index da55da832..d988fe825 100755 --- a/src/database/src/Model/Relations/Relation.php +++ b/src/database/src/Model/Relations/Relation.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model\Relations; use Closure; diff --git a/src/database/src/Model/Scope.php b/src/database/src/Model/Scope.php index 87d094cd2..711524c06 100644 --- a/src/database/src/Model/Scope.php +++ b/src/database/src/Model/Scope.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; interface Scope diff --git a/src/database/src/Model/SoftDeletes.php b/src/database/src/Model/SoftDeletes.php index 03cba9449..a9f9464df 100644 --- a/src/database/src/Model/SoftDeletes.php +++ b/src/database/src/Model/SoftDeletes.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; use Psr\EventDispatcher\StoppableEventInterface; diff --git a/src/database/src/Model/SoftDeletingScope.php b/src/database/src/Model/SoftDeletingScope.php index b459c975b..84b3007be 100644 --- a/src/database/src/Model/SoftDeletingScope.php +++ b/src/database/src/Model/SoftDeletingScope.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; class SoftDeletingScope implements Scope diff --git a/src/database/src/Model/TraitInitializers.php b/src/database/src/Model/TraitInitializers.php index 5cfd40740..6c5fba195 100644 --- a/src/database/src/Model/TraitInitializers.php +++ b/src/database/src/Model/TraitInitializers.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Model; class TraitInitializers diff --git a/src/database/src/MySqlConnection.php b/src/database/src/MySqlConnection.php index d3e13ee54..34a08b629 100755 --- a/src/database/src/MySqlConnection.php +++ b/src/database/src/MySqlConnection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database; use Doctrine\DBAL\Driver\PDOMySql\Driver as DoctrineDriver; diff --git a/src/database/src/Query/Builder.php b/src/database/src/Query/Builder.php index 6463daed8..178fee2be 100755 --- a/src/database/src/Query/Builder.php +++ b/src/database/src/Query/Builder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Query; use Closure; diff --git a/src/database/src/Query/Expression.php b/src/database/src/Query/Expression.php index 68560a322..c8ecd5da4 100755 --- a/src/database/src/Query/Expression.php +++ b/src/database/src/Query/Expression.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Query; class Expression diff --git a/src/database/src/Query/Grammars/Grammar.php b/src/database/src/Query/Grammars/Grammar.php index 429dbd9dd..58ee2d9d1 100755 --- a/src/database/src/Query/Grammars/Grammar.php +++ b/src/database/src/Query/Grammars/Grammar.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Query\Grammars; use Hyperf\Database\Grammar as BaseGrammar; diff --git a/src/database/src/Query/Grammars/MySqlGrammar.php b/src/database/src/Query/Grammars/MySqlGrammar.php index f722a29c9..d7dc63c00 100755 --- a/src/database/src/Query/Grammars/MySqlGrammar.php +++ b/src/database/src/Query/Grammars/MySqlGrammar.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Query\Grammars; use Hyperf\Database\Query\Builder; diff --git a/src/database/src/Query/JoinClause.php b/src/database/src/Query/JoinClause.php index 5adbbe6e3..c8d2d2165 100755 --- a/src/database/src/Query/JoinClause.php +++ b/src/database/src/Query/JoinClause.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Query; use Closure; diff --git a/src/database/src/Query/JsonExpression.php b/src/database/src/Query/JsonExpression.php index a82c9a8bb..253b87f07 100644 --- a/src/database/src/Query/JsonExpression.php +++ b/src/database/src/Query/JsonExpression.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Query; use InvalidArgumentException; diff --git a/src/database/src/Query/Processors/MySqlProcessor.php b/src/database/src/Query/Processors/MySqlProcessor.php index 46e339655..de7351227 100644 --- a/src/database/src/Query/Processors/MySqlProcessor.php +++ b/src/database/src/Query/Processors/MySqlProcessor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Query\Processors; use Hyperf\Database\Schema\Column; diff --git a/src/database/src/Query/Processors/Processor.php b/src/database/src/Query/Processors/Processor.php index d4a940fb6..0a3f9f207 100755 --- a/src/database/src/Query/Processors/Processor.php +++ b/src/database/src/Query/Processors/Processor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Query\Processors; use Hyperf\Database\Query\Builder; diff --git a/src/database/src/Schema/Blueprint.php b/src/database/src/Schema/Blueprint.php index d80dcdec7..d377d81a8 100755 --- a/src/database/src/Schema/Blueprint.php +++ b/src/database/src/Schema/Blueprint.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Schema; use BadMethodCallException; diff --git a/src/database/src/Schema/Builder.php b/src/database/src/Schema/Builder.php index ba3a2e03b..dcbc8a034 100755 --- a/src/database/src/Schema/Builder.php +++ b/src/database/src/Schema/Builder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Schema; use Closure; diff --git a/src/database/src/Schema/Column.php b/src/database/src/Schema/Column.php index 302610e6a..7a6a76b57 100644 --- a/src/database/src/Schema/Column.php +++ b/src/database/src/Schema/Column.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Schema; class Column diff --git a/src/database/src/Schema/ColumnDefinition.php b/src/database/src/Schema/ColumnDefinition.php index 1af898877..5bff141f4 100644 --- a/src/database/src/Schema/ColumnDefinition.php +++ b/src/database/src/Schema/ColumnDefinition.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Schema; use Hyperf\Utils\Fluent; diff --git a/src/database/src/Schema/ForeignKeyDefinition.php b/src/database/src/Schema/ForeignKeyDefinition.php index c28d81a4f..0ee3345f0 100644 --- a/src/database/src/Schema/ForeignKeyDefinition.php +++ b/src/database/src/Schema/ForeignKeyDefinition.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Schema; use Hyperf\Utils\Fluent; diff --git a/src/database/src/Schema/Grammars/ChangeColumn.php b/src/database/src/Schema/Grammars/ChangeColumn.php index 0c513cfb1..731d04248 100644 --- a/src/database/src/Schema/Grammars/ChangeColumn.php +++ b/src/database/src/Schema/Grammars/ChangeColumn.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Schema\Grammars; use Doctrine\DBAL\Schema\AbstractSchemaManager as SchemaManager; diff --git a/src/database/src/Schema/Grammars/Grammar.php b/src/database/src/Schema/Grammars/Grammar.php index a8c742c2d..258d7cc20 100755 --- a/src/database/src/Schema/Grammars/Grammar.php +++ b/src/database/src/Schema/Grammars/Grammar.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Schema\Grammars; use Doctrine\DBAL\Schema\AbstractSchemaManager as SchemaManager; diff --git a/src/database/src/Schema/Grammars/MySqlGrammar.php b/src/database/src/Schema/Grammars/MySqlGrammar.php index d4000d3cb..143554199 100755 --- a/src/database/src/Schema/Grammars/MySqlGrammar.php +++ b/src/database/src/Schema/Grammars/MySqlGrammar.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Schema\Grammars; use Hyperf\Database\Connection; diff --git a/src/database/src/Schema/Grammars/RenameColumn.php b/src/database/src/Schema/Grammars/RenameColumn.php index 5e534948f..3c9eabe16 100644 --- a/src/database/src/Schema/Grammars/RenameColumn.php +++ b/src/database/src/Schema/Grammars/RenameColumn.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Schema\Grammars; use Doctrine\DBAL\Schema\AbstractSchemaManager as SchemaManager; diff --git a/src/database/src/Schema/MySqlBuilder.php b/src/database/src/Schema/MySqlBuilder.php index b93e40d6c..97826f088 100755 --- a/src/database/src/Schema/MySqlBuilder.php +++ b/src/database/src/Schema/MySqlBuilder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Schema; use Hyperf\Database\Query\Processors\MySqlProcessor; diff --git a/src/database/src/Schema/Schema.php b/src/database/src/Schema/Schema.php index b07b7ee35..ac90918c2 100644 --- a/src/database/src/Schema/Schema.php +++ b/src/database/src/Schema/Schema.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Schema; use Hyperf\Database\ConnectionInterface; diff --git a/src/database/src/Seeders/Seed.php b/src/database/src/Seeders/Seed.php index 260d4596c..dc044e37c 100644 --- a/src/database/src/Seeders/Seed.php +++ b/src/database/src/Seeders/Seed.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Seeders; use Hyperf\Database\Connection; diff --git a/src/database/src/Seeders/Seeder.php b/src/database/src/Seeders/Seeder.php index d7c556f73..18e706f87 100644 --- a/src/database/src/Seeders/Seeder.php +++ b/src/database/src/Seeders/Seeder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Seeders; abstract class Seeder diff --git a/src/database/src/Seeders/SeederCreator.php b/src/database/src/Seeders/SeederCreator.php index 20c54b80d..ebeedf8bc 100644 --- a/src/database/src/Seeders/SeederCreator.php +++ b/src/database/src/Seeders/SeederCreator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Database\Seeders; use Hyperf\Utils\Filesystem\Filesystem; diff --git a/src/database/tests/ConnectionTest.php b/src/database/tests/ConnectionTest.php index a0d336d37..d68c7e4b2 100644 --- a/src/database/tests/ConnectionTest.php +++ b/src/database/tests/ConnectionTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Hyperf\Database\Connection; diff --git a/src/database/tests/DatabaseGenMigrationCommandTest.php b/src/database/tests/DatabaseGenMigrationCommandTest.php index e5a82f180..073e55cfe 100755 --- a/src/database/tests/DatabaseGenMigrationCommandTest.php +++ b/src/database/tests/DatabaseGenMigrationCommandTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Hyperf\Database\Commands\Migrations\GenMigrateCommand; diff --git a/src/database/tests/DatabaseMigrationCreatorTest.php b/src/database/tests/DatabaseMigrationCreatorTest.php index 466db109d..995b02fe7 100755 --- a/src/database/tests/DatabaseMigrationCreatorTest.php +++ b/src/database/tests/DatabaseMigrationCreatorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Hyperf\Database\Migrations\MigrationCreator; diff --git a/src/database/tests/DatabaseMigrationInstallCommandTest.php b/src/database/tests/DatabaseMigrationInstallCommandTest.php index 20b2ad1b3..8a2a3eef8 100755 --- a/src/database/tests/DatabaseMigrationInstallCommandTest.php +++ b/src/database/tests/DatabaseMigrationInstallCommandTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Hyperf\Database\Commands\Migrations\InstallCommand; diff --git a/src/database/tests/DatabaseMigrationMigrateCommandTest.php b/src/database/tests/DatabaseMigrationMigrateCommandTest.php index a92bb1f11..409f54b99 100755 --- a/src/database/tests/DatabaseMigrationMigrateCommandTest.php +++ b/src/database/tests/DatabaseMigrationMigrateCommandTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Hyperf\Database\Commands\Migrations\MigrateCommand; diff --git a/src/database/tests/DatabaseMigrationRepositoryTest.php b/src/database/tests/DatabaseMigrationRepositoryTest.php index 6d28f07e1..aedc2f293 100755 --- a/src/database/tests/DatabaseMigrationRepositoryTest.php +++ b/src/database/tests/DatabaseMigrationRepositoryTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Closure; diff --git a/src/database/tests/DatabaseMigrationResetCommandTest.php b/src/database/tests/DatabaseMigrationResetCommandTest.php index e186b165b..1c5ab7772 100755 --- a/src/database/tests/DatabaseMigrationResetCommandTest.php +++ b/src/database/tests/DatabaseMigrationResetCommandTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Hyperf\Database\Commands\Migrations\ResetCommand; diff --git a/src/database/tests/DatabaseMigrationRollbackCommandTest.php b/src/database/tests/DatabaseMigrationRollbackCommandTest.php index cbf0801d9..e47bb4979 100755 --- a/src/database/tests/DatabaseMigrationRollbackCommandTest.php +++ b/src/database/tests/DatabaseMigrationRollbackCommandTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Hyperf\Database\Commands\Migrations\RollbackCommand; diff --git a/src/database/tests/DatabaseMigratorIntegrationTest.php b/src/database/tests/DatabaseMigratorIntegrationTest.php index 15330d5a8..4f7dfa64f 100644 --- a/src/database/tests/DatabaseMigratorIntegrationTest.php +++ b/src/database/tests/DatabaseMigratorIntegrationTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Hyperf\Database\ConnectionResolver; diff --git a/src/database/tests/ModelBuilderTest.php b/src/database/tests/ModelBuilderTest.php index f7c99315d..458687240 100755 --- a/src/database/tests/ModelBuilderTest.php +++ b/src/database/tests/ModelBuilderTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Carbon\Carbon; diff --git a/src/database/tests/ModelTest.php b/src/database/tests/ModelTest.php index bc6a18425..b759b4ea4 100644 --- a/src/database/tests/ModelTest.php +++ b/src/database/tests/ModelTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Carbon\Carbon; diff --git a/src/database/tests/MySqlProcessorTest.php b/src/database/tests/MySqlProcessorTest.php index 9df847353..f31033555 100644 --- a/src/database/tests/MySqlProcessorTest.php +++ b/src/database/tests/MySqlProcessorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Hyperf\Database\Connection; diff --git a/src/database/tests/ProcessorTest.php b/src/database/tests/ProcessorTest.php index cfca88de0..c6e504657 100644 --- a/src/database/tests/ProcessorTest.php +++ b/src/database/tests/ProcessorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Hyperf\Database\ConnectionInterface; diff --git a/src/database/tests/QueryBuilderTest.php b/src/database/tests/QueryBuilderTest.php index 058916c44..8d19334f7 100644 --- a/src/database/tests/QueryBuilderTest.php +++ b/src/database/tests/QueryBuilderTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database; use Hyperf\Database\ConnectionInterface; diff --git a/src/database/tests/Stubs/ContainerStub.php b/src/database/tests/Stubs/ContainerStub.php index 8082c6db6..87b964d59 100644 --- a/src/database/tests/Stubs/ContainerStub.php +++ b/src/database/tests/Stubs/ContainerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\ConnectionResolver; diff --git a/src/database/tests/Stubs/DateModelStub.php b/src/database/tests/Stubs/DateModelStub.php index 2b5ed67d1..74e428600 100644 --- a/src/database/tests/Stubs/DateModelStub.php +++ b/src/database/tests/Stubs/DateModelStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; class DateModelStub extends ModelStub diff --git a/src/database/tests/Stubs/DifferentConnectionModelStub.php b/src/database/tests/Stubs/DifferentConnectionModelStub.php index ac1aeecc6..5454572fe 100644 --- a/src/database/tests/Stubs/DifferentConnectionModelStub.php +++ b/src/database/tests/Stubs/DifferentConnectionModelStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; class DifferentConnectionModelStub extends ModelStub diff --git a/src/database/tests/Stubs/FooBarTrait.php b/src/database/tests/Stubs/FooBarTrait.php index 62b3e44a2..6f8258f2a 100644 --- a/src/database/tests/Stubs/FooBarTrait.php +++ b/src/database/tests/Stubs/FooBarTrait.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; trait FooBarTrait diff --git a/src/database/tests/Stubs/KeyTypeModelStub.php b/src/database/tests/Stubs/KeyTypeModelStub.php index be8ef2dc0..cc208f606 100644 --- a/src/database/tests/Stubs/KeyTypeModelStub.php +++ b/src/database/tests/Stubs/KeyTypeModelStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; class KeyTypeModelStub extends ModelStub diff --git a/src/database/tests/Stubs/MigrationCreatorFakeMigration.php b/src/database/tests/Stubs/MigrationCreatorFakeMigration.php index 955c09af8..69477d612 100644 --- a/src/database/tests/Stubs/MigrationCreatorFakeMigration.php +++ b/src/database/tests/Stubs/MigrationCreatorFakeMigration.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; class MigrationCreatorFakeMigration diff --git a/src/database/tests/Stubs/ModelAppendsStub.php b/src/database/tests/Stubs/ModelAppendsStub.php index b0791c7ee..60bd60a05 100644 --- a/src/database/tests/Stubs/ModelAppendsStub.php +++ b/src/database/tests/Stubs/ModelAppendsStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Model; diff --git a/src/database/tests/Stubs/ModelBootingTestStub.php b/src/database/tests/Stubs/ModelBootingTestStub.php index 20a5dd948..bde26419c 100644 --- a/src/database/tests/Stubs/ModelBootingTestStub.php +++ b/src/database/tests/Stubs/ModelBootingTestStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Booted; diff --git a/src/database/tests/Stubs/ModelCamelStub.php b/src/database/tests/Stubs/ModelCamelStub.php index d891e67ec..09cd2dc89 100644 --- a/src/database/tests/Stubs/ModelCamelStub.php +++ b/src/database/tests/Stubs/ModelCamelStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; class ModelCamelStub extends ModelStub diff --git a/src/database/tests/Stubs/ModelCastingStub.php b/src/database/tests/Stubs/ModelCastingStub.php index 3d474accb..a765b0ec6 100644 --- a/src/database/tests/Stubs/ModelCastingStub.php +++ b/src/database/tests/Stubs/ModelCastingStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Model; diff --git a/src/database/tests/Stubs/ModelDestroyStub.php b/src/database/tests/Stubs/ModelDestroyStub.php index f013c5dc6..9c8ede936 100644 --- a/src/database/tests/Stubs/ModelDestroyStub.php +++ b/src/database/tests/Stubs/ModelDestroyStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Builder; diff --git a/src/database/tests/Stubs/ModelDynamicHiddenStub.php b/src/database/tests/Stubs/ModelDynamicHiddenStub.php index 5bce32648..e78c87308 100644 --- a/src/database/tests/Stubs/ModelDynamicHiddenStub.php +++ b/src/database/tests/Stubs/ModelDynamicHiddenStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Model; diff --git a/src/database/tests/Stubs/ModelDynamicVisibleStub.php b/src/database/tests/Stubs/ModelDynamicVisibleStub.php index 8d56bf465..11ff7bcba 100644 --- a/src/database/tests/Stubs/ModelDynamicVisibleStub.php +++ b/src/database/tests/Stubs/ModelDynamicVisibleStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Model; diff --git a/src/database/tests/Stubs/ModelEventListenerStub.php b/src/database/tests/Stubs/ModelEventListenerStub.php index 8f6f81422..b742f3b18 100644 --- a/src/database/tests/Stubs/ModelEventListenerStub.php +++ b/src/database/tests/Stubs/ModelEventListenerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Events\Event; diff --git a/src/database/tests/Stubs/ModelEventObjectStub.php b/src/database/tests/Stubs/ModelEventObjectStub.php index 9841c3551..b9f1c846d 100644 --- a/src/database/tests/Stubs/ModelEventObjectStub.php +++ b/src/database/tests/Stubs/ModelEventObjectStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Model; diff --git a/src/database/tests/Stubs/ModelFindWithWritePdoStub.php b/src/database/tests/Stubs/ModelFindWithWritePdoStub.php index b91e8238f..74039c177 100644 --- a/src/database/tests/Stubs/ModelFindWithWritePdoStub.php +++ b/src/database/tests/Stubs/ModelFindWithWritePdoStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Builder; diff --git a/src/database/tests/Stubs/ModelGetMutatorsStub.php b/src/database/tests/Stubs/ModelGetMutatorsStub.php index a86a7ebfc..5952e34d0 100644 --- a/src/database/tests/Stubs/ModelGetMutatorsStub.php +++ b/src/database/tests/Stubs/ModelGetMutatorsStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Model; diff --git a/src/database/tests/Stubs/ModelHydrateRawStub.php b/src/database/tests/Stubs/ModelHydrateRawStub.php index 2b499024e..c8558bb12 100644 --- a/src/database/tests/Stubs/ModelHydrateRawStub.php +++ b/src/database/tests/Stubs/ModelHydrateRawStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\ConnectionInterface; diff --git a/src/database/tests/Stubs/ModelNamespacedStub.php b/src/database/tests/Stubs/ModelNamespacedStub.php index e20ae6b2a..3d75b67ab 100644 --- a/src/database/tests/Stubs/ModelNamespacedStub.php +++ b/src/database/tests/Stubs/ModelNamespacedStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Model; diff --git a/src/database/tests/Stubs/ModelNonIncrementingStub.php b/src/database/tests/Stubs/ModelNonIncrementingStub.php index 28d5801ff..121f704b0 100644 --- a/src/database/tests/Stubs/ModelNonIncrementingStub.php +++ b/src/database/tests/Stubs/ModelNonIncrementingStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Model; diff --git a/src/database/tests/Stubs/ModelObserverStub.php b/src/database/tests/Stubs/ModelObserverStub.php index 795674f65..8d1b91d04 100644 --- a/src/database/tests/Stubs/ModelObserverStub.php +++ b/src/database/tests/Stubs/ModelObserverStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Events\Updating; diff --git a/src/database/tests/Stubs/ModelSaveStub.php b/src/database/tests/Stubs/ModelSaveStub.php index c5d9ef216..3dc27829e 100644 --- a/src/database/tests/Stubs/ModelSaveStub.php +++ b/src/database/tests/Stubs/ModelSaveStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\ConnectionInterface; diff --git a/src/database/tests/Stubs/ModelSavingEventStub.php b/src/database/tests/Stubs/ModelSavingEventStub.php index 6185ddf8a..928c97851 100644 --- a/src/database/tests/Stubs/ModelSavingEventStub.php +++ b/src/database/tests/Stubs/ModelSavingEventStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Psr\EventDispatcher\StoppableEventInterface; diff --git a/src/database/tests/Stubs/ModelStub.php b/src/database/tests/Stubs/ModelStub.php index 65eba6841..755411781 100644 --- a/src/database/tests/Stubs/ModelStub.php +++ b/src/database/tests/Stubs/ModelStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Builder; diff --git a/src/database/tests/Stubs/ModelStubWithTrait.php b/src/database/tests/Stubs/ModelStubWithTrait.php index 1c055a550..0a17b9261 100644 --- a/src/database/tests/Stubs/ModelStubWithTrait.php +++ b/src/database/tests/Stubs/ModelStubWithTrait.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; class ModelStubWithTrait extends ModelStub diff --git a/src/database/tests/Stubs/ModelWithStub.php b/src/database/tests/Stubs/ModelWithStub.php index 3adc570a2..ad6232c8d 100644 --- a/src/database/tests/Stubs/ModelWithStub.php +++ b/src/database/tests/Stubs/ModelWithStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Builder; diff --git a/src/database/tests/Stubs/ModelWithoutRelationStub.php b/src/database/tests/Stubs/ModelWithoutRelationStub.php index 80523e7aa..09ae27abc 100644 --- a/src/database/tests/Stubs/ModelWithoutRelationStub.php +++ b/src/database/tests/Stubs/ModelWithoutRelationStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Model; diff --git a/src/database/tests/Stubs/ModelWithoutTableStub.php b/src/database/tests/Stubs/ModelWithoutTableStub.php index 3c11d96cf..bdea62e91 100644 --- a/src/database/tests/Stubs/ModelWithoutTableStub.php +++ b/src/database/tests/Stubs/ModelWithoutTableStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\Model\Model; diff --git a/src/database/tests/Stubs/NoConnectionModelStub.php b/src/database/tests/Stubs/NoConnectionModelStub.php index 3484c4eac..857a11407 100644 --- a/src/database/tests/Stubs/NoConnectionModelStub.php +++ b/src/database/tests/Stubs/NoConnectionModelStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; class NoConnectionModelStub extends ModelStub diff --git a/src/database/tests/Stubs/TestAnotherObserverStub.php b/src/database/tests/Stubs/TestAnotherObserverStub.php index 625636ebc..f0b5c0635 100644 --- a/src/database/tests/Stubs/TestAnotherObserverStub.php +++ b/src/database/tests/Stubs/TestAnotherObserverStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; class TestAnotherObserverStub diff --git a/src/database/tests/Stubs/TestObserverStub.php b/src/database/tests/Stubs/TestObserverStub.php index 063a8206d..6d31f4b5a 100644 --- a/src/database/tests/Stubs/TestObserverStub.php +++ b/src/database/tests/Stubs/TestObserverStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; class TestObserverStub diff --git a/src/database/tests/Stubs/User.php b/src/database/tests/Stubs/User.php index f366f32c6..050c2c748 100644 --- a/src/database/tests/Stubs/User.php +++ b/src/database/tests/Stubs/User.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Database\Stubs; use Hyperf\Database\ConnectionInterface; diff --git a/src/database/tests/migrations/one/2016_01_01_000000_create_users_table.php b/src/database/tests/migrations/one/2016_01_01_000000_create_users_table.php index 58ea169c9..f36148bbd 100644 --- a/src/database/tests/migrations/one/2016_01_01_000000_create_users_table.php +++ b/src/database/tests/migrations/one/2016_01_01_000000_create_users_table.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - use Hyperf\Database\Migrations\Migration; use Hyperf\Database\Schema\Blueprint; use Hyperf\Database\Schema\Schema; diff --git a/src/database/tests/migrations/one/2016_01_01_100000_create_password_resets_table.php b/src/database/tests/migrations/one/2016_01_01_100000_create_password_resets_table.php index fb8c81829..59bf161fe 100644 --- a/src/database/tests/migrations/one/2016_01_01_100000_create_password_resets_table.php +++ b/src/database/tests/migrations/one/2016_01_01_100000_create_password_resets_table.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - use Hyperf\Database\Migrations\Migration; use Hyperf\Database\Schema\Blueprint; use Hyperf\Database\Schema\Schema; diff --git a/src/database/tests/migrations/two/2016_01_01_200000_create_flights_table.php b/src/database/tests/migrations/two/2016_01_01_200000_create_flights_table.php index 278b3d060..ab997e1f0 100644 --- a/src/database/tests/migrations/two/2016_01_01_200000_create_flights_table.php +++ b/src/database/tests/migrations/two/2016_01_01_200000_create_flights_table.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - use Hyperf\Database\Migrations\Migration; use Hyperf\Database\Schema\Blueprint; use Hyperf\Database\Schema\Schema; diff --git a/src/db-connection/publish/DbQueryExecutedListener.php b/src/db-connection/publish/DbQueryExecutedListener.php index 7e7a7eb9a..468de7bd1 100644 --- a/src/db-connection/publish/DbQueryExecutedListener.php +++ b/src/db-connection/publish/DbQueryExecutedListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace App\Listener; use Hyperf\Database\Events\QueryExecuted; diff --git a/src/db-connection/publish/databases.php b/src/db-connection/publish/databases.php index dec8fc91a..f4eaaf577 100644 --- a/src/db-connection/publish/databases.php +++ b/src/db-connection/publish/databases.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'default' => [ 'driver' => env('DB_DRIVER', 'mysql'), diff --git a/src/db-connection/src/Annotation/Transactional.php b/src/db-connection/src/Annotation/Transactional.php index b414cad71..757c49514 100644 --- a/src/db-connection/src/Annotation/Transactional.php +++ b/src/db-connection/src/Annotation/Transactional.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/db-connection/src/Aspect/TransactionAspect.php b/src/db-connection/src/Aspect/TransactionAspect.php index 1c770ebca..5143b28a3 100644 --- a/src/db-connection/src/Aspect/TransactionAspect.php +++ b/src/db-connection/src/Aspect/TransactionAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection\Aspect; use Hyperf\DbConnection\Annotation\Transactional; diff --git a/src/db-connection/src/Collector/TableCollector.php b/src/db-connection/src/Collector/TableCollector.php index 2fb9f8161..696253b31 100644 --- a/src/db-connection/src/Collector/TableCollector.php +++ b/src/db-connection/src/Collector/TableCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection\Collector; use Hyperf\Database\Schema\Column; diff --git a/src/db-connection/src/ConfigProvider.php b/src/db-connection/src/ConfigProvider.php index 5af4f61c4..ad00d5324 100644 --- a/src/db-connection/src/ConfigProvider.php +++ b/src/db-connection/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection; use Hyperf\Database\Commands\Migrations\FreshCommand; diff --git a/src/db-connection/src/Connection.php b/src/db-connection/src/Connection.php index 3d2aa8645..4e23d39c8 100644 --- a/src/db-connection/src/Connection.php +++ b/src/db-connection/src/Connection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection; use Hyperf\Contract\ConnectionInterface; diff --git a/src/db-connection/src/ConnectionResolver.php b/src/db-connection/src/ConnectionResolver.php index fadd4aae7..ebad6c994 100644 --- a/src/db-connection/src/ConnectionResolver.php +++ b/src/db-connection/src/ConnectionResolver.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection; use Hyperf\Database\ConnectionInterface; diff --git a/src/db-connection/src/DatabaseMigrationRepositoryFactory.php b/src/db-connection/src/DatabaseMigrationRepositoryFactory.php index 54f400d2e..f5c488968 100644 --- a/src/db-connection/src/DatabaseMigrationRepositoryFactory.php +++ b/src/db-connection/src/DatabaseMigrationRepositoryFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection; use Hyperf\Contract\ConfigInterface; diff --git a/src/db-connection/src/Db.php b/src/db-connection/src/Db.php index 8a7df12a2..4e52d269e 100644 --- a/src/db-connection/src/Db.php +++ b/src/db-connection/src/Db.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection; use Generator; diff --git a/src/db-connection/src/Frequency.php b/src/db-connection/src/Frequency.php index 8b00c751b..6bcd379e2 100644 --- a/src/db-connection/src/Frequency.php +++ b/src/db-connection/src/Frequency.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection; use Hyperf\Pool\Frequency as DefaultFrequency; diff --git a/src/db-connection/src/Listener/InitTableCollectorListener.php b/src/db-connection/src/Listener/InitTableCollectorListener.php index 0c702d2d6..9e50f1ac0 100644 --- a/src/db-connection/src/Listener/InitTableCollectorListener.php +++ b/src/db-connection/src/Listener/InitTableCollectorListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection\Listener; use Hyperf\Command\Event\BeforeHandle; diff --git a/src/db-connection/src/Listener/RegisterConnectionResolverListener.php b/src/db-connection/src/Listener/RegisterConnectionResolverListener.php index 779d9336e..23c547aea 100644 --- a/src/db-connection/src/Listener/RegisterConnectionResolverListener.php +++ b/src/db-connection/src/Listener/RegisterConnectionResolverListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection\Listener; use Hyperf\Contract\ContainerInterface; diff --git a/src/db-connection/src/Model/Model.php b/src/db-connection/src/Model/Model.php index 3af2d11b0..ea3c6c361 100644 --- a/src/db-connection/src/Model/Model.php +++ b/src/db-connection/src/Model/Model.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection\Model; use Hyperf\Database\ConnectionInterface; diff --git a/src/db-connection/src/Pool/DbPool.php b/src/db-connection/src/Pool/DbPool.php index 4e0cd335d..1fe3ae6e6 100644 --- a/src/db-connection/src/Pool/DbPool.php +++ b/src/db-connection/src/Pool/DbPool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection\Pool; use Hyperf\Contract\ConfigInterface; diff --git a/src/db-connection/src/Pool/PoolFactory.php b/src/db-connection/src/Pool/PoolFactory.php index 82eeb323d..0ad905a8c 100644 --- a/src/db-connection/src/Pool/PoolFactory.php +++ b/src/db-connection/src/Pool/PoolFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection\Pool; use Hyperf\Di\Container; diff --git a/src/db-connection/src/Traits/DbConnection.php b/src/db-connection/src/Traits/DbConnection.php index 637caec7b..38e2e4e1c 100644 --- a/src/db-connection/src/Traits/DbConnection.php +++ b/src/db-connection/src/Traits/DbConnection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DbConnection\Traits; use Closure; diff --git a/src/db-connection/tests/ConnectionTest.php b/src/db-connection/tests/ConnectionTest.php index 97ee9f415..88e65be7b 100644 --- a/src/db-connection/tests/ConnectionTest.php +++ b/src/db-connection/tests/ConnectionTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DbConnection; use Hyperf\Contract\ConfigInterface; diff --git a/src/db-connection/tests/FooModel.php b/src/db-connection/tests/FooModel.php index ba2339efd..7610ca043 100644 --- a/src/db-connection/tests/FooModel.php +++ b/src/db-connection/tests/FooModel.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DbConnection; use Hyperf\DbConnection\Model\Model; diff --git a/src/db-connection/tests/FrequencyTest.php b/src/db-connection/tests/FrequencyTest.php index 432a8d343..15333a2e6 100644 --- a/src/db-connection/tests/FrequencyTest.php +++ b/src/db-connection/tests/FrequencyTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DbConnection; use Hyperf\DbConnection\Frequency; diff --git a/src/db-connection/tests/RelationTest.php b/src/db-connection/tests/RelationTest.php index e25480d76..ed3ff92eb 100644 --- a/src/db-connection/tests/RelationTest.php +++ b/src/db-connection/tests/RelationTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DbConnection; use Hyperf\Database\ConnectionResolverInterface; diff --git a/src/db-connection/tests/Stubs/ConnectionStub.php b/src/db-connection/tests/Stubs/ConnectionStub.php index f4fc4db17..b627c4e74 100644 --- a/src/db-connection/tests/Stubs/ConnectionStub.php +++ b/src/db-connection/tests/Stubs/ConnectionStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DbConnection\Stubs; use Hyperf\DbConnection\Connection; diff --git a/src/db-connection/tests/Stubs/ContainerStub.php b/src/db-connection/tests/Stubs/ContainerStub.php index 06711b279..e6e5bdd1a 100644 --- a/src/db-connection/tests/Stubs/ContainerStub.php +++ b/src/db-connection/tests/Stubs/ContainerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DbConnection\Stubs; use Hyperf\Config\Config; diff --git a/src/db-connection/tests/Stubs/FrequencyStub.php b/src/db-connection/tests/Stubs/FrequencyStub.php index ae75ee0bc..47d8ad765 100644 --- a/src/db-connection/tests/Stubs/FrequencyStub.php +++ b/src/db-connection/tests/Stubs/FrequencyStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DbConnection\Stubs; use Hyperf\DbConnection\Frequency; diff --git a/src/db-connection/tests/Stubs/MySqlConnectorStub.php b/src/db-connection/tests/Stubs/MySqlConnectorStub.php index d2aea17c6..6195ce313 100644 --- a/src/db-connection/tests/Stubs/MySqlConnectorStub.php +++ b/src/db-connection/tests/Stubs/MySqlConnectorStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DbConnection\Stubs; use Hyperf\Database\Connectors\MySqlConnector; diff --git a/src/db-connection/tests/Stubs/PDOStatementStub.php b/src/db-connection/tests/Stubs/PDOStatementStub.php index ff8cbd89b..4b07653d3 100644 --- a/src/db-connection/tests/Stubs/PDOStatementStub.php +++ b/src/db-connection/tests/Stubs/PDOStatementStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DbConnection\Stubs; use PDO; diff --git a/src/db-connection/tests/Stubs/PDOStub.php b/src/db-connection/tests/Stubs/PDOStub.php index f18a77580..90a424502 100644 --- a/src/db-connection/tests/Stubs/PDOStub.php +++ b/src/db-connection/tests/Stubs/PDOStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DbConnection\Stubs; class PDOStub extends \PDO diff --git a/src/db-connection/tests/TableCollectorTest.php b/src/db-connection/tests/TableCollectorTest.php index 013d4588a..db41ff45a 100644 --- a/src/db-connection/tests/TableCollectorTest.php +++ b/src/db-connection/tests/TableCollectorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DbConnection; use PHPUnit\Framework\TestCase; diff --git a/src/db/publish/db.php b/src/db/publish/db.php index 1025b891f..02f9aec53 100644 --- a/src/db/publish/db.php +++ b/src/db/publish/db.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'default' => [ 'driver' => 'pdo', diff --git a/src/db/src/AbstractConnection.php b/src/db/src/AbstractConnection.php index 19c09d9bd..c0ff008c6 100644 --- a/src/db/src/AbstractConnection.php +++ b/src/db/src/AbstractConnection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB; use Hyperf\Contract\StdoutLoggerInterface; @@ -58,6 +57,10 @@ abstract class AbstractConnection extends Connection implements ConnectionInterf public function retry(\Throwable $throwable, $name, $arguments) { + if ($this->transactionLevel() > 0) { + throw $throwable; + } + if ($this->causedByLostConnection($throwable)) { try { $this->reconnect(); diff --git a/src/db/src/ConfigProvider.php b/src/db/src/ConfigProvider.php index 64ada6636..cb7f98637 100644 --- a/src/db/src/ConfigProvider.php +++ b/src/db/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB; class ConfigProvider diff --git a/src/db/src/ConnectionInterface.php b/src/db/src/ConnectionInterface.php index a903fc667..72ce64eea 100644 --- a/src/db/src/ConnectionInterface.php +++ b/src/db/src/ConnectionInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB; interface ConnectionInterface diff --git a/src/db/src/DB.php b/src/db/src/DB.php index 21f736c21..fd73d2bfa 100644 --- a/src/db/src/DB.php +++ b/src/db/src/DB.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB; use Hyperf\DB\Pool\PoolFactory; diff --git a/src/db/src/DetectsLostConnections.php b/src/db/src/DetectsLostConnections.php index 9ff692825..7d405fe86 100644 --- a/src/db/src/DetectsLostConnections.php +++ b/src/db/src/DetectsLostConnections.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB; use Hyperf\Utils\Str; diff --git a/src/db/src/Exception/DriverNotFoundException.php b/src/db/src/Exception/DriverNotFoundException.php index 9927ce738..0c4c8c032 100644 --- a/src/db/src/Exception/DriverNotFoundException.php +++ b/src/db/src/Exception/DriverNotFoundException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB\Exception; class DriverNotFoundException extends RuntimeException diff --git a/src/db/src/Exception/QueryException.php b/src/db/src/Exception/QueryException.php index 8d5bbf69e..bb896c443 100644 --- a/src/db/src/Exception/QueryException.php +++ b/src/db/src/Exception/QueryException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB\Exception; class QueryException extends \PDOException diff --git a/src/db/src/Exception/RuntimeException.php b/src/db/src/Exception/RuntimeException.php index 4b09e33f2..ffe65058d 100644 --- a/src/db/src/Exception/RuntimeException.php +++ b/src/db/src/Exception/RuntimeException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB\Exception; class RuntimeException extends \RuntimeException diff --git a/src/db/src/Frequency.php b/src/db/src/Frequency.php index 2862bcae8..6b56c374c 100644 --- a/src/db/src/Frequency.php +++ b/src/db/src/Frequency.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB; use Hyperf\Pool\Frequency as DefaultFrequency; diff --git a/src/db/src/ManagesTransactions.php b/src/db/src/ManagesTransactions.php index 180fe5ca3..13a478b36 100644 --- a/src/db/src/ManagesTransactions.php +++ b/src/db/src/ManagesTransactions.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB; use Throwable; diff --git a/src/db/src/MySQLConnection.php b/src/db/src/MySQLConnection.php index 489107464..68fe81ba5 100644 --- a/src/db/src/MySQLConnection.php +++ b/src/db/src/MySQLConnection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB; use Hyperf\DB\Exception\RuntimeException; @@ -78,7 +77,7 @@ class MySQLConnection extends AbstractConnection $this->connection = $connection; $this->lastUseTime = microtime(true); - + $this->transactions = 0; return true; } diff --git a/src/db/src/PDOConnection.php b/src/db/src/PDOConnection.php index 629f9a7da..4d54c0d4c 100644 --- a/src/db/src/PDOConnection.php +++ b/src/db/src/PDOConnection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB; use Hyperf\Pool\Exception\ConnectionException; @@ -93,6 +92,7 @@ class PDOConnection extends AbstractConnection $this->connection = $pdo; $this->lastUseTime = microtime(true); + $this->transactions = 0; return true; } diff --git a/src/db/src/Pool/MySQLPool.php b/src/db/src/Pool/MySQLPool.php index f62b85ce6..02ba9aa86 100644 --- a/src/db/src/Pool/MySQLPool.php +++ b/src/db/src/Pool/MySQLPool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB\Pool; use Hyperf\Contract\ConnectionInterface; diff --git a/src/db/src/Pool/PDOPool.php b/src/db/src/Pool/PDOPool.php index f0ccb7462..6b457e386 100644 --- a/src/db/src/Pool/PDOPool.php +++ b/src/db/src/Pool/PDOPool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB\Pool; use Hyperf\Contract\ConnectionInterface; diff --git a/src/db/src/Pool/Pool.php b/src/db/src/Pool/Pool.php index aece43f4b..159003d23 100644 --- a/src/db/src/Pool/Pool.php +++ b/src/db/src/Pool/Pool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB\Pool; use Hyperf\Contract\ConfigInterface; diff --git a/src/db/src/Pool/PoolFactory.php b/src/db/src/Pool/PoolFactory.php index e1dbb7d47..6c72b8620 100644 --- a/src/db/src/Pool/PoolFactory.php +++ b/src/db/src/Pool/PoolFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\DB\Pool; use Hyperf\Contract\ConfigInterface; diff --git a/src/db/tests/Cases/AbstractTestCase.php b/src/db/tests/Cases/AbstractTestCase.php index acc85f246..2485d7e50 100644 --- a/src/db/tests/Cases/AbstractTestCase.php +++ b/src/db/tests/Cases/AbstractTestCase.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DB\Cases; use Hyperf\Config\Config; diff --git a/src/db/tests/Cases/DBTest.php b/src/db/tests/Cases/DBTest.php index 5b6a5b503..d905344f3 100644 --- a/src/db/tests/Cases/DBTest.php +++ b/src/db/tests/Cases/DBTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DB\Cases; use Hyperf\DB\DB; diff --git a/src/db/tests/Cases/MySQLDriverTest.php b/src/db/tests/Cases/MySQLDriverTest.php index 4f20bab90..0787f53e6 100644 --- a/src/db/tests/Cases/MySQLDriverTest.php +++ b/src/db/tests/Cases/MySQLDriverTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DB\Cases; /** diff --git a/src/db/tests/Cases/PDODriverTest.php b/src/db/tests/Cases/PDODriverTest.php index 95e899dd9..a629175aa 100644 --- a/src/db/tests/Cases/PDODriverTest.php +++ b/src/db/tests/Cases/PDODriverTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\DB\Cases; use Hyperf\DB\DB; @@ -115,4 +114,17 @@ class PDODriverTest extends AbstractTestCase $this->assertSame('Hyperf', $res['name']); } + + public function testTransactionLevelWhenReconnect() + { + $container = $this->getContainer(); + $factory = $container->get(PoolFactory::class); + $pool = $factory->getPool('default'); + $connection = $pool->get(); + $this->assertSame(0, $connection->transactionLevel()); + $connection->beginTransaction(); + $this->assertSame(1, $connection->transactionLevel()); + $connection->reconnect(); + $this->assertSame(0, $connection->transactionLevel()); + } } diff --git a/src/db/tests/bootstrap.php b/src/db/tests/bootstrap.php index 3d1876ee6..caf1cd333 100644 --- a/src/db/tests/bootstrap.php +++ b/src/db/tests/bootstrap.php @@ -9,5 +9,4 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - require_once dirname(dirname(__FILE__)) . '/vendor/autoload.php'; diff --git a/src/devtool/publish/devtool.php b/src/devtool/publish/devtool.php index 2504ae51a..fbe5df761 100644 --- a/src/devtool/publish/devtool.php +++ b/src/devtool/publish/devtool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'generator' => [ 'amqp' => [ diff --git a/src/devtool/src/Adapter/AbstractAdapter.php b/src/devtool/src/Adapter/AbstractAdapter.php index 4ce02f3a3..e6a94f338 100644 --- a/src/devtool/src/Adapter/AbstractAdapter.php +++ b/src/devtool/src/Adapter/AbstractAdapter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Adapter; use Symfony\Component\Console\Input\InputInterface; diff --git a/src/devtool/src/Adapter/Aspects.php b/src/devtool/src/Adapter/Aspects.php index 0fc8bebd9..6f15f2852 100644 --- a/src/devtool/src/Adapter/Aspects.php +++ b/src/devtool/src/Adapter/Aspects.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Adapter; use Hyperf\Di\Annotation\AspectCollector; diff --git a/src/devtool/src/ConfigProvider.php b/src/devtool/src/ConfigProvider.php index 9049c55a2..5576d3728 100644 --- a/src/devtool/src/ConfigProvider.php +++ b/src/devtool/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool; class ConfigProvider diff --git a/src/devtool/src/Describe/RoutesCommand.php b/src/devtool/src/Describe/RoutesCommand.php index 31f177b00..04d928d65 100644 --- a/src/devtool/src/Describe/RoutesCommand.php +++ b/src/devtool/src/Describe/RoutesCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Describe; use Hyperf\Command\Annotation\Command; @@ -54,7 +53,7 @@ class RoutesCommand extends HyperfCommand $server = $this->input->getOption('server'); $factory = $this->container->get(DispatcherFactory::class); - $router = $factory->getRouter('http'); + $router = $factory->getRouter($server); $this->show( $this->analyzeRouter($server, $router, $path), $this->output diff --git a/src/devtool/src/Generator/AmqpConsumerCommand.php b/src/devtool/src/Generator/AmqpConsumerCommand.php index 2c53fdd98..2a7b3f400 100644 --- a/src/devtool/src/Generator/AmqpConsumerCommand.php +++ b/src/devtool/src/Generator/AmqpConsumerCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/Generator/AmqpProducerCommand.php b/src/devtool/src/Generator/AmqpProducerCommand.php index de0608fb9..d52389e5e 100644 --- a/src/devtool/src/Generator/AmqpProducerCommand.php +++ b/src/devtool/src/Generator/AmqpProducerCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/Generator/AspectCommand.php b/src/devtool/src/Generator/AspectCommand.php index 253bfd73a..4fcd57a56 100644 --- a/src/devtool/src/Generator/AspectCommand.php +++ b/src/devtool/src/Generator/AspectCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/Generator/CommandCommand.php b/src/devtool/src/Generator/CommandCommand.php index 3f858b58b..252638fde 100644 --- a/src/devtool/src/Generator/CommandCommand.php +++ b/src/devtool/src/Generator/CommandCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/Generator/ControllerCommand.php b/src/devtool/src/Generator/ControllerCommand.php index 3f1bb93e7..2bc8b5e18 100644 --- a/src/devtool/src/Generator/ControllerCommand.php +++ b/src/devtool/src/Generator/ControllerCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/Generator/GeneratorCommand.php b/src/devtool/src/Generator/GeneratorCommand.php index a2afd0484..2b72e48c5 100644 --- a/src/devtool/src/Generator/GeneratorCommand.php +++ b/src/devtool/src/Generator/GeneratorCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Contract\ConfigInterface; diff --git a/src/devtool/src/Generator/JobCommand.php b/src/devtool/src/Generator/JobCommand.php index 8005079d7..2abee684f 100644 --- a/src/devtool/src/Generator/JobCommand.php +++ b/src/devtool/src/Generator/JobCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/Generator/ListenerCommand.php b/src/devtool/src/Generator/ListenerCommand.php index b835b14b7..917395318 100644 --- a/src/devtool/src/Generator/ListenerCommand.php +++ b/src/devtool/src/Generator/ListenerCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/Generator/MiddlewareCommand.php b/src/devtool/src/Generator/MiddlewareCommand.php index 239051011..d91bf5b34 100644 --- a/src/devtool/src/Generator/MiddlewareCommand.php +++ b/src/devtool/src/Generator/MiddlewareCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/Generator/NatsConsumerCommand.php b/src/devtool/src/Generator/NatsConsumerCommand.php index 2e34bbffc..f23675d33 100644 --- a/src/devtool/src/Generator/NatsConsumerCommand.php +++ b/src/devtool/src/Generator/NatsConsumerCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/Generator/NsqConsumerCommand.php b/src/devtool/src/Generator/NsqConsumerCommand.php index c49473395..35533c760 100644 --- a/src/devtool/src/Generator/NsqConsumerCommand.php +++ b/src/devtool/src/Generator/NsqConsumerCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/Generator/ProcessCommand.php b/src/devtool/src/Generator/ProcessCommand.php index 0af481226..91b164b71 100644 --- a/src/devtool/src/Generator/ProcessCommand.php +++ b/src/devtool/src/Generator/ProcessCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/Generator/RequestCommand.php b/src/devtool/src/Generator/RequestCommand.php index b835e795f..62c211498 100644 --- a/src/devtool/src/Generator/RequestCommand.php +++ b/src/devtool/src/Generator/RequestCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool\Generator; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/Info.php b/src/devtool/src/Info.php index 239f6a27d..da01da706 100644 --- a/src/devtool/src/Info.php +++ b/src/devtool/src/Info.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool; use Hyperf\Devtool\Adapter\AbstractAdapter; diff --git a/src/devtool/src/InfoCommand.php b/src/devtool/src/InfoCommand.php index 72115877b..4d32a68b7 100644 --- a/src/devtool/src/InfoCommand.php +++ b/src/devtool/src/InfoCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool; use Hyperf\Command\Annotation\Command; diff --git a/src/devtool/src/VendorPublishCommand.php b/src/devtool/src/VendorPublishCommand.php index 2ac2a502a..036357e0f 100644 --- a/src/devtool/src/VendorPublishCommand.php +++ b/src/devtool/src/VendorPublishCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Devtool; use Hyperf\Command\Annotation\Command; diff --git a/src/di/src/Annotation/AbstractAnnotation.php b/src/di/src/Annotation/AbstractAnnotation.php index c01b9ce90..e7814400b 100644 --- a/src/di/src/Annotation/AbstractAnnotation.php +++ b/src/di/src/Annotation/AbstractAnnotation.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Annotation; use Hyperf\Di\ReflectionManager; diff --git a/src/di/src/Annotation/AnnotationCollector.php b/src/di/src/Annotation/AnnotationCollector.php index 2d273f789..92f7f43c4 100644 --- a/src/di/src/Annotation/AnnotationCollector.php +++ b/src/di/src/Annotation/AnnotationCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Annotation; use Hyperf\Di\MetadataCollector; diff --git a/src/di/src/Annotation/AnnotationInterface.php b/src/di/src/Annotation/AnnotationInterface.php index 964837fba..f5a6a2499 100644 --- a/src/di/src/Annotation/AnnotationInterface.php +++ b/src/di/src/Annotation/AnnotationInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Annotation; interface AnnotationInterface diff --git a/src/di/src/Annotation/Aspect.php b/src/di/src/Annotation/Aspect.php index fdd4ae178..7cbe499f9 100644 --- a/src/di/src/Annotation/Aspect.php +++ b/src/di/src/Annotation/Aspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Annotation; use Doctrine\Instantiator\Instantiator; diff --git a/src/di/src/Annotation/AspectCollector.php b/src/di/src/Annotation/AspectCollector.php index c157f4c97..759b42867 100644 --- a/src/di/src/Annotation/AspectCollector.php +++ b/src/di/src/Annotation/AspectCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Annotation; use Hyperf\Di\MetadataCollector; diff --git a/src/di/src/Annotation/Debug.php b/src/di/src/Annotation/Debug.php index e1ed1e5e7..84cc5ceca 100644 --- a/src/di/src/Annotation/Debug.php +++ b/src/di/src/Annotation/Debug.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Annotation; /** diff --git a/src/di/src/Annotation/Inject.php b/src/di/src/Annotation/Inject.php index 8d3c3b9e9..3bd8c1dac 100644 --- a/src/di/src/Annotation/Inject.php +++ b/src/di/src/Annotation/Inject.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Annotation; use Hyperf\Di\ReflectionManager; diff --git a/src/di/src/Annotation/Scanner.php b/src/di/src/Annotation/Scanner.php index 53a7d643a..491fb0fe5 100644 --- a/src/di/src/Annotation/Scanner.php +++ b/src/di/src/Annotation/Scanner.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Annotation; use Doctrine\Common\Annotations\AnnotationReader; diff --git a/src/di/src/Aop/AbstractAspect.php b/src/di/src/Aop/AbstractAspect.php index bd5a15ce5..3f9c2b638 100644 --- a/src/di/src/Aop/AbstractAspect.php +++ b/src/di/src/Aop/AbstractAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Aop; abstract class AbstractAspect implements AroundInterface diff --git a/src/di/src/Aop/AnnotationMetadata.php b/src/di/src/Aop/AnnotationMetadata.php index cacff12e1..b888c99d4 100644 --- a/src/di/src/Aop/AnnotationMetadata.php +++ b/src/di/src/Aop/AnnotationMetadata.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Aop; class AnnotationMetadata diff --git a/src/di/src/Aop/AroundInterface.php b/src/di/src/Aop/AroundInterface.php index ad74c8c8c..311dabdc1 100644 --- a/src/di/src/Aop/AroundInterface.php +++ b/src/di/src/Aop/AroundInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Aop; interface AroundInterface diff --git a/src/di/src/Aop/Aspect.php b/src/di/src/Aop/Aspect.php index 1523ba3a4..3875a310e 100644 --- a/src/di/src/Aop/Aspect.php +++ b/src/di/src/Aop/Aspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Aop; use Hyperf\Di\Annotation\AnnotationCollector; diff --git a/src/di/src/Aop/Ast.php b/src/di/src/Aop/Ast.php index ac8c5a366..c7f74fdd4 100644 --- a/src/di/src/Aop/Ast.php +++ b/src/di/src/Aop/Ast.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Aop; use Hyperf\Utils\Composer; diff --git a/src/di/src/Aop/AstCollector.php b/src/di/src/Aop/AstCollector.php index 211ebef39..47302c962 100644 --- a/src/di/src/Aop/AstCollector.php +++ b/src/di/src/Aop/AstCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Aop; use Hyperf\Di\MetadataCollector; diff --git a/src/di/src/Aop/Pipeline.php b/src/di/src/Aop/Pipeline.php index dccc5c890..7b5402bba 100644 --- a/src/di/src/Aop/Pipeline.php +++ b/src/di/src/Aop/Pipeline.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Aop; use Closure; diff --git a/src/di/src/Aop/ProceedingJoinPoint.php b/src/di/src/Aop/ProceedingJoinPoint.php index 58d16352e..5991c7318 100644 --- a/src/di/src/Aop/ProceedingJoinPoint.php +++ b/src/di/src/Aop/ProceedingJoinPoint.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Aop; use Closure; diff --git a/src/di/src/Aop/ProxyCallVisitor.php b/src/di/src/Aop/ProxyCallVisitor.php index 74adb342c..fe78872d5 100644 --- a/src/di/src/Aop/ProxyCallVisitor.php +++ b/src/di/src/Aop/ProxyCallVisitor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Aop; use PhpParser\Node; diff --git a/src/di/src/Aop/ProxyClassNameVisitor.php b/src/di/src/Aop/ProxyClassNameVisitor.php index 8226b543f..e77450716 100644 --- a/src/di/src/Aop/ProxyClassNameVisitor.php +++ b/src/di/src/Aop/ProxyClassNameVisitor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Aop; use PhpParser\Node; diff --git a/src/di/src/Aop/ProxyTrait.php b/src/di/src/Aop/ProxyTrait.php index baecd8a65..a46cc915b 100644 --- a/src/di/src/Aop/ProxyTrait.php +++ b/src/di/src/Aop/ProxyTrait.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Aop; use Closure; diff --git a/src/di/src/Aop/RewriteCollection.php b/src/di/src/Aop/RewriteCollection.php index 6f24a51f9..ba730d0a4 100644 --- a/src/di/src/Aop/RewriteCollection.php +++ b/src/di/src/Aop/RewriteCollection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Aop; class RewriteCollection diff --git a/src/di/src/Command/InitProxyCommand.php b/src/di/src/Command/InitProxyCommand.php index c62aa46a4..e7a5e8f09 100644 --- a/src/di/src/Command/InitProxyCommand.php +++ b/src/di/src/Command/InitProxyCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Command; use Hyperf\Command\Command; diff --git a/src/di/src/ConfigProvider.php b/src/di/src/ConfigProvider.php index 83aa27546..cdc0933f5 100644 --- a/src/di/src/ConfigProvider.php +++ b/src/di/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di; use Hyperf\Di\Annotation\AnnotationCollector; diff --git a/src/di/src/Container.php b/src/di/src/Container.php index f76a32596..5fcd7aeec 100644 --- a/src/di/src/Container.php +++ b/src/di/src/Container.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di; use Hyperf\Contract\ContainerInterface as HyperfContainerInterface; @@ -31,8 +30,6 @@ class Container implements HyperfContainerInterface /** * Map of definitions that are already fetched (local cache). - * - * @var (DefinitionInterface|null)[] */ private $fetchedDefinitions = []; diff --git a/src/di/src/Definition/DefinitionInterface.php b/src/di/src/Definition/DefinitionInterface.php index cfaa88598..22a45a65f 100644 --- a/src/di/src/Definition/DefinitionInterface.php +++ b/src/di/src/Definition/DefinitionInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; interface DefinitionInterface diff --git a/src/di/src/Definition/DefinitionSource.php b/src/di/src/Definition/DefinitionSource.php index a428d4c6a..8a72b07ba 100644 --- a/src/di/src/Definition/DefinitionSource.php +++ b/src/di/src/Definition/DefinitionSource.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; use Hyperf\Di\Annotation\AnnotationCollector; diff --git a/src/di/src/Definition/DefinitionSourceFactory.php b/src/di/src/Definition/DefinitionSourceFactory.php index a44739df5..6edb6faed 100644 --- a/src/di/src/Definition/DefinitionSourceFactory.php +++ b/src/di/src/Definition/DefinitionSourceFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; use Hyperf\Config\ProviderConfig; diff --git a/src/di/src/Definition/DefinitionSourceInterface.php b/src/di/src/Definition/DefinitionSourceInterface.php index 66ac6f6f8..036692f07 100644 --- a/src/di/src/Definition/DefinitionSourceInterface.php +++ b/src/di/src/Definition/DefinitionSourceInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; use Hyperf\Di\Exception\InvalidDefinitionException; diff --git a/src/di/src/Definition/FactoryDefinition.php b/src/di/src/Definition/FactoryDefinition.php index 2607e817f..7eb5d75ac 100644 --- a/src/di/src/Definition/FactoryDefinition.php +++ b/src/di/src/Definition/FactoryDefinition.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; class FactoryDefinition implements DefinitionInterface diff --git a/src/di/src/Definition/MethodInjection.php b/src/di/src/Definition/MethodInjection.php index 349dcb4b6..c4270f23e 100644 --- a/src/di/src/Definition/MethodInjection.php +++ b/src/di/src/Definition/MethodInjection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; class MethodInjection implements DefinitionInterface diff --git a/src/di/src/Definition/ObjectDefinition.php b/src/di/src/Definition/ObjectDefinition.php index c0491be61..1f9ed21fb 100644 --- a/src/di/src/Definition/ObjectDefinition.php +++ b/src/di/src/Definition/ObjectDefinition.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; use Hyperf\Di\ReflectionManager; diff --git a/src/di/src/Definition/PropertyDefinition.php b/src/di/src/Definition/PropertyDefinition.php index 8c19c92d2..8559a0281 100644 --- a/src/di/src/Definition/PropertyDefinition.php +++ b/src/di/src/Definition/PropertyDefinition.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; class PropertyDefinition implements DefinitionInterface diff --git a/src/di/src/Definition/PropertyHandlerManager.php b/src/di/src/Definition/PropertyHandlerManager.php index d26ddd500..d6d7db227 100644 --- a/src/di/src/Definition/PropertyHandlerManager.php +++ b/src/di/src/Definition/PropertyHandlerManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; class PropertyHandlerManager diff --git a/src/di/src/Definition/PropertyInjection.php b/src/di/src/Definition/PropertyInjection.php index cc7aadf1c..ee280b11f 100644 --- a/src/di/src/Definition/PropertyInjection.php +++ b/src/di/src/Definition/PropertyInjection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; /** diff --git a/src/di/src/Definition/Reference.php b/src/di/src/Definition/Reference.php index 7bee3a684..f46b47865 100644 --- a/src/di/src/Definition/Reference.php +++ b/src/di/src/Definition/Reference.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; use Psr\Container\ContainerInterface; diff --git a/src/di/src/Definition/ScanConfig.php b/src/di/src/Definition/ScanConfig.php index dc1e9ba71..e76b6247c 100644 --- a/src/di/src/Definition/ScanConfig.php +++ b/src/di/src/Definition/ScanConfig.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; class ScanConfig diff --git a/src/di/src/Definition/SelfResolvingDefinitionInterface.php b/src/di/src/Definition/SelfResolvingDefinitionInterface.php index af287c317..95808dd3b 100644 --- a/src/di/src/Definition/SelfResolvingDefinitionInterface.php +++ b/src/di/src/Definition/SelfResolvingDefinitionInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Definition; use Psr\Container\ContainerInterface; diff --git a/src/di/src/Exception/AnnotationException.php b/src/di/src/Exception/AnnotationException.php index 5243d08e2..e94cd4dcc 100644 --- a/src/di/src/Exception/AnnotationException.php +++ b/src/di/src/Exception/AnnotationException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Exception; class AnnotationException extends Exception diff --git a/src/di/src/Exception/ConflictAnnotationException.php b/src/di/src/Exception/ConflictAnnotationException.php index 1a323cdb9..65d492c56 100644 --- a/src/di/src/Exception/ConflictAnnotationException.php +++ b/src/di/src/Exception/ConflictAnnotationException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Exception; class ConflictAnnotationException extends AnnotationException diff --git a/src/di/src/Exception/DependencyException.php b/src/di/src/Exception/DependencyException.php index f3c231d3d..74979f022 100644 --- a/src/di/src/Exception/DependencyException.php +++ b/src/di/src/Exception/DependencyException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Exception; class DependencyException extends Exception diff --git a/src/di/src/Exception/Exception.php b/src/di/src/Exception/Exception.php index a43307b33..f13248718 100644 --- a/src/di/src/Exception/Exception.php +++ b/src/di/src/Exception/Exception.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Exception; class Exception extends \Exception diff --git a/src/di/src/Exception/InvalidDefinitionException.php b/src/di/src/Exception/InvalidDefinitionException.php index ed252d046..af6986b51 100644 --- a/src/di/src/Exception/InvalidDefinitionException.php +++ b/src/di/src/Exception/InvalidDefinitionException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Exception; use Hyperf\Di\Definition\DefinitionInterface; diff --git a/src/di/src/Exception/NotFoundException.php b/src/di/src/Exception/NotFoundException.php index a8c2f4b17..301d323d3 100644 --- a/src/di/src/Exception/NotFoundException.php +++ b/src/di/src/Exception/NotFoundException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Exception; use Psr\Container\NotFoundExceptionInterface; diff --git a/src/di/src/LazyLoader/AbstractLazyProxyBuilder.php b/src/di/src/LazyLoader/AbstractLazyProxyBuilder.php index 6ca229bfb..180b61484 100644 --- a/src/di/src/LazyLoader/AbstractLazyProxyBuilder.php +++ b/src/di/src/LazyLoader/AbstractLazyProxyBuilder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\LazyLoader; use PhpParser\BuilderFactory; diff --git a/src/di/src/LazyLoader/ClassLazyProxyBuilder.php b/src/di/src/LazyLoader/ClassLazyProxyBuilder.php index c370281d9..a0c5519a1 100644 --- a/src/di/src/LazyLoader/ClassLazyProxyBuilder.php +++ b/src/di/src/LazyLoader/ClassLazyProxyBuilder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\LazyLoader; class ClassLazyProxyBuilder extends AbstractLazyProxyBuilder diff --git a/src/di/src/LazyLoader/FallbackLazyProxyBuilder.php b/src/di/src/LazyLoader/FallbackLazyProxyBuilder.php index f719f60c7..20f3c1aa2 100644 --- a/src/di/src/LazyLoader/FallbackLazyProxyBuilder.php +++ b/src/di/src/LazyLoader/FallbackLazyProxyBuilder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\LazyLoader; class FallbackLazyProxyBuilder extends AbstractLazyProxyBuilder diff --git a/src/di/src/LazyLoader/InterfaceLazyProxyBuilder.php b/src/di/src/LazyLoader/InterfaceLazyProxyBuilder.php index f984caccb..4e732f10b 100644 --- a/src/di/src/LazyLoader/InterfaceLazyProxyBuilder.php +++ b/src/di/src/LazyLoader/InterfaceLazyProxyBuilder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\LazyLoader; class InterfaceLazyProxyBuilder extends AbstractLazyProxyBuilder diff --git a/src/di/src/LazyLoader/LazyLoader.php b/src/di/src/LazyLoader/LazyLoader.php index 64755ded6..dbe6c0239 100644 --- a/src/di/src/LazyLoader/LazyLoader.php +++ b/src/di/src/LazyLoader/LazyLoader.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\LazyLoader; use Hyperf\Contract\ConfigInterface; diff --git a/src/di/src/LazyLoader/LazyProxyTrait.php b/src/di/src/LazyLoader/LazyProxyTrait.php index bfbd818ce..2a33bd5e2 100644 --- a/src/di/src/LazyLoader/LazyProxyTrait.php +++ b/src/di/src/LazyLoader/LazyProxyTrait.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\LazyLoader; use Hyperf\Utils\ApplicationContext; diff --git a/src/di/src/LazyLoader/PublicMethodVisitor.php b/src/di/src/LazyLoader/PublicMethodVisitor.php index c2069dbb6..43c2cf183 100644 --- a/src/di/src/LazyLoader/PublicMethodVisitor.php +++ b/src/di/src/LazyLoader/PublicMethodVisitor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\LazyLoader; use PhpParser\Node; diff --git a/src/di/src/Listener/BootApplicationListener.php b/src/di/src/Listener/BootApplicationListener.php index 825511f40..3e72075c6 100644 --- a/src/di/src/Listener/BootApplicationListener.php +++ b/src/di/src/Listener/BootApplicationListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Listener; use Hyperf\Contract\ConfigInterface; diff --git a/src/di/src/Listener/LazyLoaderBootApplicationListener.php b/src/di/src/Listener/LazyLoaderBootApplicationListener.php index b3b0cc078..fce08b57a 100644 --- a/src/di/src/Listener/LazyLoaderBootApplicationListener.php +++ b/src/di/src/Listener/LazyLoaderBootApplicationListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Listener; use Hyperf\Contract\ConfigInterface; diff --git a/src/di/src/MetadataCacheCollector.php b/src/di/src/MetadataCacheCollector.php index 6c7f67da9..002b53e8c 100644 --- a/src/di/src/MetadataCacheCollector.php +++ b/src/di/src/MetadataCacheCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di; class MetadataCacheCollector diff --git a/src/di/src/MetadataCollector.php b/src/di/src/MetadataCollector.php index c6228b02c..09bd9284d 100644 --- a/src/di/src/MetadataCollector.php +++ b/src/di/src/MetadataCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di; use Hyperf\Utils\Arr; diff --git a/src/di/src/MetadataCollectorInterface.php b/src/di/src/MetadataCollectorInterface.php index 68b24ac5a..c89aad40f 100644 --- a/src/di/src/MetadataCollectorInterface.php +++ b/src/di/src/MetadataCollectorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di; interface MetadataCollectorInterface diff --git a/src/di/src/MethodDefinitionCollector.php b/src/di/src/MethodDefinitionCollector.php index ef7659097..358199c87 100644 --- a/src/di/src/MethodDefinitionCollector.php +++ b/src/di/src/MethodDefinitionCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di; class MethodDefinitionCollector extends MetadataCollector implements MethodDefinitionCollectorInterface diff --git a/src/di/src/MethodDefinitionCollectorInterface.php b/src/di/src/MethodDefinitionCollectorInterface.php index a0ff81744..aadcce797 100644 --- a/src/di/src/MethodDefinitionCollectorInterface.php +++ b/src/di/src/MethodDefinitionCollectorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di; interface MethodDefinitionCollectorInterface diff --git a/src/di/src/ProxyFactory.php b/src/di/src/ProxyFactory.php index e39e66fab..0e8c0b8f3 100644 --- a/src/di/src/ProxyFactory.php +++ b/src/di/src/ProxyFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di; use Hyperf\Di\Aop\Ast; diff --git a/src/di/src/ReflectionManager.php b/src/di/src/ReflectionManager.php index 4d5efdd4d..fd9055ee0 100644 --- a/src/di/src/ReflectionManager.php +++ b/src/di/src/ReflectionManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di; use InvalidArgumentException; diff --git a/src/di/src/ReflectionType.php b/src/di/src/ReflectionType.php index b64f4edd3..2277ab563 100644 --- a/src/di/src/ReflectionType.php +++ b/src/di/src/ReflectionType.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di; class ReflectionType diff --git a/src/di/src/Resolver/FactoryResolver.php b/src/di/src/Resolver/FactoryResolver.php index 23f8af161..de7bc1ab8 100644 --- a/src/di/src/Resolver/FactoryResolver.php +++ b/src/di/src/Resolver/FactoryResolver.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Resolver; use Hyperf\Di\Definition\DefinitionInterface; diff --git a/src/di/src/Resolver/ObjectResolver.php b/src/di/src/Resolver/ObjectResolver.php index 6e886139c..f2639e522 100644 --- a/src/di/src/Resolver/ObjectResolver.php +++ b/src/di/src/Resolver/ObjectResolver.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Resolver; use Hyperf\Di\Definition\DefinitionInterface; diff --git a/src/di/src/Resolver/ParameterResolver.php b/src/di/src/Resolver/ParameterResolver.php index 07c00874f..e9755ddbb 100644 --- a/src/di/src/Resolver/ParameterResolver.php +++ b/src/di/src/Resolver/ParameterResolver.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Resolver; use Hyperf\Di\Definition\DefinitionInterface; diff --git a/src/di/src/Resolver/ResolverDispatcher.php b/src/di/src/Resolver/ResolverDispatcher.php index 1e0ae6036..94f3e8a5d 100644 --- a/src/di/src/Resolver/ResolverDispatcher.php +++ b/src/di/src/Resolver/ResolverDispatcher.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Resolver; use Hyperf\Di\Definition\DefinitionInterface; diff --git a/src/di/src/Resolver/ResolverInterface.php b/src/di/src/Resolver/ResolverInterface.php index b92fbc650..1027b1fcd 100644 --- a/src/di/src/Resolver/ResolverInterface.php +++ b/src/di/src/Resolver/ResolverInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Di\Resolver; use Hyperf\Di\Definition\DefinitionInterface; diff --git a/src/di/tests/AnnotationTest.php b/src/di/tests/AnnotationTest.php index 56db6f1be..cccf72fb9 100644 --- a/src/di/tests/AnnotationTest.php +++ b/src/di/tests/AnnotationTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\Annotation\Scanner; diff --git a/src/di/tests/AopAspectTest.php b/src/di/tests/AopAspectTest.php index e417c0891..540387d33 100644 --- a/src/di/tests/AopAspectTest.php +++ b/src/di/tests/AopAspectTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\Annotation\Aspect as AspectAnnotation; diff --git a/src/di/tests/AstTest.php b/src/di/tests/AstTest.php index d89ef7475..db2142397 100644 --- a/src/di/tests/AstTest.php +++ b/src/di/tests/AstTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\Aop\Ast; diff --git a/src/di/tests/ClassLazyProxyBuilderTest.php b/src/di/tests/ClassLazyProxyBuilderTest.php index 18e6a2135..bd29fc230 100644 --- a/src/di/tests/ClassLazyProxyBuilderTest.php +++ b/src/di/tests/ClassLazyProxyBuilderTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\LazyLoader\ClassLazyProxyBuilder; diff --git a/src/di/tests/ContainerTest.php b/src/di/tests/ContainerTest.php index 4c2ac23ee..3ae115b2f 100644 --- a/src/di/tests/ContainerTest.php +++ b/src/di/tests/ContainerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\Container; diff --git a/src/di/tests/DefinitionSourceTest.php b/src/di/tests/DefinitionSourceTest.php index 385fa1281..f3b2d73bd 100644 --- a/src/di/tests/DefinitionSourceTest.php +++ b/src/di/tests/DefinitionSourceTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\Container; diff --git a/src/di/tests/ExceptionStub/DemoInjectException.php b/src/di/tests/ExceptionStub/DemoInjectException.php index cb23156cc..c058f9ecd 100644 --- a/src/di/tests/ExceptionStub/DemoInjectException.php +++ b/src/di/tests/ExceptionStub/DemoInjectException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\ExceptionStub; use Hyperf\Di\Annotation\Inject; diff --git a/src/di/tests/InjectTest.php b/src/di/tests/InjectTest.php index a4a212a94..26bf699cb 100644 --- a/src/di/tests/InjectTest.php +++ b/src/di/tests/InjectTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\Container; diff --git a/src/di/tests/InterfaceLazyProxyBuilderTest.php b/src/di/tests/InterfaceLazyProxyBuilderTest.php index 67a4a0616..2f5b4dc98 100644 --- a/src/di/tests/InterfaceLazyProxyBuilderTest.php +++ b/src/di/tests/InterfaceLazyProxyBuilderTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\LazyLoader\InterfaceLazyProxyBuilder; diff --git a/src/di/tests/LazyProxyTraitTest.php b/src/di/tests/LazyProxyTraitTest.php index a4cc1ee93..871f10d16 100644 --- a/src/di/tests/LazyProxyTraitTest.php +++ b/src/di/tests/LazyProxyTraitTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\Container; diff --git a/src/di/tests/MakeTest.php b/src/di/tests/MakeTest.php index 50b510e41..f6ca81202 100644 --- a/src/di/tests/MakeTest.php +++ b/src/di/tests/MakeTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\Container; diff --git a/src/di/tests/MetadataCollectorTest.php b/src/di/tests/MetadataCollectorTest.php index 8616d21d1..1ee447270 100644 --- a/src/di/tests/MetadataCollectorTest.php +++ b/src/di/tests/MetadataCollectorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Config\Config; diff --git a/src/di/tests/MethodDefinitionTest.php b/src/di/tests/MethodDefinitionTest.php index 05e4e2979..f4586d58a 100644 --- a/src/di/tests/MethodDefinitionTest.php +++ b/src/di/tests/MethodDefinitionTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\MethodDefinitionCollector; diff --git a/src/di/tests/ProxyTraitTest.php b/src/di/tests/ProxyTraitTest.php index c2836689c..dd8d72190 100644 --- a/src/di/tests/ProxyTraitTest.php +++ b/src/di/tests/ProxyTraitTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\Annotation\AnnotationCollector; diff --git a/src/di/tests/PublicMethodVisitorTest.php b/src/di/tests/PublicMethodVisitorTest.php index 36abae951..927bce467 100644 --- a/src/di/tests/PublicMethodVisitorTest.php +++ b/src/di/tests/PublicMethodVisitorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di; use Hyperf\Di\LazyLoader\PublicMethodVisitor; diff --git a/src/di/tests/Stub/AnnotationCollector.php b/src/di/tests/Stub/AnnotationCollector.php index e0210f75c..820fd00ec 100644 --- a/src/di/tests/Stub/AnnotationCollector.php +++ b/src/di/tests/Stub/AnnotationCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; class AnnotationCollector extends \Hyperf\Di\Annotation\AnnotationCollector diff --git a/src/di/tests/Stub/Aspect/IncrAspect.php b/src/di/tests/Stub/Aspect/IncrAspect.php index 4eb07da20..2ad41f9e1 100644 --- a/src/di/tests/Stub/Aspect/IncrAspect.php +++ b/src/di/tests/Stub/Aspect/IncrAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub\Aspect; use Hyperf\Di\Aop\AbstractAspect; diff --git a/src/di/tests/Stub/Aspect/IncrAspectAnnotation.php b/src/di/tests/Stub/Aspect/IncrAspectAnnotation.php index 03c1325ca..56a74e65f 100644 --- a/src/di/tests/Stub/Aspect/IncrAspectAnnotation.php +++ b/src/di/tests/Stub/Aspect/IncrAspectAnnotation.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub\Aspect; use Hyperf\Di\Aop\ProceedingJoinPoint; diff --git a/src/di/tests/Stub/AspectCollector.php b/src/di/tests/Stub/AspectCollector.php index 973826393..9d675bb46 100644 --- a/src/di/tests/Stub/AspectCollector.php +++ b/src/di/tests/Stub/AspectCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; class AspectCollector extends \Hyperf\Di\Annotation\AspectCollector diff --git a/src/di/tests/Stub/Ast/Bar.php b/src/di/tests/Stub/Ast/Bar.php index dc055624f..d6a5efc95 100644 --- a/src/di/tests/Stub/Ast/Bar.php +++ b/src/di/tests/Stub/Ast/Bar.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub\Ast; class Bar diff --git a/src/di/tests/Stub/Ast/Bar2.php b/src/di/tests/Stub/Ast/Bar2.php index 3fbb87829..69a7c4544 100644 --- a/src/di/tests/Stub/Ast/Bar2.php +++ b/src/di/tests/Stub/Ast/Bar2.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub\Ast; class Bar2 extends Bar diff --git a/src/di/tests/Stub/Ast/Bar3.php b/src/di/tests/Stub/Ast/Bar3.php index 9b054e227..546dbc576 100644 --- a/src/di/tests/Stub/Ast/Bar3.php +++ b/src/di/tests/Stub/Ast/Bar3.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub\Ast; class Bar3 extends Bar diff --git a/src/di/tests/Stub/Ast/BarAspect.php b/src/di/tests/Stub/Ast/BarAspect.php index 8d1ea8cf8..bcfc96448 100644 --- a/src/di/tests/Stub/Ast/BarAspect.php +++ b/src/di/tests/Stub/Ast/BarAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub\Ast; use Hyperf\Di\Aop\AbstractAspect; diff --git a/src/di/tests/Stub/Ast/Foo.php b/src/di/tests/Stub/Ast/Foo.php index c5b6aa1f3..f844eda80 100644 --- a/src/di/tests/Stub/Ast/Foo.php +++ b/src/di/tests/Stub/Ast/Foo.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub\Ast; class Foo diff --git a/src/di/tests/Stub/Bar.php b/src/di/tests/Stub/Bar.php index 6357354bf..7750bc1f1 100644 --- a/src/di/tests/Stub/Bar.php +++ b/src/di/tests/Stub/Bar.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; class Bar diff --git a/src/di/tests/Stub/Demo.php b/src/di/tests/Stub/Demo.php index 410eb0d3d..1fefac97a 100644 --- a/src/di/tests/Stub/Demo.php +++ b/src/di/tests/Stub/Demo.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; class Demo diff --git a/src/di/tests/Stub/DemoAnnotation.php b/src/di/tests/Stub/DemoAnnotation.php index 39f496110..ce10fab7f 100644 --- a/src/di/tests/Stub/DemoAnnotation.php +++ b/src/di/tests/Stub/DemoAnnotation.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/di/tests/Stub/DemoInject.php b/src/di/tests/Stub/DemoInject.php index b60235753..1426b61fe 100644 --- a/src/di/tests/Stub/DemoInject.php +++ b/src/di/tests/Stub/DemoInject.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; use Hyperf\Di\Annotation\Inject; diff --git a/src/di/tests/Stub/Foo.php b/src/di/tests/Stub/Foo.php index dcd42b03d..cfaf6341e 100644 --- a/src/di/tests/Stub/Foo.php +++ b/src/di/tests/Stub/Foo.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; class Foo diff --git a/src/di/tests/Stub/Foo2Aspect.php b/src/di/tests/Stub/Foo2Aspect.php index e68c77be5..7e8eb5f41 100644 --- a/src/di/tests/Stub/Foo2Aspect.php +++ b/src/di/tests/Stub/Foo2Aspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; use Hyperf\Di\Annotation\Aspect; diff --git a/src/di/tests/Stub/FooAspect.php b/src/di/tests/Stub/FooAspect.php index ff48df6c0..8fe2e2891 100644 --- a/src/di/tests/Stub/FooAspect.php +++ b/src/di/tests/Stub/FooAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; use Hyperf\Di\Annotation\Aspect; diff --git a/src/di/tests/Stub/FooFactory.php b/src/di/tests/Stub/FooFactory.php index 38391979f..26e9e430d 100644 --- a/src/di/tests/Stub/FooFactory.php +++ b/src/di/tests/Stub/FooFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; class FooFactory diff --git a/src/di/tests/Stub/FooInterface.php b/src/di/tests/Stub/FooInterface.php index 5cef7c455..6419a0dc5 100644 --- a/src/di/tests/Stub/FooInterface.php +++ b/src/di/tests/Stub/FooInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; interface FooInterface diff --git a/src/di/tests/Stub/Ignore.php b/src/di/tests/Stub/Ignore.php index 557624efc..4dbe87053 100644 --- a/src/di/tests/Stub/Ignore.php +++ b/src/di/tests/Stub/Ignore.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; /** diff --git a/src/di/tests/Stub/IgnoreDemoAnnotation.php b/src/di/tests/Stub/IgnoreDemoAnnotation.php index b9e303c83..f84258224 100644 --- a/src/di/tests/Stub/IgnoreDemoAnnotation.php +++ b/src/di/tests/Stub/IgnoreDemoAnnotation.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/di/tests/Stub/LazyProxy.php b/src/di/tests/Stub/LazyProxy.php index 4f50615e5..2e0a981a4 100644 --- a/src/di/tests/Stub/LazyProxy.php +++ b/src/di/tests/Stub/LazyProxy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; use Hyperf\Di\LazyLoader\LazyProxyTrait; diff --git a/src/di/tests/Stub/Proxied.php b/src/di/tests/Stub/Proxied.php index d0da23458..a81ce974c 100644 --- a/src/di/tests/Stub/Proxied.php +++ b/src/di/tests/Stub/Proxied.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; class Proxied diff --git a/src/di/tests/Stub/ProxyTraitObject.php b/src/di/tests/Stub/ProxyTraitObject.php index 03ce484e9..925145959 100644 --- a/src/di/tests/Stub/ProxyTraitObject.php +++ b/src/di/tests/Stub/ProxyTraitObject.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Di\Stub; use Hyperf\Di\Aop\ProxyTrait; diff --git a/src/dispatcher/src/AbstractDispatcher.php b/src/dispatcher/src/AbstractDispatcher.php index 9394cc878..6c6908e85 100644 --- a/src/dispatcher/src/AbstractDispatcher.php +++ b/src/dispatcher/src/AbstractDispatcher.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Dispatcher; use Hyperf\Contract\DispatcherInterface; diff --git a/src/dispatcher/src/AbstractRequestHandler.php b/src/dispatcher/src/AbstractRequestHandler.php index 9d3ab7314..f2abb0cb1 100644 --- a/src/dispatcher/src/AbstractRequestHandler.php +++ b/src/dispatcher/src/AbstractRequestHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Dispatcher; use Hyperf\Dispatcher\Exceptions\InvalidArgumentException; @@ -43,7 +42,6 @@ abstract class AbstractRequestHandler /** * @param array $middlewares All middlewares to dispatch by dispatcher * @param object $coreHandler The core middleware of dispatcher - * @param ContainerInterface $container */ public function __construct(array $middlewares, $coreHandler, ContainerInterface $container) { diff --git a/src/dispatcher/src/ConfigProvider.php b/src/dispatcher/src/ConfigProvider.php index 4ed3e330e..9597b7f8e 100644 --- a/src/dispatcher/src/ConfigProvider.php +++ b/src/dispatcher/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Dispatcher; class ConfigProvider diff --git a/src/dispatcher/src/Exceptions/InvalidArgumentException.php b/src/dispatcher/src/Exceptions/InvalidArgumentException.php index 6a0505a6d..87990b843 100644 --- a/src/dispatcher/src/Exceptions/InvalidArgumentException.php +++ b/src/dispatcher/src/Exceptions/InvalidArgumentException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Dispatcher\Exceptions; class InvalidArgumentException extends \InvalidArgumentException diff --git a/src/dispatcher/src/HttpDispatcher.php b/src/dispatcher/src/HttpDispatcher.php index bfe1ba795..b7ef8dc6b 100644 --- a/src/dispatcher/src/HttpDispatcher.php +++ b/src/dispatcher/src/HttpDispatcher.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Dispatcher; use Psr\Container\ContainerInterface; diff --git a/src/dispatcher/src/HttpRequestHandler.php b/src/dispatcher/src/HttpRequestHandler.php index 8d959bec8..a459cbb6a 100644 --- a/src/dispatcher/src/HttpRequestHandler.php +++ b/src/dispatcher/src/HttpRequestHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Dispatcher; use Psr\Http\Message\ResponseInterface; diff --git a/src/dispatcher/tests/HttpDispatcherTest.php b/src/dispatcher/tests/HttpDispatcherTest.php index 5da5cbb7c..3fdfcabbc 100644 --- a/src/dispatcher/tests/HttpDispatcherTest.php +++ b/src/dispatcher/tests/HttpDispatcherTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Dispatcher; use Hyperf\Dispatcher\HttpDispatcher; diff --git a/src/dispatcher/tests/Middlewares/CoreMiddleware.php b/src/dispatcher/tests/Middlewares/CoreMiddleware.php index 2632110a4..c1cfd988e 100644 --- a/src/dispatcher/tests/Middlewares/CoreMiddleware.php +++ b/src/dispatcher/tests/Middlewares/CoreMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Dispatcher\Middlewares; use Hyperf\Utils\Context; diff --git a/src/dispatcher/tests/Middlewares/TestMiddleware.php b/src/dispatcher/tests/Middlewares/TestMiddleware.php index a32a444da..fce6a23c0 100644 --- a/src/dispatcher/tests/Middlewares/TestMiddleware.php +++ b/src/dispatcher/tests/Middlewares/TestMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Dispatcher\Middlewares; use Hyperf\Utils\Context; diff --git a/src/elasticsearch/src/ClientBuilderFactory.php b/src/elasticsearch/src/ClientBuilderFactory.php index 5b6909608..ae66f1643 100644 --- a/src/elasticsearch/src/ClientBuilderFactory.php +++ b/src/elasticsearch/src/ClientBuilderFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Elasticsearch; use Elasticsearch\ClientBuilder; diff --git a/src/elasticsearch/tests/ClientFactoryTest.php b/src/elasticsearch/tests/ClientFactoryTest.php index 16a23fe76..37b2be6f2 100644 --- a/src/elasticsearch/tests/ClientFactoryTest.php +++ b/src/elasticsearch/tests/ClientFactoryTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Elasticsearch; use Elasticsearch\ClientBuilder; diff --git a/src/etcd/publish/etcd.php b/src/etcd/publish/etcd.php index 18f33d814..1ce5c715a 100644 --- a/src/etcd/publish/etcd.php +++ b/src/etcd/publish/etcd.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ # Etcd Client 'uri' => 'http://127.0.0.1:2379', diff --git a/src/etcd/src/Client.php b/src/etcd/src/Client.php index 51a8e9e97..29dc126aa 100644 --- a/src/etcd/src/Client.php +++ b/src/etcd/src/Client.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Etcd; use GuzzleHttp\HandlerStack; diff --git a/src/etcd/src/ConfigProvider.php b/src/etcd/src/ConfigProvider.php index a61bd3692..bce501c40 100644 --- a/src/etcd/src/ConfigProvider.php +++ b/src/etcd/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Etcd; class ConfigProvider diff --git a/src/etcd/src/Exception/ClientNotFindException.php b/src/etcd/src/Exception/ClientNotFindException.php index cbba898a0..e60280c12 100644 --- a/src/etcd/src/Exception/ClientNotFindException.php +++ b/src/etcd/src/Exception/ClientNotFindException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Etcd\Exception; class ClientNotFindException extends \RuntimeException diff --git a/src/etcd/src/KVFactory.php b/src/etcd/src/KVFactory.php index 60b7541c5..ea37ad867 100644 --- a/src/etcd/src/KVFactory.php +++ b/src/etcd/src/KVFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Etcd; use Hyperf\Contract\ConfigInterface; diff --git a/src/etcd/src/KVInterface.php b/src/etcd/src/KVInterface.php index 12d4f80f7..971f7aec3 100644 --- a/src/etcd/src/KVInterface.php +++ b/src/etcd/src/KVInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Etcd; interface KVInterface diff --git a/src/etcd/src/V3/EtcdClient.php b/src/etcd/src/V3/EtcdClient.php index d67f3162c..20c667f94 100644 --- a/src/etcd/src/V3/EtcdClient.php +++ b/src/etcd/src/V3/EtcdClient.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Etcd\V3; use Etcd\Client; diff --git a/src/etcd/src/V3/KV.php b/src/etcd/src/V3/KV.php index f989562f5..b5de52007 100644 --- a/src/etcd/src/V3/KV.php +++ b/src/etcd/src/V3/KV.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Etcd\V3; use GuzzleHttp; diff --git a/src/etcd/tests/KVTest.php b/src/etcd/tests/KVTest.php index 74dd7e7ce..cc2c0e550 100644 --- a/src/etcd/tests/KVTest.php +++ b/src/etcd/tests/KVTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Etcd; use GuzzleHttp\Client; diff --git a/src/etcd/tests/Stub/GuzzleClientStub.php b/src/etcd/tests/Stub/GuzzleClientStub.php index bf1302ad1..34fdcf0b1 100644 --- a/src/etcd/tests/Stub/GuzzleClientStub.php +++ b/src/etcd/tests/Stub/GuzzleClientStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Etcd\Stub; use GuzzleHttp\Client; diff --git a/src/event/src/Annotation/Listener.php b/src/event/src/Annotation/Listener.php index d2eeb3c6a..8ac70257b 100644 --- a/src/event/src/Annotation/Listener.php +++ b/src/event/src/Annotation/Listener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Event\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/event/src/ConfigProvider.php b/src/event/src/ConfigProvider.php index d33649524..59caafdf5 100644 --- a/src/event/src/ConfigProvider.php +++ b/src/event/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Event; use Psr\EventDispatcher\EventDispatcherInterface; diff --git a/src/event/src/Contract/ListenerInterface.php b/src/event/src/Contract/ListenerInterface.php index 4b2f50276..d5419de39 100644 --- a/src/event/src/Contract/ListenerInterface.php +++ b/src/event/src/Contract/ListenerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Event\Contract; interface ListenerInterface diff --git a/src/event/src/EventDispatcher.php b/src/event/src/EventDispatcher.php index 1d0c1bec8..32cf86004 100644 --- a/src/event/src/EventDispatcher.php +++ b/src/event/src/EventDispatcher.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Event; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/event/src/EventDispatcherFactory.php b/src/event/src/EventDispatcherFactory.php index e7a60401a..2435631c0 100644 --- a/src/event/src/EventDispatcherFactory.php +++ b/src/event/src/EventDispatcherFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Event; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/event/src/ListenerData.php b/src/event/src/ListenerData.php index 4ce5b6351..d412545be 100644 --- a/src/event/src/ListenerData.php +++ b/src/event/src/ListenerData.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Event; class ListenerData diff --git a/src/event/src/ListenerProvider.php b/src/event/src/ListenerProvider.php index 98828f058..4c68ca919 100644 --- a/src/event/src/ListenerProvider.php +++ b/src/event/src/ListenerProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Event; use Psr\EventDispatcher\ListenerProviderInterface; diff --git a/src/event/src/ListenerProviderFactory.php b/src/event/src/ListenerProviderFactory.php index c411d92bc..313992428 100644 --- a/src/event/src/ListenerProviderFactory.php +++ b/src/event/src/ListenerProviderFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Event; use Hyperf\Contract\ConfigInterface; diff --git a/src/event/src/Stoppable.php b/src/event/src/Stoppable.php index 7ac0c6372..cc42f75dd 100644 --- a/src/event/src/Stoppable.php +++ b/src/event/src/Stoppable.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Event; trait Stoppable diff --git a/src/event/tests/ConfigProviderTest.php b/src/event/tests/ConfigProviderTest.php index ecc05a5d8..702c6401d 100644 --- a/src/event/tests/ConfigProviderTest.php +++ b/src/event/tests/ConfigProviderTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Event; use Hyperf\Event\ConfigProvider; diff --git a/src/event/tests/Event/Alpha.php b/src/event/tests/Event/Alpha.php index 8d182267d..02547b4f0 100644 --- a/src/event/tests/Event/Alpha.php +++ b/src/event/tests/Event/Alpha.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Event\Event; use Hyperf\Event\Stoppable; diff --git a/src/event/tests/Event/Beta.php b/src/event/tests/Event/Beta.php index 23529cf6f..e34583ab8 100644 --- a/src/event/tests/Event/Beta.php +++ b/src/event/tests/Event/Beta.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Event\Event; class Beta diff --git a/src/event/tests/Event/PriorityEvent.php b/src/event/tests/Event/PriorityEvent.php index b57b3ba6b..010b24524 100644 --- a/src/event/tests/Event/PriorityEvent.php +++ b/src/event/tests/Event/PriorityEvent.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Event\Event; class PriorityEvent diff --git a/src/event/tests/EventDispatcherTest.php b/src/event/tests/EventDispatcherTest.php index c5964fa66..224a222b6 100644 --- a/src/event/tests/EventDispatcherTest.php +++ b/src/event/tests/EventDispatcherTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Event; use Hyperf\Config\Config; diff --git a/src/event/tests/Listener/AlphaListener.php b/src/event/tests/Listener/AlphaListener.php index 3e9d83dac..f30d7870a 100644 --- a/src/event/tests/Listener/AlphaListener.php +++ b/src/event/tests/Listener/AlphaListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Event\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/event/tests/Listener/BetaListener.php b/src/event/tests/Listener/BetaListener.php index 0e4db5c5c..ed9611ee9 100644 --- a/src/event/tests/Listener/BetaListener.php +++ b/src/event/tests/Listener/BetaListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Event\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/event/tests/Listener/PriorityListener.php b/src/event/tests/Listener/PriorityListener.php index a07128a70..217f8a729 100644 --- a/src/event/tests/Listener/PriorityListener.php +++ b/src/event/tests/Listener/PriorityListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Event\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/event/tests/ListenerProviderTest.php b/src/event/tests/ListenerProviderTest.php index 9c522721e..502206229 100644 --- a/src/event/tests/ListenerProviderTest.php +++ b/src/event/tests/ListenerProviderTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Event; use Hyperf\Event\ListenerProvider; diff --git a/src/event/tests/ListenerTest.php b/src/event/tests/ListenerTest.php index acdd73ded..18ef70d58 100644 --- a/src/event/tests/ListenerTest.php +++ b/src/event/tests/ListenerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Event; use Hyperf\Config\Config; diff --git a/src/exception-handler/src/ConfigProvider.php b/src/exception-handler/src/ConfigProvider.php index 033eb2d4c..cc178888e 100644 --- a/src/exception-handler/src/ConfigProvider.php +++ b/src/exception-handler/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ExceptionHandler; use Hyperf\ExceptionHandler\Formatter\DefaultFormatter; diff --git a/src/exception-handler/src/ExceptionHandler.php b/src/exception-handler/src/ExceptionHandler.php index b3b339e4a..fd40b0c13 100644 --- a/src/exception-handler/src/ExceptionHandler.php +++ b/src/exception-handler/src/ExceptionHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ExceptionHandler; use Psr\Http\Message\ResponseInterface; diff --git a/src/exception-handler/src/ExceptionHandlerDispatcher.php b/src/exception-handler/src/ExceptionHandlerDispatcher.php index 6da91b6bb..2e07b3370 100644 --- a/src/exception-handler/src/ExceptionHandlerDispatcher.php +++ b/src/exception-handler/src/ExceptionHandlerDispatcher.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ExceptionHandler; use Hyperf\Dispatcher\AbstractDispatcher; diff --git a/src/exception-handler/src/Formatter/DefaultFormatter.php b/src/exception-handler/src/Formatter/DefaultFormatter.php index 391aa4e48..9fd4cd0ea 100644 --- a/src/exception-handler/src/Formatter/DefaultFormatter.php +++ b/src/exception-handler/src/Formatter/DefaultFormatter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ExceptionHandler\Formatter; use Throwable; diff --git a/src/exception-handler/src/Formatter/FormatterInterface.php b/src/exception-handler/src/Formatter/FormatterInterface.php index 230e25a01..2ebe6b19d 100644 --- a/src/exception-handler/src/Formatter/FormatterInterface.php +++ b/src/exception-handler/src/Formatter/FormatterInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ExceptionHandler\Formatter; use Throwable; diff --git a/src/exception-handler/src/Listener/ErrorExceptionHandler.php b/src/exception-handler/src/Listener/ErrorExceptionHandler.php index fc43734fc..1be5f3533 100644 --- a/src/exception-handler/src/Listener/ErrorExceptionHandler.php +++ b/src/exception-handler/src/Listener/ErrorExceptionHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ExceptionHandler\Listener; use ErrorException; diff --git a/src/exception-handler/src/Propagation.php b/src/exception-handler/src/Propagation.php index 45286d0b6..3e7fb0253 100644 --- a/src/exception-handler/src/Propagation.php +++ b/src/exception-handler/src/Propagation.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ExceptionHandler; use Hyperf\Utils\Traits\StaticInstance; diff --git a/src/exception-handler/tests/ErrorExceptionHandlerTest.php b/src/exception-handler/tests/ErrorExceptionHandlerTest.php index 30a79478a..726e76439 100644 --- a/src/exception-handler/tests/ErrorExceptionHandlerTest.php +++ b/src/exception-handler/tests/ErrorExceptionHandlerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ExceptionHandler; use Hyperf\ExceptionHandler\Listener\ErrorExceptionHandler; diff --git a/src/exception-handler/tests/ExceptionHandlerTest.php b/src/exception-handler/tests/ExceptionHandlerTest.php index 5e7d92655..ce607551e 100644 --- a/src/exception-handler/tests/ExceptionHandlerTest.php +++ b/src/exception-handler/tests/ExceptionHandlerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ExceptionHandler; use Hyperf\ExceptionHandler\ExceptionHandlerDispatcher; diff --git a/src/exception-handler/tests/Stub/BarExceptionHandler.php b/src/exception-handler/tests/Stub/BarExceptionHandler.php index 3a5d31e42..b1105a019 100644 --- a/src/exception-handler/tests/Stub/BarExceptionHandler.php +++ b/src/exception-handler/tests/Stub/BarExceptionHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ExceptionHandler\Stub; use Hyperf\ExceptionHandler\ExceptionHandler; diff --git a/src/exception-handler/tests/Stub/FooExceptionHandler.php b/src/exception-handler/tests/Stub/FooExceptionHandler.php index acfb0cc39..13abb680f 100644 --- a/src/exception-handler/tests/Stub/FooExceptionHandler.php +++ b/src/exception-handler/tests/Stub/FooExceptionHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ExceptionHandler\Stub; use Hyperf\ExceptionHandler\ExceptionHandler; diff --git a/src/filesystem/publish/file.php b/src/filesystem/publish/file.php index f0c0d9d35..b22788b80 100644 --- a/src/filesystem/publish/file.php +++ b/src/filesystem/publish/file.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'default' => 'local', 'storage' => [ diff --git a/src/filesystem/src/Adapter/AliyunOssAdapterFactory.php b/src/filesystem/src/Adapter/AliyunOssAdapterFactory.php index 72413e6cb..33cdc6d98 100644 --- a/src/filesystem/src/Adapter/AliyunOssAdapterFactory.php +++ b/src/filesystem/src/Adapter/AliyunOssAdapterFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Filesystem\Adapter; use Hyperf\Filesystem\Contract\AdapterFactoryInterface; diff --git a/src/filesystem/src/Adapter/AliyunOssHook.php b/src/filesystem/src/Adapter/AliyunOssHook.php index 60c92bea4..8a2f4d82f 100644 --- a/src/filesystem/src/Adapter/AliyunOssHook.php +++ b/src/filesystem/src/Adapter/AliyunOssHook.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Oss\OssClient { function is_resource($resource) { diff --git a/src/filesystem/src/Adapter/FtpAdapterFactory.php b/src/filesystem/src/Adapter/FtpAdapterFactory.php index 19c65f348..cda0b8ddc 100644 --- a/src/filesystem/src/Adapter/FtpAdapterFactory.php +++ b/src/filesystem/src/Adapter/FtpAdapterFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Filesystem\Adapter; use Hyperf\Filesystem\Contract\AdapterFactoryInterface; diff --git a/src/filesystem/src/Adapter/LocalAdapterFactory.php b/src/filesystem/src/Adapter/LocalAdapterFactory.php index 71953c09a..66b284352 100644 --- a/src/filesystem/src/Adapter/LocalAdapterFactory.php +++ b/src/filesystem/src/Adapter/LocalAdapterFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Filesystem\Adapter; use Hyperf\Filesystem\Contract\AdapterFactoryInterface; diff --git a/src/filesystem/src/Adapter/MemoryAdapterFactory.php b/src/filesystem/src/Adapter/MemoryAdapterFactory.php index 3fb451095..59cad826d 100644 --- a/src/filesystem/src/Adapter/MemoryAdapterFactory.php +++ b/src/filesystem/src/Adapter/MemoryAdapterFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Filesystem\Adapter; use Hyperf\Filesystem\Contract\AdapterFactoryInterface; diff --git a/src/filesystem/src/Adapter/NullAdapterFactory.php b/src/filesystem/src/Adapter/NullAdapterFactory.php index da8304c42..e188c4700 100644 --- a/src/filesystem/src/Adapter/NullAdapterFactory.php +++ b/src/filesystem/src/Adapter/NullAdapterFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Filesystem\Adapter; use Hyperf\Filesystem\Contract\AdapterFactoryInterface; diff --git a/src/filesystem/src/Adapter/QiniuAdapterFactory.php b/src/filesystem/src/Adapter/QiniuAdapterFactory.php index a487691d4..d74c27e0c 100644 --- a/src/filesystem/src/Adapter/QiniuAdapterFactory.php +++ b/src/filesystem/src/Adapter/QiniuAdapterFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Filesystem\Adapter; use Hyperf\Filesystem\Contract\AdapterFactoryInterface; diff --git a/src/filesystem/src/Adapter/S3AdapterFactory.php b/src/filesystem/src/Adapter/S3AdapterFactory.php index f1faadf3a..e80b9beff 100644 --- a/src/filesystem/src/Adapter/S3AdapterFactory.php +++ b/src/filesystem/src/Adapter/S3AdapterFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Filesystem\Adapter; use Aws\S3\S3Client; diff --git a/src/filesystem/src/ConfigProvider.php b/src/filesystem/src/ConfigProvider.php index 76c1b7ed8..747d57591 100644 --- a/src/filesystem/src/ConfigProvider.php +++ b/src/filesystem/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Filesystem; use League\Flysystem\Filesystem; diff --git a/src/filesystem/src/Contract/AdapterFactoryInterface.php b/src/filesystem/src/Contract/AdapterFactoryInterface.php index 5bdff4248..d49e18daa 100644 --- a/src/filesystem/src/Contract/AdapterFactoryInterface.php +++ b/src/filesystem/src/Contract/AdapterFactoryInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Filesystem\Contract; use League\Flysystem\AdapterInterface; diff --git a/src/filesystem/src/Exception/InvalidArgumentException.php b/src/filesystem/src/Exception/InvalidArgumentException.php index acfba49ba..82d5dfc0d 100644 --- a/src/filesystem/src/Exception/InvalidArgumentException.php +++ b/src/filesystem/src/Exception/InvalidArgumentException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Filesystem\Exception; class InvalidArgumentException extends \InvalidArgumentException diff --git a/src/filesystem/src/FilesystemFactory.php b/src/filesystem/src/FilesystemFactory.php index 0fa383fab..152f35b85 100644 --- a/src/filesystem/src/FilesystemFactory.php +++ b/src/filesystem/src/FilesystemFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Filesystem; use Hyperf\Contract\ConfigInterface; diff --git a/src/filesystem/src/FilesystemInvoker.php b/src/filesystem/src/FilesystemInvoker.php index 79589db3e..21a8b37a1 100644 --- a/src/filesystem/src/FilesystemInvoker.php +++ b/src/filesystem/src/FilesystemInvoker.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Filesystem; use Hyperf\Contract\ConfigInterface; diff --git a/src/filesystem/tests/Cases/AbstractTestCase.php b/src/filesystem/tests/Cases/AbstractTestCase.php index 1b45d3194..786a96352 100644 --- a/src/filesystem/tests/Cases/AbstractTestCase.php +++ b/src/filesystem/tests/Cases/AbstractTestCase.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Cases; use PHPUnit\Framework\TestCase; diff --git a/src/filesystem/tests/Cases/FilesystemFactoryTest.php b/src/filesystem/tests/Cases/FilesystemFactoryTest.php index 3db988446..313530425 100644 --- a/src/filesystem/tests/Cases/FilesystemFactoryTest.php +++ b/src/filesystem/tests/Cases/FilesystemFactoryTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Cases; use Hyperf\Config\Config; diff --git a/src/framework/src/ApplicationFactory.php b/src/framework/src/ApplicationFactory.php index 992661191..bd9615f59 100644 --- a/src/framework/src/ApplicationFactory.php +++ b/src/framework/src/ApplicationFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework; use Hyperf\Command\Annotation\Command; diff --git a/src/framework/src/Bootstrap/CloseCallback.php b/src/framework/src/Bootstrap/CloseCallback.php index b1b3957f8..3048a676b 100644 --- a/src/framework/src/Bootstrap/CloseCallback.php +++ b/src/framework/src/Bootstrap/CloseCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnClose; diff --git a/src/framework/src/Bootstrap/ConnectCallback.php b/src/framework/src/Bootstrap/ConnectCallback.php index 7fb5dde01..93c2d6597 100644 --- a/src/framework/src/Bootstrap/ConnectCallback.php +++ b/src/framework/src/Bootstrap/ConnectCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnConnect; diff --git a/src/framework/src/Bootstrap/FinishCallback.php b/src/framework/src/Bootstrap/FinishCallback.php index cdc38ee78..9a978f45d 100644 --- a/src/framework/src/Bootstrap/FinishCallback.php +++ b/src/framework/src/Bootstrap/FinishCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnFinish; diff --git a/src/framework/src/Bootstrap/ManagerStartCallback.php b/src/framework/src/Bootstrap/ManagerStartCallback.php index 10fe5fa1d..44c96a67e 100644 --- a/src/framework/src/Bootstrap/ManagerStartCallback.php +++ b/src/framework/src/Bootstrap/ManagerStartCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnManagerStart; diff --git a/src/framework/src/Bootstrap/ManagerStopCallback.php b/src/framework/src/Bootstrap/ManagerStopCallback.php index fc7804276..55c509f15 100644 --- a/src/framework/src/Bootstrap/ManagerStopCallback.php +++ b/src/framework/src/Bootstrap/ManagerStopCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnManagerStop; diff --git a/src/framework/src/Bootstrap/PacketCallback.php b/src/framework/src/Bootstrap/PacketCallback.php index 4b0b9ffaf..d77f90fb9 100644 --- a/src/framework/src/Bootstrap/PacketCallback.php +++ b/src/framework/src/Bootstrap/PacketCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnPacket; diff --git a/src/framework/src/Bootstrap/PipeMessageCallback.php b/src/framework/src/Bootstrap/PipeMessageCallback.php index a1c2907d8..512eb6783 100644 --- a/src/framework/src/Bootstrap/PipeMessageCallback.php +++ b/src/framework/src/Bootstrap/PipeMessageCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnPipeMessage; diff --git a/src/framework/src/Bootstrap/ReceiveCallback.php b/src/framework/src/Bootstrap/ReceiveCallback.php index 5386079e2..0f79b7101 100644 --- a/src/framework/src/Bootstrap/ReceiveCallback.php +++ b/src/framework/src/Bootstrap/ReceiveCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnReceive; diff --git a/src/framework/src/Bootstrap/ServerStartCallback.php b/src/framework/src/Bootstrap/ServerStartCallback.php index 337fec491..dfdac643c 100644 --- a/src/framework/src/Bootstrap/ServerStartCallback.php +++ b/src/framework/src/Bootstrap/ServerStartCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; class ServerStartCallback diff --git a/src/framework/src/Bootstrap/ShutdownCallback.php b/src/framework/src/Bootstrap/ShutdownCallback.php index 556761f3f..6d5c04642 100644 --- a/src/framework/src/Bootstrap/ShutdownCallback.php +++ b/src/framework/src/Bootstrap/ShutdownCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnShutdown; diff --git a/src/framework/src/Bootstrap/StartCallback.php b/src/framework/src/Bootstrap/StartCallback.php index fe89abd0c..bd5259d8f 100644 --- a/src/framework/src/Bootstrap/StartCallback.php +++ b/src/framework/src/Bootstrap/StartCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnStart; diff --git a/src/framework/src/Bootstrap/TaskCallback.php b/src/framework/src/Bootstrap/TaskCallback.php index 640d41943..921305ad3 100644 --- a/src/framework/src/Bootstrap/TaskCallback.php +++ b/src/framework/src/Bootstrap/TaskCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Contract\ConfigInterface; diff --git a/src/framework/src/Bootstrap/WorkerErrorCallback.php b/src/framework/src/Bootstrap/WorkerErrorCallback.php index 373ece434..140d0a080 100644 --- a/src/framework/src/Bootstrap/WorkerErrorCallback.php +++ b/src/framework/src/Bootstrap/WorkerErrorCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnWorkerError; diff --git a/src/framework/src/Bootstrap/WorkerExitCallback.php b/src/framework/src/Bootstrap/WorkerExitCallback.php index 67c20ab9b..95671418c 100644 --- a/src/framework/src/Bootstrap/WorkerExitCallback.php +++ b/src/framework/src/Bootstrap/WorkerExitCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnWorkerExit; diff --git a/src/framework/src/Bootstrap/WorkerStartCallback.php b/src/framework/src/Bootstrap/WorkerStartCallback.php index e0c87474a..98a4e82ba 100644 --- a/src/framework/src/Bootstrap/WorkerStartCallback.php +++ b/src/framework/src/Bootstrap/WorkerStartCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/framework/src/Bootstrap/WorkerStopCallback.php b/src/framework/src/Bootstrap/WorkerStopCallback.php index 1246b7f8f..a35862332 100644 --- a/src/framework/src/Bootstrap/WorkerStopCallback.php +++ b/src/framework/src/Bootstrap/WorkerStopCallback.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Bootstrap; use Hyperf\Framework\Event\OnWorkerStop; diff --git a/src/framework/src/ConfigProvider.php b/src/framework/src/ConfigProvider.php index 62ee45f2e..17808ff78 100644 --- a/src/framework/src/ConfigProvider.php +++ b/src/framework/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework; use Hyperf\Contract\ApplicationInterface; diff --git a/src/framework/src/Event/AfterWorkerStart.php b/src/framework/src/Event/AfterWorkerStart.php index 730b4e51c..b2d7efc08 100644 --- a/src/framework/src/Event/AfterWorkerStart.php +++ b/src/framework/src/Event/AfterWorkerStart.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class AfterWorkerStart diff --git a/src/framework/src/Event/BeforeMainServerStart.php b/src/framework/src/Event/BeforeMainServerStart.php index f1f865313..dae7eecf0 100644 --- a/src/framework/src/Event/BeforeMainServerStart.php +++ b/src/framework/src/Event/BeforeMainServerStart.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; use Swoole\Http\Server as SwooleHttpServer; diff --git a/src/framework/src/Event/BeforeServerStart.php b/src/framework/src/Event/BeforeServerStart.php index 627d49c32..96d509011 100644 --- a/src/framework/src/Event/BeforeServerStart.php +++ b/src/framework/src/Event/BeforeServerStart.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class BeforeServerStart diff --git a/src/framework/src/Event/BeforeWorkerStart.php b/src/framework/src/Event/BeforeWorkerStart.php index a0ffffc6e..56a70643c 100644 --- a/src/framework/src/Event/BeforeWorkerStart.php +++ b/src/framework/src/Event/BeforeWorkerStart.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class BeforeWorkerStart diff --git a/src/framework/src/Event/BootApplication.php b/src/framework/src/Event/BootApplication.php index a413b5a51..d6123b363 100644 --- a/src/framework/src/Event/BootApplication.php +++ b/src/framework/src/Event/BootApplication.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class BootApplication diff --git a/src/framework/src/Event/MainWorkerStart.php b/src/framework/src/Event/MainWorkerStart.php index 1e64f604a..5967ccd28 100644 --- a/src/framework/src/Event/MainWorkerStart.php +++ b/src/framework/src/Event/MainWorkerStart.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class MainWorkerStart diff --git a/src/framework/src/Event/OnClose.php b/src/framework/src/Event/OnClose.php index 034245407..bf2005c15 100644 --- a/src/framework/src/Event/OnClose.php +++ b/src/framework/src/Event/OnClose.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class OnClose diff --git a/src/framework/src/Event/OnConnect.php b/src/framework/src/Event/OnConnect.php index ae01970a5..406cd95b7 100644 --- a/src/framework/src/Event/OnConnect.php +++ b/src/framework/src/Event/OnConnect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class OnConnect diff --git a/src/framework/src/Event/OnFinish.php b/src/framework/src/Event/OnFinish.php index f929dd6fc..78218526e 100644 --- a/src/framework/src/Event/OnFinish.php +++ b/src/framework/src/Event/OnFinish.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; use Swoole\Server; diff --git a/src/framework/src/Event/OnManagerStart.php b/src/framework/src/Event/OnManagerStart.php index a817cb44b..36fc6684a 100644 --- a/src/framework/src/Event/OnManagerStart.php +++ b/src/framework/src/Event/OnManagerStart.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; use Swoole\Server; diff --git a/src/framework/src/Event/OnManagerStop.php b/src/framework/src/Event/OnManagerStop.php index 19459c254..2b8a3cb51 100644 --- a/src/framework/src/Event/OnManagerStop.php +++ b/src/framework/src/Event/OnManagerStop.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; use Swoole\Server; diff --git a/src/framework/src/Event/OnPacket.php b/src/framework/src/Event/OnPacket.php index ead1d9b57..21de86606 100644 --- a/src/framework/src/Event/OnPacket.php +++ b/src/framework/src/Event/OnPacket.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class OnPacket diff --git a/src/framework/src/Event/OnPipeMessage.php b/src/framework/src/Event/OnPipeMessage.php index 7fffc7dc1..26ecbbc0f 100644 --- a/src/framework/src/Event/OnPipeMessage.php +++ b/src/framework/src/Event/OnPipeMessage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; use Swoole\Server; diff --git a/src/framework/src/Event/OnReceive.php b/src/framework/src/Event/OnReceive.php index ec87603de..224d1a645 100644 --- a/src/framework/src/Event/OnReceive.php +++ b/src/framework/src/Event/OnReceive.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class OnReceive diff --git a/src/framework/src/Event/OnShutdown.php b/src/framework/src/Event/OnShutdown.php index fd3176ce9..30da65c28 100644 --- a/src/framework/src/Event/OnShutdown.php +++ b/src/framework/src/Event/OnShutdown.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; use Swoole\Server; diff --git a/src/framework/src/Event/OnStart.php b/src/framework/src/Event/OnStart.php index 0dabe74de..b61692612 100644 --- a/src/framework/src/Event/OnStart.php +++ b/src/framework/src/Event/OnStart.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; use Swoole\Server; diff --git a/src/framework/src/Event/OnTask.php b/src/framework/src/Event/OnTask.php index 9de58670d..58c2e845a 100644 --- a/src/framework/src/Event/OnTask.php +++ b/src/framework/src/Event/OnTask.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; use Psr\EventDispatcher\StoppableEventInterface; diff --git a/src/framework/src/Event/OnWorkerError.php b/src/framework/src/Event/OnWorkerError.php index d7a59b0ec..c8ca98e18 100644 --- a/src/framework/src/Event/OnWorkerError.php +++ b/src/framework/src/Event/OnWorkerError.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class OnWorkerError diff --git a/src/framework/src/Event/OnWorkerExit.php b/src/framework/src/Event/OnWorkerExit.php index 6367fc19f..893e93032 100644 --- a/src/framework/src/Event/OnWorkerExit.php +++ b/src/framework/src/Event/OnWorkerExit.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class OnWorkerExit diff --git a/src/framework/src/Event/OnWorkerStop.php b/src/framework/src/Event/OnWorkerStop.php index aaef8f37e..5ca8c8885 100644 --- a/src/framework/src/Event/OnWorkerStop.php +++ b/src/framework/src/Event/OnWorkerStop.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class OnWorkerStop diff --git a/src/framework/src/Event/OtherWorkerStart.php b/src/framework/src/Event/OtherWorkerStart.php index 7ea8308f6..567c66eb0 100644 --- a/src/framework/src/Event/OtherWorkerStart.php +++ b/src/framework/src/Event/OtherWorkerStart.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Event; class OtherWorkerStart diff --git a/src/framework/src/Exception/NotImplementedException.php b/src/framework/src/Exception/NotImplementedException.php index c43cc08ca..7c81d18ed 100644 --- a/src/framework/src/Exception/NotImplementedException.php +++ b/src/framework/src/Exception/NotImplementedException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Exception; class NotImplementedException extends \RuntimeException diff --git a/src/framework/src/Logger/StdoutLogger.php b/src/framework/src/Logger/StdoutLogger.php index 219c29c7a..3e86e899a 100644 --- a/src/framework/src/Logger/StdoutLogger.php +++ b/src/framework/src/Logger/StdoutLogger.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework\Logger; use Hyperf\Contract\ConfigInterface; diff --git a/src/framework/src/SymfonyEventDispatcher.php b/src/framework/src/SymfonyEventDispatcher.php index 4a6b41ab7..0a0caf4aa 100644 --- a/src/framework/src/SymfonyEventDispatcher.php +++ b/src/framework/src/SymfonyEventDispatcher.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Framework; use Hyperf\Framework\Exception\NotImplementedException; diff --git a/src/framework/tests/StdoutLoggerTest.php b/src/framework/tests/StdoutLoggerTest.php index 0c34d8bd6..8df1b6a73 100644 --- a/src/framework/tests/StdoutLoggerTest.php +++ b/src/framework/tests/StdoutLoggerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Framework; use Hyperf\Config\Config; diff --git a/src/graphql/src/Annotation/AnnotationTrait.php b/src/graphql/src/Annotation/AnnotationTrait.php index cbfb90ee5..0692e7015 100644 --- a/src/graphql/src/Annotation/AnnotationTrait.php +++ b/src/graphql/src/Annotation/AnnotationTrait.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL\Annotation; use Hyperf\Di\Annotation\AnnotationCollector; diff --git a/src/graphql/src/Annotation/ExtendType.php b/src/graphql/src/Annotation/ExtendType.php index afa57bdcf..51cf31c36 100644 --- a/src/graphql/src/Annotation/ExtendType.php +++ b/src/graphql/src/Annotation/ExtendType.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL\Annotation; use Hyperf\Di\Annotation\AnnotationInterface; diff --git a/src/graphql/src/Annotation/Factory.php b/src/graphql/src/Annotation/Factory.php index 1a6472e07..9f879af5e 100644 --- a/src/graphql/src/Annotation/Factory.php +++ b/src/graphql/src/Annotation/Factory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL\Annotation; use Hyperf\Di\Annotation\AnnotationInterface; diff --git a/src/graphql/src/Annotation/FailWith.php b/src/graphql/src/Annotation/FailWith.php index 9bbdb7067..4f73f6366 100644 --- a/src/graphql/src/Annotation/FailWith.php +++ b/src/graphql/src/Annotation/FailWith.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL\Annotation; use Hyperf\Di\Annotation\AnnotationInterface; diff --git a/src/graphql/src/Annotation/Field.php b/src/graphql/src/Annotation/Field.php index 85bbb8534..2604e1c9b 100644 --- a/src/graphql/src/Annotation/Field.php +++ b/src/graphql/src/Annotation/Field.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL\Annotation; use Hyperf\Di\Annotation\AnnotationInterface; diff --git a/src/graphql/src/Annotation/Logged.php b/src/graphql/src/Annotation/Logged.php index 0500ff168..b7b1e3b04 100644 --- a/src/graphql/src/Annotation/Logged.php +++ b/src/graphql/src/Annotation/Logged.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL\Annotation; use Hyperf\Di\Annotation\AnnotationInterface; diff --git a/src/graphql/src/Annotation/Mutation.php b/src/graphql/src/Annotation/Mutation.php index 62cbff89b..4559020a8 100644 --- a/src/graphql/src/Annotation/Mutation.php +++ b/src/graphql/src/Annotation/Mutation.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL\Annotation; use Hyperf\Di\Annotation\AnnotationInterface; diff --git a/src/graphql/src/Annotation/Query.php b/src/graphql/src/Annotation/Query.php index d54be00e6..34231fdf7 100644 --- a/src/graphql/src/Annotation/Query.php +++ b/src/graphql/src/Annotation/Query.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL\Annotation; use Hyperf\Di\Annotation\AnnotationInterface; diff --git a/src/graphql/src/Annotation/Right.php b/src/graphql/src/Annotation/Right.php index e85677d22..1c200fd64 100644 --- a/src/graphql/src/Annotation/Right.php +++ b/src/graphql/src/Annotation/Right.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL\Annotation; use Hyperf\Di\Annotation\AnnotationInterface; diff --git a/src/graphql/src/Annotation/SourceField.php b/src/graphql/src/Annotation/SourceField.php index 8d23d8e8a..7637c0067 100644 --- a/src/graphql/src/Annotation/SourceField.php +++ b/src/graphql/src/Annotation/SourceField.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL\Annotation; use Hyperf\Di\Annotation\AnnotationInterface; diff --git a/src/graphql/src/Annotation/Type.php b/src/graphql/src/Annotation/Type.php index a15dd9408..5d0fb2993 100644 --- a/src/graphql/src/Annotation/Type.php +++ b/src/graphql/src/Annotation/Type.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL\Annotation; use Hyperf\Di\Annotation\AnnotationInterface; diff --git a/src/graphql/src/AnnotationReader.php b/src/graphql/src/AnnotationReader.php index f1bea0435..248f4afd0 100644 --- a/src/graphql/src/AnnotationReader.php +++ b/src/graphql/src/AnnotationReader.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use Doctrine\Common\Annotations\AnnotationException; diff --git a/src/graphql/src/ClassCollector.php b/src/graphql/src/ClassCollector.php index 4e3d71a70..964265ebb 100644 --- a/src/graphql/src/ClassCollector.php +++ b/src/graphql/src/ClassCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; class ClassCollector diff --git a/src/graphql/src/ConfigProvider.php b/src/graphql/src/ConfigProvider.php index 6912be988..51e38c849 100644 --- a/src/graphql/src/ConfigProvider.php +++ b/src/graphql/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use Doctrine\Common\Annotations\Reader; diff --git a/src/graphql/src/FieldsBuilder.php b/src/graphql/src/FieldsBuilder.php index 0ac75bf97..3ae0e90fe 100644 --- a/src/graphql/src/FieldsBuilder.php +++ b/src/graphql/src/FieldsBuilder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use GraphQL\Type\Definition\NonNull; diff --git a/src/graphql/src/FieldsBuilderFactory.php b/src/graphql/src/FieldsBuilderFactory.php index 08b69c962..c23804629 100644 --- a/src/graphql/src/FieldsBuilderFactory.php +++ b/src/graphql/src/FieldsBuilderFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use TheCodingMachine\GraphQLite\Hydrators\HydratorInterface; diff --git a/src/graphql/src/GraphQLMiddleware.php b/src/graphql/src/GraphQLMiddleware.php index 5294351fe..34406503d 100644 --- a/src/graphql/src/GraphQLMiddleware.php +++ b/src/graphql/src/GraphQLMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use GraphQL\GraphQL; diff --git a/src/graphql/src/InputTypeGenerator.php b/src/graphql/src/InputTypeGenerator.php index 17c99e9b7..f68b70642 100644 --- a/src/graphql/src/InputTypeGenerator.php +++ b/src/graphql/src/InputTypeGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use GraphQL\Type\Definition\InputObjectType; diff --git a/src/graphql/src/InputTypeUtils.php b/src/graphql/src/InputTypeUtils.php index 171cb8dba..f2ded3458 100644 --- a/src/graphql/src/InputTypeUtils.php +++ b/src/graphql/src/InputTypeUtils.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use phpDocumentor\Reflection\Fqsen; diff --git a/src/graphql/src/QueryProvider.php b/src/graphql/src/QueryProvider.php index 241129e5e..7ccab1701 100644 --- a/src/graphql/src/QueryProvider.php +++ b/src/graphql/src/QueryProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use Hyperf\Di\Annotation\AnnotationCollector; diff --git a/src/graphql/src/ReaderFactory.php b/src/graphql/src/ReaderFactory.php index b124f3bbe..0d68aaac9 100644 --- a/src/graphql/src/ReaderFactory.php +++ b/src/graphql/src/ReaderFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use Doctrine\Common\Annotations\AnnotationReader; diff --git a/src/graphql/src/RecursiveTypeMapperFactory.php b/src/graphql/src/RecursiveTypeMapperFactory.php index 0264e549c..131e9f532 100644 --- a/src/graphql/src/RecursiveTypeMapperFactory.php +++ b/src/graphql/src/RecursiveTypeMapperFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use Doctrine\Common\Annotations\Reader; diff --git a/src/graphql/src/ResolvableInputObjectType.php b/src/graphql/src/ResolvableInputObjectType.php index 5e40f4f40..adeb8896f 100644 --- a/src/graphql/src/ResolvableInputObjectType.php +++ b/src/graphql/src/ResolvableInputObjectType.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use GraphQL\Type\Definition\InputObjectType; diff --git a/src/graphql/src/TypeAnnotatedObjectType.php b/src/graphql/src/TypeAnnotatedObjectType.php index 14c504001..2e82bd6f4 100644 --- a/src/graphql/src/TypeAnnotatedObjectType.php +++ b/src/graphql/src/TypeAnnotatedObjectType.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use TheCodingMachine\GraphQLite\Mappers\RecursiveTypeMapperInterface; diff --git a/src/graphql/src/TypeGenerator.php b/src/graphql/src/TypeGenerator.php index 4e5150dbe..124f8b386 100644 --- a/src/graphql/src/TypeGenerator.php +++ b/src/graphql/src/TypeGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use Psr\Container\ContainerInterface; diff --git a/src/graphql/src/TypeMapper.php b/src/graphql/src/TypeMapper.php index 5a2ef8415..a0605fc89 100644 --- a/src/graphql/src/TypeMapper.php +++ b/src/graphql/src/TypeMapper.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GraphQL; use GraphQL\Type\Definition\InputObjectType; diff --git a/src/grpc-client/src/BaseClient.php b/src/grpc-client/src/BaseClient.php index fcbe23d8b..0418e74ef 100644 --- a/src/grpc-client/src/BaseClient.php +++ b/src/grpc-client/src/BaseClient.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcClient; use Google\Protobuf\Internal\Message; diff --git a/src/grpc-client/src/BidiStreamingCall.php b/src/grpc-client/src/BidiStreamingCall.php index ba0ca4cd6..ff082f38f 100644 --- a/src/grpc-client/src/BidiStreamingCall.php +++ b/src/grpc-client/src/BidiStreamingCall.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcClient; class BidiStreamingCall extends StreamingCall diff --git a/src/grpc-client/src/ClientStreamingCall.php b/src/grpc-client/src/ClientStreamingCall.php index 9783ec06a..a6132e6b3 100644 --- a/src/grpc-client/src/ClientStreamingCall.php +++ b/src/grpc-client/src/ClientStreamingCall.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcClient; class ClientStreamingCall extends StreamingCall diff --git a/src/grpc-client/src/ConfigProvider.php b/src/grpc-client/src/ConfigProvider.php index 6548a82e5..d392eeb31 100644 --- a/src/grpc-client/src/ConfigProvider.php +++ b/src/grpc-client/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcClient; class ConfigProvider diff --git a/src/grpc-client/src/Exception/GrpcClientException.php b/src/grpc-client/src/Exception/GrpcClientException.php index 8e8c034cc..7153b3c85 100644 --- a/src/grpc-client/src/Exception/GrpcClientException.php +++ b/src/grpc-client/src/Exception/GrpcClientException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcClient\Exception; class GrpcClientException extends \RuntimeException diff --git a/src/grpc-client/src/GrpcClient.php b/src/grpc-client/src/GrpcClient.php index 43bdff168..0335d6211 100644 --- a/src/grpc-client/src/GrpcClient.php +++ b/src/grpc-client/src/GrpcClient.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcClient; use BadMethodCallException; diff --git a/src/grpc-client/src/Request.php b/src/grpc-client/src/Request.php index 5c9ed4fb6..25301f77f 100644 --- a/src/grpc-client/src/Request.php +++ b/src/grpc-client/src/Request.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcClient; use Google\Protobuf\Internal\Message; diff --git a/src/grpc-client/src/Status.php b/src/grpc-client/src/Status.php index cfa96af3f..ef882d05f 100644 --- a/src/grpc-client/src/Status.php +++ b/src/grpc-client/src/Status.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcClient; final class Status diff --git a/src/grpc-client/src/StreamingCall.php b/src/grpc-client/src/StreamingCall.php index f0523ad04..b43781535 100644 --- a/src/grpc-client/src/StreamingCall.php +++ b/src/grpc-client/src/StreamingCall.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcClient; use Hyperf\Grpc\Parser; diff --git a/src/grpc-client/tests/BaseClientTest.php b/src/grpc-client/tests/BaseClientTest.php index b448d9ad6..c09d1b164 100644 --- a/src/grpc-client/tests/BaseClientTest.php +++ b/src/grpc-client/tests/BaseClientTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\GrpcClient; use Grpc\UserReply; diff --git a/src/grpc-client/tests/GPBMetadata/Grpc.php b/src/grpc-client/tests/GPBMetadata/Grpc.php index 48383ee11..81da594f1 100644 --- a/src/grpc-client/tests/GPBMetadata/Grpc.php +++ b/src/grpc-client/tests/GPBMetadata/Grpc.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - # source: grpc.proto namespace GPBMetadata; diff --git a/src/grpc-client/tests/Grpc/Info.php b/src/grpc-client/tests/Grpc/Info.php index fe62e3f64..5962ab567 100644 --- a/src/grpc-client/tests/Grpc/Info.php +++ b/src/grpc-client/tests/Grpc/Info.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - # source: grpc.proto namespace Grpc; diff --git a/src/grpc-client/tests/Grpc/UserReply.php b/src/grpc-client/tests/Grpc/UserReply.php index 4e8afe120..d955cf841 100644 --- a/src/grpc-client/tests/Grpc/UserReply.php +++ b/src/grpc-client/tests/Grpc/UserReply.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - # source: grpc.proto namespace Grpc; diff --git a/src/grpc-client/tests/RequestTest.php b/src/grpc-client/tests/RequestTest.php index bcdb92410..6ebee1215 100644 --- a/src/grpc-client/tests/RequestTest.php +++ b/src/grpc-client/tests/RequestTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\GrpcClient; use Grpc\Info; diff --git a/src/grpc-client/tests/Stub/HiClient.php b/src/grpc-client/tests/Stub/HiClient.php index d91a82de0..133d75917 100644 --- a/src/grpc-client/tests/Stub/HiClient.php +++ b/src/grpc-client/tests/Stub/HiClient.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\GrpcClient\Stub; use Grpc\Info; diff --git a/src/grpc-server/src/ConfigProvider.php b/src/grpc-server/src/ConfigProvider.php index 5be73978e..fff67bd76 100644 --- a/src/grpc-server/src/ConfigProvider.php +++ b/src/grpc-server/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcServer; class ConfigProvider diff --git a/src/grpc-server/src/CoreMiddleware.php b/src/grpc-server/src/CoreMiddleware.php index 3f287f8be..858d0fad2 100644 --- a/src/grpc-server/src/CoreMiddleware.php +++ b/src/grpc-server/src/CoreMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcServer; use FastRoute\Dispatcher; @@ -131,7 +130,7 @@ class CoreMiddleware extends HttpCoreMiddleware $ref = $definition['ref']; $class = ReflectionManager::reflectClass($ref); $parentClass = $class->getParentClass(); - if ($parentClass->getName() === ProtobufMessage::class) { + if ($parentClass && $parentClass->getName() === ProtobufMessage::class) { $request = $this->request(); $stream = $request->getBody(); return Parser::deserializeMessage([$class->getName(), null], $stream->getContents()); diff --git a/src/grpc-server/src/Exception/GrpcException.php b/src/grpc-server/src/Exception/GrpcException.php index 0d81e605c..7b4d07df7 100644 --- a/src/grpc-server/src/Exception/GrpcException.php +++ b/src/grpc-server/src/Exception/GrpcException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcServer\Exception; use Hyperf\Server\Exception\ServerException; diff --git a/src/grpc-server/src/Exception/Handler/GrpcExceptionHandler.php b/src/grpc-server/src/Exception/Handler/GrpcExceptionHandler.php index cc893493c..af461b38c 100644 --- a/src/grpc-server/src/Exception/Handler/GrpcExceptionHandler.php +++ b/src/grpc-server/src/Exception/Handler/GrpcExceptionHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcServer\Exception\Handler; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/grpc-server/src/Server.php b/src/grpc-server/src/Server.php index 4960e49db..828539be8 100644 --- a/src/grpc-server/src/Server.php +++ b/src/grpc-server/src/Server.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\GrpcServer; use Hyperf\Contract\ConfigInterface; diff --git a/src/grpc-server/tests/GrpcExceptionHandlerTest.php b/src/grpc-server/tests/GrpcExceptionHandlerTest.php index 128f8cc39..a68c99eea 100644 --- a/src/grpc-server/tests/GrpcExceptionHandlerTest.php +++ b/src/grpc-server/tests/GrpcExceptionHandlerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\GrpcServer; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/grpc-server/tests/Stub/GrpcExceptionHandlerStub.php b/src/grpc-server/tests/Stub/GrpcExceptionHandlerStub.php index fa2e9f4bd..c90d0edca 100644 --- a/src/grpc-server/tests/Stub/GrpcExceptionHandlerStub.php +++ b/src/grpc-server/tests/Stub/GrpcExceptionHandlerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\GrpcServer\Stub; use Hyperf\GrpcServer\Exception\Handler\GrpcExceptionHandler; diff --git a/src/grpc/src/Parser.php b/src/grpc/src/Parser.php index aad176a16..68446614a 100644 --- a/src/grpc/src/Parser.php +++ b/src/grpc/src/Parser.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Grpc; use Google\Protobuf\Internal\Message; diff --git a/src/grpc/src/StatusCode.php b/src/grpc/src/StatusCode.php index c47a336df..feb4bc7ab 100644 --- a/src/grpc/src/StatusCode.php +++ b/src/grpc/src/StatusCode.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Grpc; /** diff --git a/src/guzzle/src/ClientFactory.php b/src/guzzle/src/ClientFactory.php index af21a193e..dc200449a 100644 --- a/src/guzzle/src/ClientFactory.php +++ b/src/guzzle/src/ClientFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Guzzle; use GuzzleHttp\Client; diff --git a/src/guzzle/src/CoroutineHandler.php b/src/guzzle/src/CoroutineHandler.php index dc7b10567..379c40ac8 100644 --- a/src/guzzle/src/CoroutineHandler.php +++ b/src/guzzle/src/CoroutineHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Guzzle; use GuzzleHttp\Exception\ConnectException; diff --git a/src/guzzle/src/HandlerStackFactory.php b/src/guzzle/src/HandlerStackFactory.php index 385bc0f91..056884c56 100644 --- a/src/guzzle/src/HandlerStackFactory.php +++ b/src/guzzle/src/HandlerStackFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Guzzle; use GuzzleHttp\HandlerStack; diff --git a/src/guzzle/src/MiddlewareInterface.php b/src/guzzle/src/MiddlewareInterface.php index 7f20d6004..133484fde 100644 --- a/src/guzzle/src/MiddlewareInterface.php +++ b/src/guzzle/src/MiddlewareInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Guzzle; interface MiddlewareInterface diff --git a/src/guzzle/src/PoolHandler.php b/src/guzzle/src/PoolHandler.php index f3cc75865..d05dced5b 100644 --- a/src/guzzle/src/PoolHandler.php +++ b/src/guzzle/src/PoolHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Guzzle; use GuzzleHttp\Promise\FulfilledPromise; diff --git a/src/guzzle/src/RetryMiddleware.php b/src/guzzle/src/RetryMiddleware.php index 950902e73..26b34168f 100644 --- a/src/guzzle/src/RetryMiddleware.php +++ b/src/guzzle/src/RetryMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Guzzle; use GuzzleHttp\Middleware; diff --git a/src/guzzle/src/RingPHP/CoroutineHandler.php b/src/guzzle/src/RingPHP/CoroutineHandler.php index b2bb0ecff..779dc07cb 100644 --- a/src/guzzle/src/RingPHP/CoroutineHandler.php +++ b/src/guzzle/src/RingPHP/CoroutineHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Guzzle\RingPHP; use GuzzleHttp\Ring\Core; diff --git a/src/guzzle/src/RingPHP/PoolHandler.php b/src/guzzle/src/RingPHP/PoolHandler.php index c97f7c518..c548906a8 100644 --- a/src/guzzle/src/RingPHP/PoolHandler.php +++ b/src/guzzle/src/RingPHP/PoolHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Guzzle\RingPHP; use GuzzleHttp\Ring\Core; diff --git a/src/guzzle/tests/Cases/CoroutineHandlerTest.php b/src/guzzle/tests/Cases/CoroutineHandlerTest.php index ef8f6791d..59f239c32 100644 --- a/src/guzzle/tests/Cases/CoroutineHandlerTest.php +++ b/src/guzzle/tests/Cases/CoroutineHandlerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Guzzle\Cases; use GuzzleHttp\Client; diff --git a/src/guzzle/tests/Cases/HandlerStackFactoryTest.php b/src/guzzle/tests/Cases/HandlerStackFactoryTest.php index 6422e075b..266432afd 100644 --- a/src/guzzle/tests/Cases/HandlerStackFactoryTest.php +++ b/src/guzzle/tests/Cases/HandlerStackFactoryTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Guzzle\Cases; use GuzzleHttp\Client; diff --git a/src/guzzle/tests/Cases/PoolHandlerTest.php b/src/guzzle/tests/Cases/PoolHandlerTest.php index e8b6eeba5..8164821e5 100644 --- a/src/guzzle/tests/Cases/PoolHandlerTest.php +++ b/src/guzzle/tests/Cases/PoolHandlerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Guzzle\Cases; use PHPUnit\Framework\TestCase; diff --git a/src/guzzle/tests/Cases/RingPHPCoroutineHandlerTest.php b/src/guzzle/tests/Cases/RingPHPCoroutineHandlerTest.php index 35071587c..fb2a29cc9 100644 --- a/src/guzzle/tests/Cases/RingPHPCoroutineHandlerTest.php +++ b/src/guzzle/tests/Cases/RingPHPCoroutineHandlerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyerfTest\Guzzle\Cases; use GuzzleHttp\Ring\Exception\RingException; diff --git a/src/guzzle/tests/Stub/CoroutineHandlerStub.php b/src/guzzle/tests/Stub/CoroutineHandlerStub.php index b6dffde05..ba383f935 100644 --- a/src/guzzle/tests/Stub/CoroutineHandlerStub.php +++ b/src/guzzle/tests/Stub/CoroutineHandlerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Guzzle\Stub; use Hyperf\Guzzle\CoroutineHandler; diff --git a/src/guzzle/tests/Stub/HandlerStackFactoryStub.php b/src/guzzle/tests/Stub/HandlerStackFactoryStub.php index d94ea7120..11485d6f1 100644 --- a/src/guzzle/tests/Stub/HandlerStackFactoryStub.php +++ b/src/guzzle/tests/Stub/HandlerStackFactoryStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Guzzle\Stub; use Hyperf\Guzzle\HandlerStackFactory; diff --git a/src/guzzle/tests/Stub/RingPHPCoroutineHanderStub.php b/src/guzzle/tests/Stub/RingPHPCoroutineHanderStub.php index f79e90ef9..cbb1af6c2 100644 --- a/src/guzzle/tests/Stub/RingPHPCoroutineHanderStub.php +++ b/src/guzzle/tests/Stub/RingPHPCoroutineHanderStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Guzzle\Stub; use Hyperf\Guzzle\RingPHP\CoroutineHandler; diff --git a/src/http-message/src/Base/MessageTrait.php b/src/http-message/src/Base/MessageTrait.php index 21753e87a..3e301d65d 100755 --- a/src/http-message/src/Base/MessageTrait.php +++ b/src/http-message/src/Base/MessageTrait.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Base; use Hyperf\HttpMessage\Stream\SwooleStream; diff --git a/src/http-message/src/Base/Request.php b/src/http-message/src/Base/Request.php index ab74c7969..8f1fd5265 100755 --- a/src/http-message/src/Base/Request.php +++ b/src/http-message/src/Base/Request.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Base; use Hyperf\HttpMessage\Stream\SwooleStream; diff --git a/src/http-message/src/Base/Response.php b/src/http-message/src/Base/Response.php index af7177d10..dc37b031b 100755 --- a/src/http-message/src/Base/Response.php +++ b/src/http-message/src/Base/Response.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Base; use Psr\Http\Message\ResponseInterface; diff --git a/src/http-message/src/Cookie/Cookie.php b/src/http-message/src/Cookie/Cookie.php index 722349c69..e8b5d0d6f 100755 --- a/src/http-message/src/Cookie/Cookie.php +++ b/src/http-message/src/Cookie/Cookie.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Cookie; class Cookie diff --git a/src/http-message/src/Cookie/CookieJar.php b/src/http-message/src/Cookie/CookieJar.php index 003adca88..94c56057a 100755 --- a/src/http-message/src/Cookie/CookieJar.php +++ b/src/http-message/src/Cookie/CookieJar.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Cookie; use Psr\Http\Message\RequestInterface; diff --git a/src/http-message/src/Cookie/CookieJarInterface.php b/src/http-message/src/Cookie/CookieJarInterface.php index db4ac3520..a4494dbd6 100755 --- a/src/http-message/src/Cookie/CookieJarInterface.php +++ b/src/http-message/src/Cookie/CookieJarInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Cookie; use Psr\Http\Message\RequestInterface; diff --git a/src/http-message/src/Cookie/FileCookieJar.php b/src/http-message/src/Cookie/FileCookieJar.php index 6883520bd..308d494d7 100755 --- a/src/http-message/src/Cookie/FileCookieJar.php +++ b/src/http-message/src/Cookie/FileCookieJar.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Cookie; /** diff --git a/src/http-message/src/Cookie/SessionCookieJar.php b/src/http-message/src/Cookie/SessionCookieJar.php index d38697240..610d6204f 100755 --- a/src/http-message/src/Cookie/SessionCookieJar.php +++ b/src/http-message/src/Cookie/SessionCookieJar.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Cookie; /** diff --git a/src/http-message/src/Cookie/SetCookie.php b/src/http-message/src/Cookie/SetCookie.php index ffac22a18..a793d0721 100755 --- a/src/http-message/src/Cookie/SetCookie.php +++ b/src/http-message/src/Cookie/SetCookie.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Cookie; /** diff --git a/src/http-message/src/Server/Request.php b/src/http-message/src/Server/Request.php index 1af6b3f3d..544ea4652 100755 --- a/src/http-message/src/Server/Request.php +++ b/src/http-message/src/Server/Request.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Server; use Hyperf\HttpMessage\Stream\SwooleStream; diff --git a/src/http-message/src/Server/Response.php b/src/http-message/src/Server/Response.php index c25ec501a..257be742e 100755 --- a/src/http-message/src/Server/Response.php +++ b/src/http-message/src/Server/Response.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Server; use Hyperf\Contract\Sendable; diff --git a/src/http-message/src/Stream/FileInterface.php b/src/http-message/src/Stream/FileInterface.php index 2ede368ee..f5f5a09de 100644 --- a/src/http-message/src/Stream/FileInterface.php +++ b/src/http-message/src/Stream/FileInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Stream; interface FileInterface diff --git a/src/http-message/src/Stream/StandardStream.php b/src/http-message/src/Stream/StandardStream.php new file mode 100644 index 000000000..17734af7d --- /dev/null +++ b/src/http-message/src/Stream/StandardStream.php @@ -0,0 +1,264 @@ + + * Author: Martijn van der Ven . + * @license https://github.com/Nyholm/psr7/blob/master/LICENSE + */ +final class StandardStream implements StreamInterface +{ + /** @var array Hash of readable and writable stream types */ + private const READ_WRITE_HASH = [ + 'read' => [ + 'r' => true, 'w+' => true, 'r+' => true, 'x+' => true, 'c+' => true, + 'rb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true, + 'c+b' => true, 'rt' => true, 'w+t' => true, 'r+t' => true, + 'x+t' => true, 'c+t' => true, 'a+' => true, + ], + 'write' => [ + 'w' => true, 'w+' => true, 'rw' => true, 'r+' => true, 'x+' => true, + 'c+' => true, 'wb' => true, 'w+b' => true, 'r+b' => true, + 'x+b' => true, 'c+b' => true, 'w+t' => true, 'r+t' => true, + 'x+t' => true, 'c+t' => true, 'a' => true, 'a+' => true, + ], + ]; + + /** @var null|resource A resource reference */ + private $stream; + + /** @var bool */ + private $seekable; + + /** @var bool */ + private $readable; + + /** @var bool */ + private $writable; + + /** @var null|array|mixed|void */ + private $uri; + + /** @var null|int */ + private $size; + + private function __construct() + { + } + + /** + * Closes the stream when the destructed. + */ + public function __destruct() + { + $this->close(); + } + + public function __toString(): string + { + try { + if ($this->isSeekable()) { + $this->seek(0); + } + + return $this->getContents(); + } catch (\Exception $e) { + return ''; + } + } + + /** + * Creates a new PSR-7 stream. + * + * @param resource|StreamInterface|string $body + * + * @throws \InvalidArgumentException + */ + public static function create($body = ''): StreamInterface + { + if ($body instanceof StreamInterface) { + return $body; + } + + if (\is_string($body)) { + $resource = \fopen('php://temp', 'rw+'); + \fwrite($resource, $body); + $body = $resource; + } + + if (\is_resource($body)) { + $new = new self(); + $new->stream = $body; + $meta = \stream_get_meta_data($new->stream); + $new->seekable = $meta['seekable'] && \fseek($new->stream, 0, \SEEK_CUR) === 0; + $new->readable = isset(self::READ_WRITE_HASH['read'][$meta['mode']]); + $new->writable = isset(self::READ_WRITE_HASH['write'][$meta['mode']]); + $new->uri = $new->getMetadata('uri'); + + return $new; + } + + throw new \InvalidArgumentException('First argument to Stream::create() must be a string, resource or StreamInterface.'); + } + + public function close(): void + { + if (isset($this->stream)) { + if (\is_resource($this->stream)) { + \fclose($this->stream); + } + $this->detach(); + } + } + + public function detach() + { + if (! isset($this->stream)) { + return null; + } + + $result = $this->stream; + unset($this->stream); + $this->size = $this->uri = null; + $this->readable = $this->writable = $this->seekable = false; + + return $result; + } + + public function getSize(): ?int + { + if ($this->size !== null) { + return $this->size; + } + + if (! isset($this->stream)) { + return null; + } + + // Clear the stat cache if the stream has a URI + if ($this->uri) { + \clearstatcache(true, $this->uri); + } + + $stats = \fstat($this->stream); + if (isset($stats['size'])) { + $this->size = $stats['size']; + + return $this->size; + } + + return null; + } + + public function tell(): int + { + if (false === $result = \ftell($this->stream)) { + throw new \RuntimeException('Unable to determine stream position'); + } + + return $result; + } + + public function eof(): bool + { + return ! $this->stream || \feof($this->stream); + } + + public function isSeekable(): bool + { + return $this->seekable; + } + + public function seek($offset, $whence = \SEEK_SET): void + { + if (! $this->seekable) { + throw new \RuntimeException('Stream is not seekable'); + } + + if (\fseek($this->stream, $offset, $whence) === -1) { + throw new \RuntimeException('Unable to seek to stream position ' . $offset . ' with whence ' . \var_export($whence, true)); + } + } + + public function rewind(): void + { + $this->seek(0); + } + + public function isWritable(): bool + { + return $this->writable; + } + + public function write($string): int + { + if (! $this->writable) { + throw new \RuntimeException('Cannot write to a non-writable stream'); + } + + // We can't know the size after writing anything + $this->size = null; + + if (false === $result = \fwrite($this->stream, $string)) { + throw new \RuntimeException('Unable to write to stream'); + } + + return $result; + } + + public function isReadable(): bool + { + return $this->readable; + } + + public function read($length): string + { + if (! $this->readable) { + throw new \RuntimeException('Cannot read from non-readable stream'); + } + + return \fread($this->stream, $length); + } + + public function getContents(): string + { + if (! isset($this->stream)) { + throw new \RuntimeException('Unable to read stream contents'); + } + + if (false === $contents = \stream_get_contents($this->stream)) { + throw new \RuntimeException('Unable to read stream contents'); + } + + return $contents; + } + + public function getMetadata($key = null) + { + if (! isset($this->stream)) { + return $key ? null : []; + } + + $meta = \stream_get_meta_data($this->stream); + + if ($key === null) { + return $meta; + } + + return $meta[$key] ?? null; + } +} diff --git a/src/http-message/src/Stream/SwooleFileStream.php b/src/http-message/src/Stream/SwooleFileStream.php index 0e54ca97b..dac47b03c 100644 --- a/src/http-message/src/Stream/SwooleFileStream.php +++ b/src/http-message/src/Stream/SwooleFileStream.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Stream; use Hyperf\HttpServer\Exception\Http\FileException; diff --git a/src/http-message/src/Stream/SwooleStream.php b/src/http-message/src/Stream/SwooleStream.php index 000e11dbd..c5d624814 100755 --- a/src/http-message/src/Stream/SwooleStream.php +++ b/src/http-message/src/Stream/SwooleStream.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Stream; use Psr\Http\Message\StreamInterface; diff --git a/src/http-message/src/Upload/UploadedFile.php b/src/http-message/src/Upload/UploadedFile.php index 519a9220a..d27baeec7 100755 --- a/src/http-message/src/Upload/UploadedFile.php +++ b/src/http-message/src/Upload/UploadedFile.php @@ -9,9 +9,9 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Upload; +use Hyperf\HttpMessage\Stream\StandardStream; use Psr\Http\Message\StreamInterface; use Psr\Http\Message\UploadedFileInterface; @@ -140,7 +140,10 @@ class UploadedFile extends \SplFileInfo implements UploadedFileInterface */ public function getStream() { - throw new \BadMethodCallException('Not implemented'); + if ($this->moved) { + throw new \RuntimeException('uploaded file is moved'); + } + return StandardStream::create(fopen($this->tmpFile, 'r+')); } /** diff --git a/src/http-message/src/Uri/Uri.php b/src/http-message/src/Uri/Uri.php index 19ff9e60d..87305f39e 100755 --- a/src/http-message/src/Uri/Uri.php +++ b/src/http-message/src/Uri/Uri.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpMessage\Uri; use Psr\Http\Message\UriInterface; diff --git a/src/http-message/tests/MessageTraitTest.php b/src/http-message/tests/MessageTraitTest.php index a7d8b43ac..bd59f430c 100644 --- a/src/http-message/tests/MessageTraitTest.php +++ b/src/http-message/tests/MessageTraitTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpMessage; use Hyperf\HttpMessage\Base\Request; diff --git a/src/http-message/tests/ServerRequestTest.php b/src/http-message/tests/ServerRequestTest.php index 7f7612b31..75bc2eff3 100644 --- a/src/http-message/tests/ServerRequestTest.php +++ b/src/http-message/tests/ServerRequestTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpMessage; use Hyperf\HttpMessage\Server\Request; diff --git a/src/http-message/tests/Stub/Server/RequestStub.php b/src/http-message/tests/Stub/Server/RequestStub.php index af0a09d8d..6e143eeb3 100644 --- a/src/http-message/tests/Stub/Server/RequestStub.php +++ b/src/http-message/tests/Stub/Server/RequestStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpMessage\Stub\Server; use Hyperf\HttpMessage\Server\Request; diff --git a/src/http-message/tests/SwooleStreamTest.php b/src/http-message/tests/SwooleStreamTest.php index 3674b9716..27e962de4 100644 --- a/src/http-message/tests/SwooleStreamTest.php +++ b/src/http-message/tests/SwooleStreamTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpMessage; use Hyperf\HttpMessage\Server\Response; diff --git a/src/http-server/src/Annotation/AutoController.php b/src/http-server/src/Annotation/AutoController.php index b77c26e53..db36b0047 100644 --- a/src/http-server/src/Annotation/AutoController.php +++ b/src/http-server/src/Annotation/AutoController.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/http-server/src/Annotation/Controller.php b/src/http-server/src/Annotation/Controller.php index 7403bd05e..2a234482b 100644 --- a/src/http-server/src/Annotation/Controller.php +++ b/src/http-server/src/Annotation/Controller.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/http-server/src/Annotation/DeleteMapping.php b/src/http-server/src/Annotation/DeleteMapping.php index ef8e50272..08b32106e 100644 --- a/src/http-server/src/Annotation/DeleteMapping.php +++ b/src/http-server/src/Annotation/DeleteMapping.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Annotation; /** diff --git a/src/http-server/src/Annotation/GetMapping.php b/src/http-server/src/Annotation/GetMapping.php index d5f9b18cf..5a6590530 100644 --- a/src/http-server/src/Annotation/GetMapping.php +++ b/src/http-server/src/Annotation/GetMapping.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Annotation; /** diff --git a/src/http-server/src/Annotation/Mapping.php b/src/http-server/src/Annotation/Mapping.php index 67e2804f4..3f327d685 100644 --- a/src/http-server/src/Annotation/Mapping.php +++ b/src/http-server/src/Annotation/Mapping.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/http-server/src/Annotation/Middleware.php b/src/http-server/src/Annotation/Middleware.php index 895c5c044..c04c6091f 100644 --- a/src/http-server/src/Annotation/Middleware.php +++ b/src/http-server/src/Annotation/Middleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/http-server/src/Annotation/Middlewares.php b/src/http-server/src/Annotation/Middlewares.php index 9f0ac561a..34e66728c 100644 --- a/src/http-server/src/Annotation/Middlewares.php +++ b/src/http-server/src/Annotation/Middlewares.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/http-server/src/Annotation/PatchMapping.php b/src/http-server/src/Annotation/PatchMapping.php index 640f941d6..ba626d719 100644 --- a/src/http-server/src/Annotation/PatchMapping.php +++ b/src/http-server/src/Annotation/PatchMapping.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Annotation; /** diff --git a/src/http-server/src/Annotation/PostMapping.php b/src/http-server/src/Annotation/PostMapping.php index 07bef5846..3415422bf 100644 --- a/src/http-server/src/Annotation/PostMapping.php +++ b/src/http-server/src/Annotation/PostMapping.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Annotation; /** diff --git a/src/http-server/src/Annotation/PutMapping.php b/src/http-server/src/Annotation/PutMapping.php index 906f93779..900c271b4 100644 --- a/src/http-server/src/Annotation/PutMapping.php +++ b/src/http-server/src/Annotation/PutMapping.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Annotation; /** diff --git a/src/http-server/src/Annotation/RequestMapping.php b/src/http-server/src/Annotation/RequestMapping.php index 268e74bed..47418e8bb 100644 --- a/src/http-server/src/Annotation/RequestMapping.php +++ b/src/http-server/src/Annotation/RequestMapping.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Annotation; use Hyperf\Utils\Str; diff --git a/src/http-server/src/ConfigProvider.php b/src/http-server/src/ConfigProvider.php index 6770aadec..54e6c95b9 100644 --- a/src/http-server/src/ConfigProvider.php +++ b/src/http-server/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer; use Hyperf\HttpServer\Contract\RequestInterface; diff --git a/src/http-server/src/Contract/CoreMiddlewareInterface.php b/src/http-server/src/Contract/CoreMiddlewareInterface.php index 30b4efea9..1af5fb129 100644 --- a/src/http-server/src/Contract/CoreMiddlewareInterface.php +++ b/src/http-server/src/Contract/CoreMiddlewareInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Contract; use Psr\Http\Message\ServerRequestInterface; diff --git a/src/http-server/src/Contract/RequestInterface.php b/src/http-server/src/Contract/RequestInterface.php index c6514e0b5..57098e98a 100644 --- a/src/http-server/src/Contract/RequestInterface.php +++ b/src/http-server/src/Contract/RequestInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Contract; use Hyperf\HttpMessage\Upload\UploadedFile; diff --git a/src/http-server/src/Contract/ResponseInterface.php b/src/http-server/src/Contract/ResponseInterface.php index e1d25c4fa..31878a3fb 100644 --- a/src/http-server/src/Contract/ResponseInterface.php +++ b/src/http-server/src/Contract/ResponseInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Contract; use Hyperf\HttpMessage\Cookie\Cookie; diff --git a/src/http-server/src/CoreMiddleware.php b/src/http-server/src/CoreMiddleware.php index f358a613c..669b056ae 100644 --- a/src/http-server/src/CoreMiddleware.php +++ b/src/http-server/src/CoreMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer; use Closure; diff --git a/src/http-server/src/Exception/Handler/HttpExceptionHandler.php b/src/http-server/src/Exception/Handler/HttpExceptionHandler.php index f80a46bf9..55f3f61a4 100644 --- a/src/http-server/src/Exception/Handler/HttpExceptionHandler.php +++ b/src/http-server/src/Exception/Handler/HttpExceptionHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Exception\Handler; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/http-server/src/Exception/Http/EncodingException.php b/src/http-server/src/Exception/Http/EncodingException.php index 31e902afc..80cccf90a 100644 --- a/src/http-server/src/Exception/Http/EncodingException.php +++ b/src/http-server/src/Exception/Http/EncodingException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Exception\Http; use Hyperf\Server\Exception\ServerException; diff --git a/src/http-server/src/Exception/Http/FileException.php b/src/http-server/src/Exception/Http/FileException.php index 24a176887..8200fa2ed 100644 --- a/src/http-server/src/Exception/Http/FileException.php +++ b/src/http-server/src/Exception/Http/FileException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Exception\Http; use Hyperf\Server\Exception\ServerException; diff --git a/src/http-server/src/Exception/Http/InvalidResponseException.php b/src/http-server/src/Exception/Http/InvalidResponseException.php index 162008c3c..109e00b5a 100644 --- a/src/http-server/src/Exception/Http/InvalidResponseException.php +++ b/src/http-server/src/Exception/Http/InvalidResponseException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Exception\Http; use Hyperf\Server\Exception\ServerException; diff --git a/src/http-server/src/Exception/Http/NotFoundException.php b/src/http-server/src/Exception/Http/NotFoundException.php index 831332968..594984b57 100644 --- a/src/http-server/src/Exception/Http/NotFoundException.php +++ b/src/http-server/src/Exception/Http/NotFoundException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Exception\Http; use Hyperf\Server\Exception\ServerException; diff --git a/src/http-server/src/MiddlewareManager.php b/src/http-server/src/MiddlewareManager.php index faf7a12cc..d64bb8340 100644 --- a/src/http-server/src/MiddlewareManager.php +++ b/src/http-server/src/MiddlewareManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer; class MiddlewareManager diff --git a/src/http-server/src/Request.php b/src/http-server/src/Request.php index 75c19bd80..7a809e54f 100644 --- a/src/http-server/src/Request.php +++ b/src/http-server/src/Request.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer; use Hyperf\HttpMessage\Upload\UploadedFile; diff --git a/src/http-server/src/Response.php b/src/http-server/src/Response.php index 65e9ea292..4f2879967 100644 --- a/src/http-server/src/Response.php +++ b/src/http-server/src/Response.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer; use BadMethodCallException; diff --git a/src/http-server/src/Router/Dispatched.php b/src/http-server/src/Router/Dispatched.php index f3bed49a9..7f25ac6d7 100644 --- a/src/http-server/src/Router/Dispatched.php +++ b/src/http-server/src/Router/Dispatched.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Router; use FastRoute\Dispatcher; diff --git a/src/http-server/src/Router/DispatcherFactory.php b/src/http-server/src/Router/DispatcherFactory.php index 349ef1f19..0f4e1be84 100644 --- a/src/http-server/src/Router/DispatcherFactory.php +++ b/src/http-server/src/Router/DispatcherFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Router; use FastRoute\DataGenerator\GroupCountBased as DataGenerator; diff --git a/src/http-server/src/Router/Handler.php b/src/http-server/src/Router/Handler.php index 9676820f6..7c81a3963 100644 --- a/src/http-server/src/Router/Handler.php +++ b/src/http-server/src/Router/Handler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Router; class Handler diff --git a/src/http-server/src/Router/RouteCollector.php b/src/http-server/src/Router/RouteCollector.php index 8adf01705..c8ce9b108 100644 --- a/src/http-server/src/Router/RouteCollector.php +++ b/src/http-server/src/Router/RouteCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Router; use FastRoute\DataGenerator; diff --git a/src/http-server/src/Router/Router.php b/src/http-server/src/Router/Router.php index 015eb7547..c17c76fd2 100644 --- a/src/http-server/src/Router/Router.php +++ b/src/http-server/src/Router/Router.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer\Router; /** diff --git a/src/http-server/src/Server.php b/src/http-server/src/Server.php index 1b0b95545..04ad16673 100644 --- a/src/http-server/src/Server.php +++ b/src/http-server/src/Server.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\HttpServer; use FastRoute\Dispatcher; diff --git a/src/http-server/tests/CoreMiddlewareTest.php b/src/http-server/tests/CoreMiddlewareTest.php index 203759c58..29493611b 100644 --- a/src/http-server/tests/CoreMiddlewareTest.php +++ b/src/http-server/tests/CoreMiddlewareTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpServer; use Hyperf\Contract\NormalizerInterface; diff --git a/src/http-server/tests/MappingAnnotationTest.php b/src/http-server/tests/MappingAnnotationTest.php index 8f24588fa..779d9f186 100644 --- a/src/http-server/tests/MappingAnnotationTest.php +++ b/src/http-server/tests/MappingAnnotationTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpServer; use Hyperf\HttpServer\Annotation\RequestMapping; diff --git a/src/http-server/tests/RequestTest.php b/src/http-server/tests/RequestTest.php index 762407e5d..eaa761a09 100644 --- a/src/http-server/tests/RequestTest.php +++ b/src/http-server/tests/RequestTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpServer; use Hyperf\HttpMessage\Upload\UploadedFile; diff --git a/src/http-server/tests/ResponseTest.php b/src/http-server/tests/ResponseTest.php index 3a9d95684..01135b268 100644 --- a/src/http-server/tests/ResponseTest.php +++ b/src/http-server/tests/ResponseTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpServer; use Hyperf\Contract\Sendable; diff --git a/src/http-server/tests/Router/DispatcherFactoryTest.php b/src/http-server/tests/Router/DispatcherFactoryTest.php index c3edec466..74f96d58d 100644 --- a/src/http-server/tests/Router/DispatcherFactoryTest.php +++ b/src/http-server/tests/Router/DispatcherFactoryTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpServer\Router; use Hyperf\HttpServer\Annotation\AutoController; diff --git a/src/http-server/tests/Router/RouteCollectorTest.php b/src/http-server/tests/Router/RouteCollectorTest.php index 81840a237..b9ee455d0 100644 --- a/src/http-server/tests/Router/RouteCollectorTest.php +++ b/src/http-server/tests/Router/RouteCollectorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpServer\Router; use FastRoute\DataGenerator\GroupCountBased as DataGenerator; diff --git a/src/http-server/tests/Stub/CoreMiddlewareStub.php b/src/http-server/tests/Stub/CoreMiddlewareStub.php index ffae90aa7..4d6a4118f 100644 --- a/src/http-server/tests/Stub/CoreMiddlewareStub.php +++ b/src/http-server/tests/Stub/CoreMiddlewareStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpServer\Stub; use Hyperf\HttpMessage\Server\Response; diff --git a/src/http-server/tests/Stub/DemoController.php b/src/http-server/tests/Stub/DemoController.php index c45a915e0..c2bf7a094 100644 --- a/src/http-server/tests/Stub/DemoController.php +++ b/src/http-server/tests/Stub/DemoController.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpServer\Stub; class DemoController diff --git a/src/http-server/tests/Stub/DispatcherFactory.php b/src/http-server/tests/Stub/DispatcherFactory.php index ed0acac72..c679f44e2 100644 --- a/src/http-server/tests/Stub/DispatcherFactory.php +++ b/src/http-server/tests/Stub/DispatcherFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpServer\Stub; use Hyperf\HttpServer\Annotation\AutoController; diff --git a/src/http-server/tests/Stub/RouteCollectorStub.php b/src/http-server/tests/Stub/RouteCollectorStub.php index fa0ab0cc0..1e8c0d270 100644 --- a/src/http-server/tests/Stub/RouteCollectorStub.php +++ b/src/http-server/tests/Stub/RouteCollectorStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpServer\Stub; use Hyperf\HttpServer\Router\RouteCollector; diff --git a/src/http-server/tests/Stub/SetHeaderMiddleware.php b/src/http-server/tests/Stub/SetHeaderMiddleware.php index e03d41ffa..5ac61b892 100644 --- a/src/http-server/tests/Stub/SetHeaderMiddleware.php +++ b/src/http-server/tests/Stub/SetHeaderMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\HttpServer\Stub; use Psr\Http\Message\ResponseInterface; diff --git a/src/json-rpc/src/ConfigProvider.php b/src/json-rpc/src/ConfigProvider.php index ce374870a..46ab1a0a8 100644 --- a/src/json-rpc/src/ConfigProvider.php +++ b/src/json-rpc/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use Hyperf\JsonRpc\Listener\RegisterProtocolListener; diff --git a/src/json-rpc/src/CoreMiddleware.php b/src/json-rpc/src/CoreMiddleware.php index 797334aff..8c9192bcf 100644 --- a/src/json-rpc/src/CoreMiddleware.php +++ b/src/json-rpc/src/CoreMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use Closure; diff --git a/src/json-rpc/src/DataFormatter.php b/src/json-rpc/src/DataFormatter.php index a379575ce..3acf91b01 100644 --- a/src/json-rpc/src/DataFormatter.php +++ b/src/json-rpc/src/DataFormatter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use Hyperf\Rpc\Context; diff --git a/src/json-rpc/src/DataFormatterFactory.php b/src/json-rpc/src/DataFormatterFactory.php index 1406a1049..cd01cec92 100644 --- a/src/json-rpc/src/DataFormatterFactory.php +++ b/src/json-rpc/src/DataFormatterFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use Hyperf\Contract\NormalizerInterface; diff --git a/src/json-rpc/src/Exception/Handler/HttpExceptionHandler.php b/src/json-rpc/src/Exception/Handler/HttpExceptionHandler.php index 08cefbb98..448833ed2 100644 --- a/src/json-rpc/src/Exception/Handler/HttpExceptionHandler.php +++ b/src/json-rpc/src/Exception/Handler/HttpExceptionHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc\Exception\Handler; class HttpExceptionHandler extends TcpExceptionHandler diff --git a/src/json-rpc/src/Exception/Handler/TcpExceptionHandler.php b/src/json-rpc/src/Exception/Handler/TcpExceptionHandler.php index 9c6d695ad..e4914fdd9 100644 --- a/src/json-rpc/src/Exception/Handler/TcpExceptionHandler.php +++ b/src/json-rpc/src/Exception/Handler/TcpExceptionHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc\Exception\Handler; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/json-rpc/src/HttpCoreMiddleware.php b/src/json-rpc/src/HttpCoreMiddleware.php index ab76e01db..37eb09410 100644 --- a/src/json-rpc/src/HttpCoreMiddleware.php +++ b/src/json-rpc/src/HttpCoreMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use Psr\Http\Message\ServerRequestInterface; diff --git a/src/json-rpc/src/HttpServer.php b/src/json-rpc/src/HttpServer.php index a6d549a36..6c4b2a73d 100644 --- a/src/json-rpc/src/HttpServer.php +++ b/src/json-rpc/src/HttpServer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use Hyperf\ExceptionHandler\ExceptionHandlerDispatcher; diff --git a/src/json-rpc/src/JsonRpcHttpTransporter.php b/src/json-rpc/src/JsonRpcHttpTransporter.php index d76489d6c..2d61eab99 100644 --- a/src/json-rpc/src/JsonRpcHttpTransporter.php +++ b/src/json-rpc/src/JsonRpcHttpTransporter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use GuzzleHttp\Client; diff --git a/src/json-rpc/src/JsonRpcPoolTransporter.php b/src/json-rpc/src/JsonRpcPoolTransporter.php index 10061e26a..37f92eae2 100644 --- a/src/json-rpc/src/JsonRpcPoolTransporter.php +++ b/src/json-rpc/src/JsonRpcPoolTransporter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use Hyperf\Contract\ConnectionInterface; diff --git a/src/json-rpc/src/JsonRpcTransporter.php b/src/json-rpc/src/JsonRpcTransporter.php index 5bf5dde75..353890535 100644 --- a/src/json-rpc/src/JsonRpcTransporter.php +++ b/src/json-rpc/src/JsonRpcTransporter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use Hyperf\LoadBalancer\LoadBalancerInterface; diff --git a/src/json-rpc/src/Listener/RegisterProtocolListener.php b/src/json-rpc/src/Listener/RegisterProtocolListener.php index ae0694890..34837ef04 100644 --- a/src/json-rpc/src/Listener/RegisterProtocolListener.php +++ b/src/json-rpc/src/Listener/RegisterProtocolListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/json-rpc/src/Listener/RegisterServiceListener.php b/src/json-rpc/src/Listener/RegisterServiceListener.php index e392a0b5b..672596456 100644 --- a/src/json-rpc/src/Listener/RegisterServiceListener.php +++ b/src/json-rpc/src/Listener/RegisterServiceListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/json-rpc/src/NormalizeDataFormatter.php b/src/json-rpc/src/NormalizeDataFormatter.php index 12a25e68c..0ebb7ea05 100644 --- a/src/json-rpc/src/NormalizeDataFormatter.php +++ b/src/json-rpc/src/NormalizeDataFormatter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use Hyperf\Contract\NormalizerInterface; diff --git a/src/json-rpc/src/Packer/JsonEofPacker.php b/src/json-rpc/src/Packer/JsonEofPacker.php index 1039af523..cd2ef760b 100644 --- a/src/json-rpc/src/Packer/JsonEofPacker.php +++ b/src/json-rpc/src/Packer/JsonEofPacker.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc\Packer; use Hyperf\Contract\PackerInterface; diff --git a/src/json-rpc/src/Packer/JsonLengthPacker.php b/src/json-rpc/src/Packer/JsonLengthPacker.php index 1b899c170..d1d7ff836 100644 --- a/src/json-rpc/src/Packer/JsonLengthPacker.php +++ b/src/json-rpc/src/Packer/JsonLengthPacker.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc\Packer; use Hyperf\Contract\PackerInterface; diff --git a/src/json-rpc/src/PathGenerator.php b/src/json-rpc/src/PathGenerator.php index 76c50b6b6..0ceb5c268 100644 --- a/src/json-rpc/src/PathGenerator.php +++ b/src/json-rpc/src/PathGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; class PathGenerator extends \Hyperf\Rpc\PathGenerator\PathGenerator diff --git a/src/json-rpc/src/Pool/Frequency.php b/src/json-rpc/src/Pool/Frequency.php index fd3bea2d1..15591ec4b 100644 --- a/src/json-rpc/src/Pool/Frequency.php +++ b/src/json-rpc/src/Pool/Frequency.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc\Pool; use Hyperf\Pool\Frequency as BaseFrequency; diff --git a/src/json-rpc/src/Pool/PoolFactory.php b/src/json-rpc/src/Pool/PoolFactory.php index 0c7ef2d31..ae735cca9 100644 --- a/src/json-rpc/src/Pool/PoolFactory.php +++ b/src/json-rpc/src/Pool/PoolFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc\Pool; use Hyperf\Di\Container; diff --git a/src/json-rpc/src/Pool/RpcConnection.php b/src/json-rpc/src/Pool/RpcConnection.php index 9f98d0b45..b5a13fc11 100644 --- a/src/json-rpc/src/Pool/RpcConnection.php +++ b/src/json-rpc/src/Pool/RpcConnection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc\Pool; use Hyperf\Contract\ConnectionInterface; diff --git a/src/json-rpc/src/Pool/RpcPool.php b/src/json-rpc/src/Pool/RpcPool.php index 76614b0de..d03750deb 100644 --- a/src/json-rpc/src/Pool/RpcPool.php +++ b/src/json-rpc/src/Pool/RpcPool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc\Pool; use Hyperf\Contract\ConnectionInterface; diff --git a/src/json-rpc/src/RecvTrait.php b/src/json-rpc/src/RecvTrait.php index e28b51090..ebf46f2d6 100644 --- a/src/json-rpc/src/RecvTrait.php +++ b/src/json-rpc/src/RecvTrait.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use Hyperf\JsonRpc\Pool\RpcConnection; diff --git a/src/json-rpc/src/ResponseBuilder.php b/src/json-rpc/src/ResponseBuilder.php index b8d085208..635bbc4e3 100644 --- a/src/json-rpc/src/ResponseBuilder.php +++ b/src/json-rpc/src/ResponseBuilder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use Hyperf\Contract\PackerInterface; diff --git a/src/json-rpc/src/TcpServer.php b/src/json-rpc/src/TcpServer.php index b18df0ef8..e8d0fdb8c 100644 --- a/src/json-rpc/src/TcpServer.php +++ b/src/json-rpc/src/TcpServer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\JsonRpc; use Hyperf\Contract\ConfigInterface; diff --git a/src/json-rpc/tests/AnyParamCoreMiddlewareTest.php b/src/json-rpc/tests/AnyParamCoreMiddlewareTest.php index 915abce61..0e9ab2bcf 100644 --- a/src/json-rpc/tests/AnyParamCoreMiddlewareTest.php +++ b/src/json-rpc/tests/AnyParamCoreMiddlewareTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc; use Hyperf\Config\Config; diff --git a/src/json-rpc/tests/CoreMiddlewareTest.php b/src/json-rpc/tests/CoreMiddlewareTest.php index c1b418e0f..5421c7ebd 100644 --- a/src/json-rpc/tests/CoreMiddlewareTest.php +++ b/src/json-rpc/tests/CoreMiddlewareTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc; use Hyperf\Config\Config; diff --git a/src/json-rpc/tests/DataFormatterTest.php b/src/json-rpc/tests/DataFormatterTest.php index 6663a7a88..f7e459f8c 100644 --- a/src/json-rpc/tests/DataFormatterTest.php +++ b/src/json-rpc/tests/DataFormatterTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc; use Hyperf\JsonRpc\DataFormatter; diff --git a/src/json-rpc/tests/JsonPackerTest.php b/src/json-rpc/tests/JsonPackerTest.php index 227bb0772..33b9272aa 100644 --- a/src/json-rpc/tests/JsonPackerTest.php +++ b/src/json-rpc/tests/JsonPackerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc; use Hyperf\JsonRpc\Packer\JsonEofPacker; diff --git a/src/json-rpc/tests/JsonRpcPoolTransporterTest.php b/src/json-rpc/tests/JsonRpcPoolTransporterTest.php index 5eac33b55..07b188e3a 100644 --- a/src/json-rpc/tests/JsonRpcPoolTransporterTest.php +++ b/src/json-rpc/tests/JsonRpcPoolTransporterTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc; use Hyperf\Di\Container; diff --git a/src/json-rpc/tests/RpcServiceClientTest.php b/src/json-rpc/tests/RpcServiceClientTest.php index 4874fc6e1..35eecbe79 100644 --- a/src/json-rpc/tests/RpcServiceClientTest.php +++ b/src/json-rpc/tests/RpcServiceClientTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc; use Hyperf\Config\Config; @@ -150,7 +149,7 @@ class RpcServiceClientTest extends TestCase $transporter->shouldReceive('setLoadBalancer') ->andReturnSelf(); $transporter->shouldReceive('send') - ->andReturnUsing(function ($data) { + ->andReturnUsing(function ($data) { $data = json_decode($data, true); return json_encode([ 'id' => $data['id'], diff --git a/src/json-rpc/tests/Stub/CalculatorProxyServiceClient.php b/src/json-rpc/tests/Stub/CalculatorProxyServiceClient.php index 72d6f0ce6..be03905be 100644 --- a/src/json-rpc/tests/Stub/CalculatorProxyServiceClient.php +++ b/src/json-rpc/tests/Stub/CalculatorProxyServiceClient.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc\Stub; use Hyperf\RpcClient\Proxy\AbstractProxyService; diff --git a/src/json-rpc/tests/Stub/CalculatorService.php b/src/json-rpc/tests/Stub/CalculatorService.php index b2c3e47ef..c4f3a0d76 100644 --- a/src/json-rpc/tests/Stub/CalculatorService.php +++ b/src/json-rpc/tests/Stub/CalculatorService.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc\Stub; class CalculatorService implements CalculatorServiceInterface diff --git a/src/json-rpc/tests/Stub/CalculatorServiceInterface.php b/src/json-rpc/tests/Stub/CalculatorServiceInterface.php index d22bc4fc1..79b07faad 100644 --- a/src/json-rpc/tests/Stub/CalculatorServiceInterface.php +++ b/src/json-rpc/tests/Stub/CalculatorServiceInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc\Stub; interface CalculatorServiceInterface @@ -26,5 +25,5 @@ interface CalculatorServiceInterface public function getString(): ?string; - public function callable(callable $a, ?callable $b): array ; + public function callable(callable $a, ?callable $b): array; } diff --git a/src/json-rpc/tests/Stub/IntegerValue.php b/src/json-rpc/tests/Stub/IntegerValue.php index cccab6250..d7404a936 100644 --- a/src/json-rpc/tests/Stub/IntegerValue.php +++ b/src/json-rpc/tests/Stub/IntegerValue.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc\Stub; class IntegerValue diff --git a/src/json-rpc/tests/Stub/RpcConnectionStub.php b/src/json-rpc/tests/Stub/RpcConnectionStub.php index 6c42c16d1..c1d637a4a 100644 --- a/src/json-rpc/tests/Stub/RpcConnectionStub.php +++ b/src/json-rpc/tests/Stub/RpcConnectionStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc\Stub; use Hyperf\JsonRpc\Pool\RpcConnection; diff --git a/src/json-rpc/tests/Stub/RpcPoolStub.php b/src/json-rpc/tests/Stub/RpcPoolStub.php index af6d31349..b9bf11f69 100644 --- a/src/json-rpc/tests/Stub/RpcPoolStub.php +++ b/src/json-rpc/tests/Stub/RpcPoolStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc\Stub; use Hyperf\Contract\ConnectionInterface; diff --git a/src/json-rpc/tests/TcpServerTest.php b/src/json-rpc/tests/TcpServerTest.php index a7d7f7014..93b1b8485 100644 --- a/src/json-rpc/tests/TcpServerTest.php +++ b/src/json-rpc/tests/TcpServerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\JsonRpc; use Hyperf\Config\Config; diff --git a/src/load-balancer/src/AbstractLoadBalancer.php b/src/load-balancer/src/AbstractLoadBalancer.php index 8a48f1c26..222d59cc6 100644 --- a/src/load-balancer/src/AbstractLoadBalancer.php +++ b/src/load-balancer/src/AbstractLoadBalancer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\LoadBalancer; use Hyperf\Utils\Coordinator\Constants; @@ -67,7 +66,7 @@ abstract class AbstractLoadBalancer implements LoadBalancerInterface $nodes = call($callback); is_array($nodes) && $this->setNodes($nodes); }); - Coroutine::create(function() use ($timerId){ + Coroutine::create(function () use ($timerId) { CoordinatorManager::until(Constants::WORKER_EXIT)->yield(); Timer::clear($timerId); }); diff --git a/src/load-balancer/src/ConfigProvider.php b/src/load-balancer/src/ConfigProvider.php index 1ecd93128..cc31b38a4 100644 --- a/src/load-balancer/src/ConfigProvider.php +++ b/src/load-balancer/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\LoadBalancer; class ConfigProvider diff --git a/src/load-balancer/src/Exception/RuntimeException.php b/src/load-balancer/src/Exception/RuntimeException.php index 3a0c9f2bb..a88162cc1 100644 --- a/src/load-balancer/src/Exception/RuntimeException.php +++ b/src/load-balancer/src/Exception/RuntimeException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\LoadBalancer\Exception; class RuntimeException extends \RuntimeException diff --git a/src/load-balancer/src/LoadBalancerInterface.php b/src/load-balancer/src/LoadBalancerInterface.php index eebefdee0..488d95d03 100644 --- a/src/load-balancer/src/LoadBalancerInterface.php +++ b/src/load-balancer/src/LoadBalancerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\LoadBalancer; interface LoadBalancerInterface diff --git a/src/load-balancer/src/LoadBalancerManager.php b/src/load-balancer/src/LoadBalancerManager.php index 70d40fbee..92a8920af 100644 --- a/src/load-balancer/src/LoadBalancerManager.php +++ b/src/load-balancer/src/LoadBalancerManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\LoadBalancer; use InvalidArgumentException; diff --git a/src/load-balancer/src/Node.php b/src/load-balancer/src/Node.php index a6f9a25b2..d873a4325 100644 --- a/src/load-balancer/src/Node.php +++ b/src/load-balancer/src/Node.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\LoadBalancer; class Node diff --git a/src/load-balancer/src/Random.php b/src/load-balancer/src/Random.php index 7f14d599a..07271b18c 100644 --- a/src/load-balancer/src/Random.php +++ b/src/load-balancer/src/Random.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\LoadBalancer; class Random extends AbstractLoadBalancer diff --git a/src/load-balancer/src/RoundRobin.php b/src/load-balancer/src/RoundRobin.php index 533266b32..aad370d38 100644 --- a/src/load-balancer/src/RoundRobin.php +++ b/src/load-balancer/src/RoundRobin.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\LoadBalancer; use Hyperf\LoadBalancer\Exception\RuntimeException; diff --git a/src/load-balancer/src/WeightedRandom.php b/src/load-balancer/src/WeightedRandom.php index d0331b8c8..0e79110fb 100644 --- a/src/load-balancer/src/WeightedRandom.php +++ b/src/load-balancer/src/WeightedRandom.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\LoadBalancer; class WeightedRandom extends AbstractLoadBalancer diff --git a/src/load-balancer/src/WeightedRoundRobin.php b/src/load-balancer/src/WeightedRoundRobin.php index c317f7f7c..ffc0fa61a 100644 --- a/src/load-balancer/src/WeightedRoundRobin.php +++ b/src/load-balancer/src/WeightedRoundRobin.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\LoadBalancer; use MathPHP\Algebra; diff --git a/src/load-balancer/tests/RandomTest.php b/src/load-balancer/tests/RandomTest.php index 7da1ff02d..945a0d48d 100644 --- a/src/load-balancer/tests/RandomTest.php +++ b/src/load-balancer/tests/RandomTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\LoadBalancer; use Hyperf\LoadBalancer\Node; diff --git a/src/load-balancer/tests/RoundRobinTest.php b/src/load-balancer/tests/RoundRobinTest.php index 430be61da..0edc064b3 100644 --- a/src/load-balancer/tests/RoundRobinTest.php +++ b/src/load-balancer/tests/RoundRobinTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\LoadBalancer; use Hyperf\LoadBalancer\Node; diff --git a/src/load-balancer/tests/WeightedRandomTest.php b/src/load-balancer/tests/WeightedRandomTest.php index da7b829f3..48e5b29c0 100644 --- a/src/load-balancer/tests/WeightedRandomTest.php +++ b/src/load-balancer/tests/WeightedRandomTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\LoadBalancer; use Hyperf\LoadBalancer\Node; diff --git a/src/load-balancer/tests/WeightedRoundRobinTest.php b/src/load-balancer/tests/WeightedRoundRobinTest.php index c0a4e7063..cb01a85fd 100644 --- a/src/load-balancer/tests/WeightedRoundRobinTest.php +++ b/src/load-balancer/tests/WeightedRoundRobinTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\LoadBalancer; use Hyperf\LoadBalancer\Node; diff --git a/src/logger/publish/logger.php b/src/logger/publish/logger.php index 62ba382bf..4b81f99ff 100644 --- a/src/logger/publish/logger.php +++ b/src/logger/publish/logger.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'default' => [ 'handlers' => [ diff --git a/src/logger/src/ConfigProvider.php b/src/logger/src/ConfigProvider.php index caf59c9ca..ea73be9ac 100644 --- a/src/logger/src/ConfigProvider.php +++ b/src/logger/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Logger; class ConfigProvider diff --git a/src/logger/src/Exception/InvalidConfigException.php b/src/logger/src/Exception/InvalidConfigException.php index 12e2888b9..f03d47dbd 100644 --- a/src/logger/src/Exception/InvalidConfigException.php +++ b/src/logger/src/Exception/InvalidConfigException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Logger\Exception; class InvalidConfigException extends \RuntimeException diff --git a/src/logger/src/Logger.php b/src/logger/src/Logger.php index 92e280c82..d3c0b6eb8 100644 --- a/src/logger/src/Logger.php +++ b/src/logger/src/Logger.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Logger; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/logger/src/LoggerFactory.php b/src/logger/src/LoggerFactory.php index 3106da363..0e31ccd9f 100644 --- a/src/logger/src/LoggerFactory.php +++ b/src/logger/src/LoggerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Logger; use Hyperf\Contract\ConfigInterface; diff --git a/src/logger/tests/ConfigProviderTest.php b/src/logger/tests/ConfigProviderTest.php index dd1130bc7..ff2da7844 100644 --- a/src/logger/tests/ConfigProviderTest.php +++ b/src/logger/tests/ConfigProviderTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Logger; use Hyperf\Logger\ConfigProvider; diff --git a/src/logger/tests/LoggerFactoryTest.php b/src/logger/tests/LoggerFactoryTest.php index d8a97ba9c..a32f14205 100644 --- a/src/logger/tests/LoggerFactoryTest.php +++ b/src/logger/tests/LoggerFactoryTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Logger; use Hyperf\Config\Config; diff --git a/src/logger/tests/LoggerTest.php b/src/logger/tests/LoggerTest.php index df9aa7933..c1e4b8881 100644 --- a/src/logger/tests/LoggerTest.php +++ b/src/logger/tests/LoggerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Logger; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/logger/tests/Stub/BarProcessor.php b/src/logger/tests/Stub/BarProcessor.php index bd3b6688e..f1cbb9230 100644 --- a/src/logger/tests/Stub/BarProcessor.php +++ b/src/logger/tests/Stub/BarProcessor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Logger\Stub; class BarProcessor diff --git a/src/logger/tests/Stub/FooHandler.php b/src/logger/tests/Stub/FooHandler.php index 83129c8b4..0809186bb 100644 --- a/src/logger/tests/Stub/FooHandler.php +++ b/src/logger/tests/Stub/FooHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Logger\Stub; use Hyperf\Utils\Context; diff --git a/src/logger/tests/Stub/FooProcessor.php b/src/logger/tests/Stub/FooProcessor.php index 49ae37320..ca5c7f786 100644 --- a/src/logger/tests/Stub/FooProcessor.php +++ b/src/logger/tests/Stub/FooProcessor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Logger\Stub; use Monolog\Processor\ProcessorInterface; diff --git a/src/memory/src/AtomicManager.php b/src/memory/src/AtomicManager.php index df790ca06..8b2a648cc 100644 --- a/src/memory/src/AtomicManager.php +++ b/src/memory/src/AtomicManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Memory; use Swoole\Atomic; diff --git a/src/memory/src/ConfigProvider.php b/src/memory/src/ConfigProvider.php index 9c7ca0852..0d44308b4 100644 --- a/src/memory/src/ConfigProvider.php +++ b/src/memory/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Memory; class ConfigProvider diff --git a/src/memory/src/LockManager.php b/src/memory/src/LockManager.php index 8f72141e2..e3e8b74f5 100644 --- a/src/memory/src/LockManager.php +++ b/src/memory/src/LockManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Memory; use Swoole\Lock; diff --git a/src/memory/src/TableManager.php b/src/memory/src/TableManager.php index e07601f5a..c1d54a70a 100644 --- a/src/memory/src/TableManager.php +++ b/src/memory/src/TableManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Memory; use Swoole\Table; diff --git a/src/metric/publish/metric.php b/src/metric/publish/metric.php index b4e458a13..e04af8b89 100644 --- a/src/metric/publish/metric.php +++ b/src/metric/publish/metric.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - use Hyperf\Metric\Adapter\Prometheus\Constants; return [ diff --git a/src/metric/src/Adapter/InfluxDB/MetricFactory.php b/src/metric/src/Adapter/InfluxDB/MetricFactory.php index acedd7dcb..9b822a6ea 100644 --- a/src/metric/src/Adapter/InfluxDB/MetricFactory.php +++ b/src/metric/src/Adapter/InfluxDB/MetricFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\InfluxDB; use Hyperf\Contract\ConfigInterface; diff --git a/src/metric/src/Adapter/NoOp/Counter.php b/src/metric/src/Adapter/NoOp/Counter.php index db332561f..4dfd4aca0 100644 --- a/src/metric/src/Adapter/NoOp/Counter.php +++ b/src/metric/src/Adapter/NoOp/Counter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\NoOp; use Hyperf\Metric\Contract\CounterInterface; diff --git a/src/metric/src/Adapter/NoOp/Gauge.php b/src/metric/src/Adapter/NoOp/Gauge.php index ecb8b323d..ba5845c6c 100644 --- a/src/metric/src/Adapter/NoOp/Gauge.php +++ b/src/metric/src/Adapter/NoOp/Gauge.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\NoOp; use Hyperf\Metric\Contract\GaugeInterface; diff --git a/src/metric/src/Adapter/NoOp/Histogram.php b/src/metric/src/Adapter/NoOp/Histogram.php index 786ddb737..e61529117 100644 --- a/src/metric/src/Adapter/NoOp/Histogram.php +++ b/src/metric/src/Adapter/NoOp/Histogram.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\NoOp; use Hyperf\Metric\Contract\HistogramInterface; diff --git a/src/metric/src/Adapter/NoOp/MetricFactory.php b/src/metric/src/Adapter/NoOp/MetricFactory.php index 23084a6ae..68c7b21de 100644 --- a/src/metric/src/Adapter/NoOp/MetricFactory.php +++ b/src/metric/src/Adapter/NoOp/MetricFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\NoOp; use Hyperf\Contract\ConfigInterface; diff --git a/src/metric/src/Adapter/Prometheus/Constants.php b/src/metric/src/Adapter/Prometheus/Constants.php index 1dbc44b68..0b6225b57 100644 --- a/src/metric/src/Adapter/Prometheus/Constants.php +++ b/src/metric/src/Adapter/Prometheus/Constants.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\Prometheus; class Constants diff --git a/src/metric/src/Adapter/Prometheus/Counter.php b/src/metric/src/Adapter/Prometheus/Counter.php index 7e13271cb..2ea2ea399 100644 --- a/src/metric/src/Adapter/Prometheus/Counter.php +++ b/src/metric/src/Adapter/Prometheus/Counter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\Prometheus; use Hyperf\Metric\Contract\CounterInterface; diff --git a/src/metric/src/Adapter/Prometheus/Gauge.php b/src/metric/src/Adapter/Prometheus/Gauge.php index aa62f2210..e448bc6c8 100644 --- a/src/metric/src/Adapter/Prometheus/Gauge.php +++ b/src/metric/src/Adapter/Prometheus/Gauge.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\Prometheus; use Hyperf\Metric\Contract\GaugeInterface; diff --git a/src/metric/src/Adapter/Prometheus/Histogram.php b/src/metric/src/Adapter/Prometheus/Histogram.php index 749ec1d4f..091a6245e 100644 --- a/src/metric/src/Adapter/Prometheus/Histogram.php +++ b/src/metric/src/Adapter/Prometheus/Histogram.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\Prometheus; use Hyperf\Metric\Contract\HistogramInterface; diff --git a/src/metric/src/Adapter/Prometheus/MetricFactory.php b/src/metric/src/Adapter/Prometheus/MetricFactory.php index 772df4ca9..74ebb32b3 100644 --- a/src/metric/src/Adapter/Prometheus/MetricFactory.php +++ b/src/metric/src/Adapter/Prometheus/MetricFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\Prometheus; use Hyperf\Contract\ConfigInterface; diff --git a/src/metric/src/Adapter/Prometheus/Redis.php b/src/metric/src/Adapter/Prometheus/Redis.php index 6bd200626..83e7f22df 100644 --- a/src/metric/src/Adapter/Prometheus/Redis.php +++ b/src/metric/src/Adapter/Prometheus/Redis.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\Prometheus; use InvalidArgumentException; diff --git a/src/metric/src/Adapter/Prometheus/RedisStorageFactory.php b/src/metric/src/Adapter/Prometheus/RedisStorageFactory.php index 55d76f0cd..cfb7ad41b 100644 --- a/src/metric/src/Adapter/Prometheus/RedisStorageFactory.php +++ b/src/metric/src/Adapter/Prometheus/RedisStorageFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\Prometheus; use Hyperf\Contract\ConfigInterface; diff --git a/src/metric/src/Adapter/RemoteProxy/Counter.php b/src/metric/src/Adapter/RemoteProxy/Counter.php index df0f1c968..3259acfa3 100644 --- a/src/metric/src/Adapter/RemoteProxy/Counter.php +++ b/src/metric/src/Adapter/RemoteProxy/Counter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\RemoteProxy; use Hyperf\Metric\Contract\CounterInterface; @@ -27,9 +26,6 @@ class Counter implements CounterInterface */ public $name; - /** - * @var string[]; - */ public $labelNames = []; /** diff --git a/src/metric/src/Adapter/RemoteProxy/Gauge.php b/src/metric/src/Adapter/RemoteProxy/Gauge.php index b71c57c34..35278c65f 100644 --- a/src/metric/src/Adapter/RemoteProxy/Gauge.php +++ b/src/metric/src/Adapter/RemoteProxy/Gauge.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\RemoteProxy; use Hyperf\Metric\Contract\GaugeInterface; @@ -27,9 +26,6 @@ class Gauge implements GaugeInterface */ public $name; - /** - * @var string[]; - */ public $labelNames = []; /** diff --git a/src/metric/src/Adapter/RemoteProxy/Histogram.php b/src/metric/src/Adapter/RemoteProxy/Histogram.php index 5a42d1d5e..158c8b5d2 100644 --- a/src/metric/src/Adapter/RemoteProxy/Histogram.php +++ b/src/metric/src/Adapter/RemoteProxy/Histogram.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\RemoteProxy; use Hyperf\Metric\Contract\HistogramInterface; @@ -27,9 +26,6 @@ class Histogram implements HistogramInterface */ public $name; - /** - * @var string[]; - */ public $labelNames = []; /** diff --git a/src/metric/src/Adapter/RemoteProxy/MetricFactory.php b/src/metric/src/Adapter/RemoteProxy/MetricFactory.php index ab2610937..cd1827e23 100644 --- a/src/metric/src/Adapter/RemoteProxy/MetricFactory.php +++ b/src/metric/src/Adapter/RemoteProxy/MetricFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\RemoteProxy; use Hyperf\Metric\Contract\CounterInterface; diff --git a/src/metric/src/Adapter/StatsD/Counter.php b/src/metric/src/Adapter/StatsD/Counter.php index 5195675e5..dc4d7901c 100644 --- a/src/metric/src/Adapter/StatsD/Counter.php +++ b/src/metric/src/Adapter/StatsD/Counter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\StatsD; use Domnikl\Statsd\Client; diff --git a/src/metric/src/Adapter/StatsD/Gauge.php b/src/metric/src/Adapter/StatsD/Gauge.php index a7876f344..cbeb0b91d 100644 --- a/src/metric/src/Adapter/StatsD/Gauge.php +++ b/src/metric/src/Adapter/StatsD/Gauge.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\StatsD; use Domnikl\Statsd\Client; diff --git a/src/metric/src/Adapter/StatsD/Histogram.php b/src/metric/src/Adapter/StatsD/Histogram.php index ec1b75205..4df493bed 100644 --- a/src/metric/src/Adapter/StatsD/Histogram.php +++ b/src/metric/src/Adapter/StatsD/Histogram.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\StatsD; use Domnikl\Statsd\Client; diff --git a/src/metric/src/Adapter/StatsD/MetricFactory.php b/src/metric/src/Adapter/StatsD/MetricFactory.php index d2b946e6e..4c9ccd0c7 100644 --- a/src/metric/src/Adapter/StatsD/MetricFactory.php +++ b/src/metric/src/Adapter/StatsD/MetricFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Adapter\StatsD; use Domnikl\Statsd\Client; diff --git a/src/metric/src/Annotation/Counter.php b/src/metric/src/Annotation/Counter.php index 7b680381c..b82171a48 100644 --- a/src/metric/src/Annotation/Counter.php +++ b/src/metric/src/Annotation/Counter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Annotation; use Doctrine\Common\Annotations\Annotation\Target; diff --git a/src/metric/src/Annotation/Histogram.php b/src/metric/src/Annotation/Histogram.php index 06111a692..44c59f470 100644 --- a/src/metric/src/Annotation/Histogram.php +++ b/src/metric/src/Annotation/Histogram.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Annotation; use Doctrine\Common\Annotations\Annotation\Target; diff --git a/src/metric/src/Aspect/CounterAnnotationAspect.php b/src/metric/src/Aspect/CounterAnnotationAspect.php index a7e7ef5b6..33e0eed8b 100644 --- a/src/metric/src/Aspect/CounterAnnotationAspect.php +++ b/src/metric/src/Aspect/CounterAnnotationAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Aspect; use Hyperf\Di\Annotation\Aspect; diff --git a/src/metric/src/Aspect/HistogramAnnotationAspect.php b/src/metric/src/Aspect/HistogramAnnotationAspect.php index 9fc0e425c..b4b498182 100644 --- a/src/metric/src/Aspect/HistogramAnnotationAspect.php +++ b/src/metric/src/Aspect/HistogramAnnotationAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Aspect; use Hyperf\Di\Annotation\Aspect; diff --git a/src/metric/src/ConfigProvider.php b/src/metric/src/ConfigProvider.php index cffbff550..3c14907d0 100644 --- a/src/metric/src/ConfigProvider.php +++ b/src/metric/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric; use Domnikl\Statsd\Connection; diff --git a/src/metric/src/Contract/CounterInterface.php b/src/metric/src/Contract/CounterInterface.php index d1379bd29..a13cb2f8b 100644 --- a/src/metric/src/Contract/CounterInterface.php +++ b/src/metric/src/Contract/CounterInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Contract; /** diff --git a/src/metric/src/Contract/GaugeInterface.php b/src/metric/src/Contract/GaugeInterface.php index 9cddb6f0f..5e39c3323 100644 --- a/src/metric/src/Contract/GaugeInterface.php +++ b/src/metric/src/Contract/GaugeInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Contract; /** diff --git a/src/metric/src/Contract/HistogramInterface.php b/src/metric/src/Contract/HistogramInterface.php index 5c36aa61b..047fb01bf 100644 --- a/src/metric/src/Contract/HistogramInterface.php +++ b/src/metric/src/Contract/HistogramInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Contract; /** diff --git a/src/metric/src/Contract/MetricFactoryInterface.php b/src/metric/src/Contract/MetricFactoryInterface.php index 37b3fbd30..3158132d1 100644 --- a/src/metric/src/Contract/MetricFactoryInterface.php +++ b/src/metric/src/Contract/MetricFactoryInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Contract; interface MetricFactoryInterface diff --git a/src/metric/src/Event/MetricFactoryReady.php b/src/metric/src/Event/MetricFactoryReady.php index 93814f854..c0a10cfc5 100644 --- a/src/metric/src/Event/MetricFactoryReady.php +++ b/src/metric/src/Event/MetricFactoryReady.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Event; use Hyperf\Metric\Contract\MetricFactoryInterface; diff --git a/src/metric/src/Exception/InvalidArgumentException.php b/src/metric/src/Exception/InvalidArgumentException.php index 2cafdfdbd..20b738da1 100644 --- a/src/metric/src/Exception/InvalidArgumentException.php +++ b/src/metric/src/Exception/InvalidArgumentException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Exception; class InvalidArgumentException extends \InvalidArgumentException diff --git a/src/metric/src/Exception/RuntimeException.php b/src/metric/src/Exception/RuntimeException.php index d0c9c57a1..0473a7a67 100644 --- a/src/metric/src/Exception/RuntimeException.php +++ b/src/metric/src/Exception/RuntimeException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Exception; class RuntimeException extends \RuntimeException diff --git a/src/metric/src/Listener/DBPoolWatcher.php b/src/metric/src/Listener/DBPoolWatcher.php index e26f760bd..b8bc3bde9 100644 --- a/src/metric/src/Listener/DBPoolWatcher.php +++ b/src/metric/src/Listener/DBPoolWatcher.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Listener; use Hyperf\Contract\ConfigInterface; diff --git a/src/metric/src/Listener/OnMetricFactoryReady.php b/src/metric/src/Listener/OnMetricFactoryReady.php index 3c40c3df8..2854c6845 100644 --- a/src/metric/src/Listener/OnMetricFactoryReady.php +++ b/src/metric/src/Listener/OnMetricFactoryReady.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Listener; use Hyperf\Contract\ConfigInterface; diff --git a/src/metric/src/Listener/OnPipeMessage.php b/src/metric/src/Listener/OnPipeMessage.php index ed25b7621..1df96a0df 100644 --- a/src/metric/src/Listener/OnPipeMessage.php +++ b/src/metric/src/Listener/OnPipeMessage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/metric/src/Listener/OnWorkerStart.php b/src/metric/src/Listener/OnWorkerStart.php index 63b04ff06..e28d391b9 100644 --- a/src/metric/src/Listener/OnWorkerStart.php +++ b/src/metric/src/Listener/OnWorkerStart.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Listener; use Hyperf\Contract\ConfigInterface; diff --git a/src/metric/src/Listener/PoolWatcher.php b/src/metric/src/Listener/PoolWatcher.php index 0c70285b2..fe6f14a8c 100644 --- a/src/metric/src/Listener/PoolWatcher.php +++ b/src/metric/src/Listener/PoolWatcher.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Listener; use Hyperf\Contract\ConfigInterface; diff --git a/src/metric/src/Listener/QueueWatcher.php b/src/metric/src/Listener/QueueWatcher.php index 679dcaef5..8ed2b9588 100644 --- a/src/metric/src/Listener/QueueWatcher.php +++ b/src/metric/src/Listener/QueueWatcher.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Listener; use Hyperf\AsyncQueue\Driver\DriverFactory; diff --git a/src/metric/src/Listener/RedisPoolWatcher.php b/src/metric/src/Listener/RedisPoolWatcher.php index c097b9355..9c9ad9549 100644 --- a/src/metric/src/Listener/RedisPoolWatcher.php +++ b/src/metric/src/Listener/RedisPoolWatcher.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Listener; use Hyperf\Contract\ConfigInterface; diff --git a/src/metric/src/Metric.php b/src/metric/src/Metric.php index 6e762b05f..f2f10c1e9 100644 --- a/src/metric/src/Metric.php +++ b/src/metric/src/Metric.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric; use Hyperf\Metric\Contract\MetricFactoryInterface; diff --git a/src/metric/src/MetricFactoryPicker.php b/src/metric/src/MetricFactoryPicker.php index 789907e1b..4c4703d6f 100644 --- a/src/metric/src/MetricFactoryPicker.php +++ b/src/metric/src/MetricFactoryPicker.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric; use Hyperf\Contract\ConfigInterface; diff --git a/src/metric/src/MetricSetter.php b/src/metric/src/MetricSetter.php index d6e9c09c2..32a9f9df6 100644 --- a/src/metric/src/MetricSetter.php +++ b/src/metric/src/MetricSetter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric; use Hyperf\Metric\Contract\GaugeInterface; diff --git a/src/metric/src/Middleware/MetricMiddleware.php b/src/metric/src/Middleware/MetricMiddleware.php index 5f0eae08b..c2579ace3 100644 --- a/src/metric/src/Middleware/MetricMiddleware.php +++ b/src/metric/src/Middleware/MetricMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Middleware; use Hyperf\HttpServer\Router\Dispatched; diff --git a/src/metric/src/Process/MetricProcess.php b/src/metric/src/Process/MetricProcess.php index 62435694f..58fb23e29 100644 --- a/src/metric/src/Process/MetricProcess.php +++ b/src/metric/src/Process/MetricProcess.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric\Process; use Hyperf\Contract\ConfigInterface; diff --git a/src/metric/src/Timer.php b/src/metric/src/Timer.php index bd625cd21..1ef6c1a53 100644 --- a/src/metric/src/Timer.php +++ b/src/metric/src/Timer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Metric; use Hyperf\Metric\Contract\MetricFactoryInterface; diff --git a/src/metric/tests/Cases/MetricFactoryPickerTest.php b/src/metric/tests/Cases/MetricFactoryPickerTest.php index 7c6334695..e787bd81e 100644 --- a/src/metric/tests/Cases/MetricFactoryPickerTest.php +++ b/src/metric/tests/Cases/MetricFactoryPickerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Metric\Cases; use Hyperf\Config\Config; diff --git a/src/metric/tests/Cases/MetricFactoryTest.php b/src/metric/tests/Cases/MetricFactoryTest.php index 0b403d5ab..7ecb54639 100644 --- a/src/metric/tests/Cases/MetricFactoryTest.php +++ b/src/metric/tests/Cases/MetricFactoryTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Metric\Cases; use Hyperf\Config\Config; diff --git a/src/metric/tests/Cases/OnWorkerStartTest.php b/src/metric/tests/Cases/OnWorkerStartTest.php index 5c99bb8f7..b942f9c65 100644 --- a/src/metric/tests/Cases/OnWorkerStartTest.php +++ b/src/metric/tests/Cases/OnWorkerStartTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Metric\Cases; use Hyperf\Config\Config; diff --git a/src/metric/tests/Cases/TimerTest.php b/src/metric/tests/Cases/TimerTest.php index 25834e9f4..311db20ea 100644 --- a/src/metric/tests/Cases/TimerTest.php +++ b/src/metric/tests/Cases/TimerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Metric\Cases; use Hyperf\Di\Container; diff --git a/src/metric/tests/bootstrap.php b/src/metric/tests/bootstrap.php index 3d1876ee6..caf1cd333 100644 --- a/src/metric/tests/bootstrap.php +++ b/src/metric/tests/bootstrap.php @@ -9,5 +9,4 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - require_once dirname(dirname(__FILE__)) . '/vendor/autoload.php'; diff --git a/src/model-cache/publish/databases.php b/src/model-cache/publish/databases.php index b6427a599..0200e31ec 100644 --- a/src/model-cache/publish/databases.php +++ b/src/model-cache/publish/databases.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'default' => [ 'driver' => env('DB_DRIVER', 'mysql'), diff --git a/src/model-cache/src/Builder.php b/src/model-cache/src/Builder.php index 0ace5f095..cdb2126ac 100644 --- a/src/model-cache/src/Builder.php +++ b/src/model-cache/src/Builder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache; use Hyperf\Database\Model\Builder as ModelBuilder; diff --git a/src/model-cache/src/Cacheable.php b/src/model-cache/src/Cacheable.php index e727dff58..3529d645a 100644 --- a/src/model-cache/src/Cacheable.php +++ b/src/model-cache/src/Cacheable.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache; use Hyperf\Database\Model\Builder; diff --git a/src/model-cache/src/CacheableInterface.php b/src/model-cache/src/CacheableInterface.php index 0ac7aa5b4..50c539652 100644 --- a/src/model-cache/src/CacheableInterface.php +++ b/src/model-cache/src/CacheableInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache; use Hyperf\Database\Model\Collection; diff --git a/src/model-cache/src/Config.php b/src/model-cache/src/Config.php index 019f963b5..bf0560d04 100644 --- a/src/model-cache/src/Config.php +++ b/src/model-cache/src/Config.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache; class Config diff --git a/src/model-cache/src/ConfigProvider.php b/src/model-cache/src/ConfigProvider.php index 94e2a21d5..e91d87e35 100644 --- a/src/model-cache/src/ConfigProvider.php +++ b/src/model-cache/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache; use Hyperf\ModelCache\Listener\DeleteCacheListener; diff --git a/src/model-cache/src/Exception/CacheException.php b/src/model-cache/src/Exception/CacheException.php index 43ca5cec5..3d59ef122 100644 --- a/src/model-cache/src/Exception/CacheException.php +++ b/src/model-cache/src/Exception/CacheException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache\Exception; class CacheException extends \RuntimeException diff --git a/src/model-cache/src/Exception/OperatorNotFoundException.php b/src/model-cache/src/Exception/OperatorNotFoundException.php index 7227c3cee..7da2bf8e0 100644 --- a/src/model-cache/src/Exception/OperatorNotFoundException.php +++ b/src/model-cache/src/Exception/OperatorNotFoundException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache\Exception; class OperatorNotFoundException extends \RuntimeException diff --git a/src/model-cache/src/Handler/HandlerInterface.php b/src/model-cache/src/Handler/HandlerInterface.php index 8815d2ac4..1b89a22d6 100644 --- a/src/model-cache/src/Handler/HandlerInterface.php +++ b/src/model-cache/src/Handler/HandlerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache\Handler; use Hyperf\ModelCache\Config; diff --git a/src/model-cache/src/Handler/RedisHandler.php b/src/model-cache/src/Handler/RedisHandler.php index db8707aa6..e7fcf09d7 100644 --- a/src/model-cache/src/Handler/RedisHandler.php +++ b/src/model-cache/src/Handler/RedisHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache\Handler; use Hyperf\ModelCache\Config; diff --git a/src/model-cache/src/Listener/DeleteCacheListener.php b/src/model-cache/src/Listener/DeleteCacheListener.php index 3b9750ad0..2d9eab636 100644 --- a/src/model-cache/src/Listener/DeleteCacheListener.php +++ b/src/model-cache/src/Listener/DeleteCacheListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache\Listener; use Hyperf\Database\Model\Events\Deleted; diff --git a/src/model-cache/src/Manager.php b/src/model-cache/src/Manager.php index 7dc97204d..d3f2b0175 100644 --- a/src/model-cache/src/Manager.php +++ b/src/model-cache/src/Manager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache; use Hyperf\Contract\ConfigInterface; diff --git a/src/model-cache/src/Redis/HashGetMultiple.php b/src/model-cache/src/Redis/HashGetMultiple.php index 86f89ddec..72a69e64e 100644 --- a/src/model-cache/src/Redis/HashGetMultiple.php +++ b/src/model-cache/src/Redis/HashGetMultiple.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache\Redis; class HashGetMultiple implements OperatorInterface diff --git a/src/model-cache/src/Redis/HashIncr.php b/src/model-cache/src/Redis/HashIncr.php index b607a9de4..e9e6ab05d 100644 --- a/src/model-cache/src/Redis/HashIncr.php +++ b/src/model-cache/src/Redis/HashIncr.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache\Redis; class HashIncr implements OperatorInterface diff --git a/src/model-cache/src/Redis/LuaManager.php b/src/model-cache/src/Redis/LuaManager.php index 8c52e21f8..a4794e7ad 100644 --- a/src/model-cache/src/Redis/LuaManager.php +++ b/src/model-cache/src/Redis/LuaManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache\Redis; use Hyperf\ModelCache\Config; diff --git a/src/model-cache/src/Redis/OperatorInterface.php b/src/model-cache/src/Redis/OperatorInterface.php index 67fcbbfcd..f435b832d 100644 --- a/src/model-cache/src/Redis/OperatorInterface.php +++ b/src/model-cache/src/Redis/OperatorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelCache\Redis; interface OperatorInterface diff --git a/src/model-cache/tests/ManagerTest.php b/src/model-cache/tests/ManagerTest.php index 1e48450af..aa9cbcf32 100644 --- a/src/model-cache/tests/ManagerTest.php +++ b/src/model-cache/tests/ManagerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelCache; use Hyperf\Config\Config; diff --git a/src/model-cache/tests/ModelCacheTest.php b/src/model-cache/tests/ModelCacheTest.php index e9f29c43d..52118758c 100644 --- a/src/model-cache/tests/ModelCacheTest.php +++ b/src/model-cache/tests/ModelCacheTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelCache; use Hyperf\DbConnection\Listener\InitTableCollectorListener; diff --git a/src/model-cache/tests/Stub/ContainerStub.php b/src/model-cache/tests/Stub/ContainerStub.php index c3dd6f0f2..9539a66bb 100644 --- a/src/model-cache/tests/Stub/ContainerStub.php +++ b/src/model-cache/tests/Stub/ContainerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelCache\Stub; use Hyperf\Config\Config; diff --git a/src/model-cache/tests/Stub/ManagerStub.php b/src/model-cache/tests/Stub/ManagerStub.php index 631df9710..42948d14b 100644 --- a/src/model-cache/tests/Stub/ManagerStub.php +++ b/src/model-cache/tests/Stub/ManagerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelCache\Stub; use Hyperf\DbConnection\Model\Model; diff --git a/src/model-cache/tests/Stub/ModelStub.php b/src/model-cache/tests/Stub/ModelStub.php index d7742e3ee..3d7e53134 100644 --- a/src/model-cache/tests/Stub/ModelStub.php +++ b/src/model-cache/tests/Stub/ModelStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelCache\Stub; use Hyperf\DbConnection\Model\Model; diff --git a/src/model-cache/tests/Stub/NonHandler.php b/src/model-cache/tests/Stub/NonHandler.php index 1d83aab81..00243be97 100644 --- a/src/model-cache/tests/Stub/NonHandler.php +++ b/src/model-cache/tests/Stub/NonHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelCache\Stub; use Hyperf\ModelCache\Config; diff --git a/src/model-cache/tests/Stub/StdoutLogger.php b/src/model-cache/tests/Stub/StdoutLogger.php index a4810981a..5c73e092b 100644 --- a/src/model-cache/tests/Stub/StdoutLogger.php +++ b/src/model-cache/tests/Stub/StdoutLogger.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelCache\Stub; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/model-cache/tests/Stub/UserExtModel.php b/src/model-cache/tests/Stub/UserExtModel.php index b24d809d3..863b04f5a 100644 --- a/src/model-cache/tests/Stub/UserExtModel.php +++ b/src/model-cache/tests/Stub/UserExtModel.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelCache\Stub; use Hyperf\DbConnection\Model\Model; diff --git a/src/model-cache/tests/Stub/UserHiddenModel.php b/src/model-cache/tests/Stub/UserHiddenModel.php index a94f995fb..79d5e25ed 100644 --- a/src/model-cache/tests/Stub/UserHiddenModel.php +++ b/src/model-cache/tests/Stub/UserHiddenModel.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelCache\Stub; class UserHiddenModel extends UserModel diff --git a/src/model-cache/tests/Stub/UserModel.php b/src/model-cache/tests/Stub/UserModel.php index 34aba07ca..85118a76c 100644 --- a/src/model-cache/tests/Stub/UserModel.php +++ b/src/model-cache/tests/Stub/UserModel.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelCache\Stub; use Hyperf\DbConnection\Model\Model; diff --git a/src/model-listener/src/AbstractListener.php b/src/model-listener/src/AbstractListener.php index d89c3ef7b..3f4780d8c 100644 --- a/src/model-listener/src/AbstractListener.php +++ b/src/model-listener/src/AbstractListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelListener; use Hyperf\Database\Model\Events\Created; diff --git a/src/model-listener/src/Annotation/ModelListener.php b/src/model-listener/src/Annotation/ModelListener.php index fda28e655..b89dd57a4 100644 --- a/src/model-listener/src/Annotation/ModelListener.php +++ b/src/model-listener/src/Annotation/ModelListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelListener\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/model-listener/src/Collector/ListenerCollector.php b/src/model-listener/src/Collector/ListenerCollector.php index 9cdb69d78..c69ded0ae 100644 --- a/src/model-listener/src/Collector/ListenerCollector.php +++ b/src/model-listener/src/Collector/ListenerCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelListener\Collector; use Hyperf\Di\MetadataCollector; diff --git a/src/model-listener/src/ConfigProvider.php b/src/model-listener/src/ConfigProvider.php index 0bf72c732..93bf30d2d 100644 --- a/src/model-listener/src/ConfigProvider.php +++ b/src/model-listener/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelListener; use Hyperf\ModelListener\Collector\ListenerCollector; diff --git a/src/model-listener/src/Listener/ModelEventListener.php b/src/model-listener/src/Listener/ModelEventListener.php index 94dda38b2..9b97a84c0 100644 --- a/src/model-listener/src/Listener/ModelEventListener.php +++ b/src/model-listener/src/Listener/ModelEventListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelListener\Listener; use Hyperf\Database\Model\Events\Event; diff --git a/src/model-listener/src/Listener/ModelHookEventListener.php b/src/model-listener/src/Listener/ModelHookEventListener.php index c4914e1ac..13832c830 100644 --- a/src/model-listener/src/Listener/ModelHookEventListener.php +++ b/src/model-listener/src/Listener/ModelHookEventListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ModelListener\Listener; use Hyperf\Database\Model\Events\Event; diff --git a/src/model-listener/tests/AnnotationTest.php b/src/model-listener/tests/AnnotationTest.php index d0d52d68a..3c7490d4f 100644 --- a/src/model-listener/tests/AnnotationTest.php +++ b/src/model-listener/tests/AnnotationTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelListener; use Hyperf\ModelListener\Annotation\ModelListener; diff --git a/src/model-listener/tests/ListenerCollectorTest.php b/src/model-listener/tests/ListenerCollectorTest.php index 1bb303c8a..377e66f77 100644 --- a/src/model-listener/tests/ListenerCollectorTest.php +++ b/src/model-listener/tests/ListenerCollectorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelListener; use Hyperf\ModelListener\Collector\ListenerCollector; diff --git a/src/model-listener/tests/ModelListenerTest.php b/src/model-listener/tests/ModelListenerTest.php index 9c6458821..60bb1f569 100644 --- a/src/model-listener/tests/ModelListenerTest.php +++ b/src/model-listener/tests/ModelListenerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelListener; use Hyperf\Database\Model\Builder; diff --git a/src/model-listener/tests/Stub/ModelListenerStub.php b/src/model-listener/tests/Stub/ModelListenerStub.php index 35783730a..94221da82 100644 --- a/src/model-listener/tests/Stub/ModelListenerStub.php +++ b/src/model-listener/tests/Stub/ModelListenerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelListener\Stub; use Hyperf\Database\Model\Events\Updating; diff --git a/src/model-listener/tests/Stub/ModelStub.php b/src/model-listener/tests/Stub/ModelStub.php index f2d459d2c..1db92d059 100644 --- a/src/model-listener/tests/Stub/ModelStub.php +++ b/src/model-listener/tests/Stub/ModelStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ModelListener\Stub; use Hyperf\Database\Model\Model; diff --git a/src/nats/publish/nats.php b/src/nats/publish/nats.php index 52a3311da..0cc6bafe4 100644 --- a/src/nats/publish/nats.php +++ b/src/nats/publish/nats.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'default' => [ 'driver' => Hyperf\Nats\Driver\NatsDriver::class, diff --git a/src/nats/src/AbstractConsumer.php b/src/nats/src/AbstractConsumer.php index 480ec864d..05f8abb45 100644 --- a/src/nats/src/AbstractConsumer.php +++ b/src/nats/src/AbstractConsumer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats; use Psr\Container\ContainerInterface; diff --git a/src/nats/src/Annotation/Consumer.php b/src/nats/src/Annotation/Consumer.php index 16dc81ab9..1e863367b 100644 --- a/src/nats/src/Annotation/Consumer.php +++ b/src/nats/src/Annotation/Consumer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/nats/src/ConfigProvider.php b/src/nats/src/ConfigProvider.php index ea31fc710..349a87059 100644 --- a/src/nats/src/ConfigProvider.php +++ b/src/nats/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats; use Hyperf\Nats\Driver\DriverFactory; diff --git a/src/nats/src/Connection.php b/src/nats/src/Connection.php index 75fb3d509..45fc13fc6 100644 --- a/src/nats/src/Connection.php +++ b/src/nats/src/Connection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats; use RandomLib\Factory; diff --git a/src/nats/src/ConnectionOptions.php b/src/nats/src/ConnectionOptions.php index 7c186161c..68798a96b 100644 --- a/src/nats/src/ConnectionOptions.php +++ b/src/nats/src/ConnectionOptions.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats; use Traversable; diff --git a/src/nats/src/ConsumerManager.php b/src/nats/src/ConsumerManager.php index 6f647773a..6cdd3c00f 100644 --- a/src/nats/src/ConsumerManager.php +++ b/src/nats/src/ConsumerManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats; use Hyperf\Di\Annotation\AnnotationCollector; diff --git a/src/nats/src/Contract/PublishInterface.php b/src/nats/src/Contract/PublishInterface.php index bd323f9b6..7e49907b1 100644 --- a/src/nats/src/Contract/PublishInterface.php +++ b/src/nats/src/Contract/PublishInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Contract; interface PublishInterface diff --git a/src/nats/src/Contract/RequestInterface.php b/src/nats/src/Contract/RequestInterface.php index 9649cf328..9318e19b6 100644 --- a/src/nats/src/Contract/RequestInterface.php +++ b/src/nats/src/Contract/RequestInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Contract; use Closure; diff --git a/src/nats/src/Contract/SubscribeInterface.php b/src/nats/src/Contract/SubscribeInterface.php index 7e6d40ee9..f39684e75 100644 --- a/src/nats/src/Contract/SubscribeInterface.php +++ b/src/nats/src/Contract/SubscribeInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Contract; use Closure; diff --git a/src/nats/src/Driver/AbstractDriver.php b/src/nats/src/Driver/AbstractDriver.php index 885c60440..dfbf7d05b 100644 --- a/src/nats/src/Driver/AbstractDriver.php +++ b/src/nats/src/Driver/AbstractDriver.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Driver; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/nats/src/Driver/DriverFactory.php b/src/nats/src/Driver/DriverFactory.php index 4c8954717..33943f5ad 100644 --- a/src/nats/src/Driver/DriverFactory.php +++ b/src/nats/src/Driver/DriverFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Driver; use Hyperf\Contract\ConfigInterface; diff --git a/src/nats/src/Driver/DriverInterface.php b/src/nats/src/Driver/DriverInterface.php index eecb96ad5..43c20b321 100644 --- a/src/nats/src/Driver/DriverInterface.php +++ b/src/nats/src/Driver/DriverInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Driver; use Hyperf\Nats\Contract\PublishInterface; diff --git a/src/nats/src/Driver/NatsDriver.php b/src/nats/src/Driver/NatsDriver.php index 94a89bbbb..abe94ae39 100644 --- a/src/nats/src/Driver/NatsDriver.php +++ b/src/nats/src/Driver/NatsDriver.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Driver; use Closure; diff --git a/src/nats/src/EncodedConnection.php b/src/nats/src/EncodedConnection.php index 4ccbfd356..209e2e72d 100644 --- a/src/nats/src/EncodedConnection.php +++ b/src/nats/src/EncodedConnection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats; use Hyperf\Nats\Encoders\Encoder; diff --git a/src/nats/src/Encoders/Encoder.php b/src/nats/src/Encoders/Encoder.php index 8e6e3ccca..f1b1f94d1 100644 --- a/src/nats/src/Encoders/Encoder.php +++ b/src/nats/src/Encoders/Encoder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Encoders; /** diff --git a/src/nats/src/Encoders/JSONEncoder.php b/src/nats/src/Encoders/JSONEncoder.php index d4b6d2c5c..996a0ddff 100644 --- a/src/nats/src/Encoders/JSONEncoder.php +++ b/src/nats/src/Encoders/JSONEncoder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Encoders; /** diff --git a/src/nats/src/Encoders/PHPEncoder.php b/src/nats/src/Encoders/PHPEncoder.php index 397851e4f..09603c956 100644 --- a/src/nats/src/Encoders/PHPEncoder.php +++ b/src/nats/src/Encoders/PHPEncoder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Encoders; /** diff --git a/src/nats/src/Encoders/YAMLEncoder.php b/src/nats/src/Encoders/YAMLEncoder.php index 5f7e5f4ce..ccef1f384 100644 --- a/src/nats/src/Encoders/YAMLEncoder.php +++ b/src/nats/src/Encoders/YAMLEncoder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Encoders; /** diff --git a/src/nats/src/Event/AfterConsume.php b/src/nats/src/Event/AfterConsume.php index 1806a8c62..668f18f48 100644 --- a/src/nats/src/Event/AfterConsume.php +++ b/src/nats/src/Event/AfterConsume.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Event; class AfterConsume extends Consume diff --git a/src/nats/src/Event/AfterSubscribe.php b/src/nats/src/Event/AfterSubscribe.php index bb2105c5f..956b8f825 100644 --- a/src/nats/src/Event/AfterSubscribe.php +++ b/src/nats/src/Event/AfterSubscribe.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Event; class AfterSubscribe extends Event diff --git a/src/nats/src/Event/BeforeConsume.php b/src/nats/src/Event/BeforeConsume.php index 6b851fb7e..e0d66846a 100644 --- a/src/nats/src/Event/BeforeConsume.php +++ b/src/nats/src/Event/BeforeConsume.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Event; class BeforeConsume extends Consume diff --git a/src/nats/src/Event/BeforeSubscribe.php b/src/nats/src/Event/BeforeSubscribe.php index 8cebd85c5..c6f247c8c 100644 --- a/src/nats/src/Event/BeforeSubscribe.php +++ b/src/nats/src/Event/BeforeSubscribe.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Event; class BeforeSubscribe extends Event diff --git a/src/nats/src/Event/Consume.php b/src/nats/src/Event/Consume.php index a1d8aaf8c..c2f2dc33f 100644 --- a/src/nats/src/Event/Consume.php +++ b/src/nats/src/Event/Consume.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Event; use Hyperf\Nats\AbstractConsumer; diff --git a/src/nats/src/Event/Event.php b/src/nats/src/Event/Event.php index 855a3c32a..dc3b9d027 100644 --- a/src/nats/src/Event/Event.php +++ b/src/nats/src/Event/Event.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Event; use Hyperf\Nats\AbstractConsumer; diff --git a/src/nats/src/Event/FailToConsume.php b/src/nats/src/Event/FailToConsume.php index 9deaac599..82495155c 100644 --- a/src/nats/src/Event/FailToConsume.php +++ b/src/nats/src/Event/FailToConsume.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Event; use Hyperf\Nats\AbstractConsumer; diff --git a/src/nats/src/Exception.php b/src/nats/src/Exception.php index 9de900310..a27cedda4 100644 --- a/src/nats/src/Exception.php +++ b/src/nats/src/Exception.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats; /** diff --git a/src/nats/src/Exception/ConfigNotFoundException.php b/src/nats/src/Exception/ConfigNotFoundException.php index 6ff36cf54..f24c20ba2 100644 --- a/src/nats/src/Exception/ConfigNotFoundException.php +++ b/src/nats/src/Exception/ConfigNotFoundException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Exception; use RuntimeException; diff --git a/src/nats/src/Exception/DriverException.php b/src/nats/src/Exception/DriverException.php index bd17cd3d4..b6746bc2c 100644 --- a/src/nats/src/Exception/DriverException.php +++ b/src/nats/src/Exception/DriverException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Exception; use RuntimeException; diff --git a/src/nats/src/Exception/TimeoutException.php b/src/nats/src/Exception/TimeoutException.php index 8b2f666e7..1eeb112fb 100644 --- a/src/nats/src/Exception/TimeoutException.php +++ b/src/nats/src/Exception/TimeoutException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Exception; use RuntimeException; diff --git a/src/nats/src/Functions.php b/src/nats/src/Functions.php index 84b2e0e97..df2c04ff1 100644 --- a/src/nats/src/Functions.php +++ b/src/nats/src/Functions.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats; function stream_set_timeout($fp, $seconds, $microseconds) diff --git a/src/nats/src/Listener/AfterSubscribeListener.php b/src/nats/src/Listener/AfterSubscribeListener.php index 56d5efc2c..9d41219ce 100644 --- a/src/nats/src/Listener/AfterSubscribeListener.php +++ b/src/nats/src/Listener/AfterSubscribeListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Listener; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/nats/src/Listener/BeforeMainServerStartListener.php b/src/nats/src/Listener/BeforeMainServerStartListener.php index bf6e86672..af5f3ba74 100644 --- a/src/nats/src/Listener/BeforeMainServerStartListener.php +++ b/src/nats/src/Listener/BeforeMainServerStartListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/nats/src/Message.php b/src/nats/src/Message.php index ebd983127..1d1e8ff45 100644 --- a/src/nats/src/Message.php +++ b/src/nats/src/Message.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats; /** diff --git a/src/nats/src/Php71RandomGenerator.php b/src/nats/src/Php71RandomGenerator.php index 6d8630a1f..751ab23b5 100644 --- a/src/nats/src/Php71RandomGenerator.php +++ b/src/nats/src/Php71RandomGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats; /** diff --git a/src/nats/src/ServerInfo.php b/src/nats/src/ServerInfo.php index de1a2ba02..1cf893c39 100644 --- a/src/nats/src/ServerInfo.php +++ b/src/nats/src/ServerInfo.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nats; /** diff --git a/src/nsq/publish/nsq.php b/src/nsq/publish/nsq.php index 0fc30e20d..c16c200ad 100644 --- a/src/nsq/publish/nsq.php +++ b/src/nsq/publish/nsq.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'default' => [ 'enable' => true, diff --git a/src/nsq/src/AbstractConsumer.php b/src/nsq/src/AbstractConsumer.php index 520bec330..ec03ce80e 100644 --- a/src/nsq/src/AbstractConsumer.php +++ b/src/nsq/src/AbstractConsumer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq; use Psr\Container\ContainerInterface; diff --git a/src/nsq/src/Annotation/Consumer.php b/src/nsq/src/Annotation/Consumer.php index a4371e9d3..99b2f92c6 100644 --- a/src/nsq/src/Annotation/Consumer.php +++ b/src/nsq/src/Annotation/Consumer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/nsq/src/ConfigProvider.php b/src/nsq/src/ConfigProvider.php index 746839667..841da1fb6 100644 --- a/src/nsq/src/ConfigProvider.php +++ b/src/nsq/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq; use Hyperf\Nsq\Listener\BeforeMainServerStartListener; diff --git a/src/nsq/src/ConsumerManager.php b/src/nsq/src/ConsumerManager.php index c8624156a..5c3975b33 100644 --- a/src/nsq/src/ConsumerManager.php +++ b/src/nsq/src/ConsumerManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq; use Hyperf\Contract\ConfigInterface; diff --git a/src/nsq/src/Event/AfterConsume.php b/src/nsq/src/Event/AfterConsume.php index ad275c6fb..3ae561ba5 100644 --- a/src/nsq/src/Event/AfterConsume.php +++ b/src/nsq/src/Event/AfterConsume.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Event; use Hyperf\Nsq\AbstractConsumer; diff --git a/src/nsq/src/Event/AfterSubscribe.php b/src/nsq/src/Event/AfterSubscribe.php index 15ce20733..444d0aed4 100644 --- a/src/nsq/src/Event/AfterSubscribe.php +++ b/src/nsq/src/Event/AfterSubscribe.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Event; class AfterSubscribe extends Event diff --git a/src/nsq/src/Event/BeforeConsume.php b/src/nsq/src/Event/BeforeConsume.php index dfb9d735c..767dc6807 100644 --- a/src/nsq/src/Event/BeforeConsume.php +++ b/src/nsq/src/Event/BeforeConsume.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Event; class BeforeConsume extends Consume diff --git a/src/nsq/src/Event/BeforeSubscribe.php b/src/nsq/src/Event/BeforeSubscribe.php index 003fcfd4a..8efd2bfd2 100644 --- a/src/nsq/src/Event/BeforeSubscribe.php +++ b/src/nsq/src/Event/BeforeSubscribe.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Event; class BeforeSubscribe extends Event diff --git a/src/nsq/src/Event/Consume.php b/src/nsq/src/Event/Consume.php index 03e4dc621..8d7eea0e2 100644 --- a/src/nsq/src/Event/Consume.php +++ b/src/nsq/src/Event/Consume.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Event; use Hyperf\Nsq\AbstractConsumer; diff --git a/src/nsq/src/Event/Event.php b/src/nsq/src/Event/Event.php index 50e576d03..05c11d69e 100644 --- a/src/nsq/src/Event/Event.php +++ b/src/nsq/src/Event/Event.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Event; use Hyperf\Nsq\AbstractConsumer; diff --git a/src/nsq/src/Event/FailToConsume.php b/src/nsq/src/Event/FailToConsume.php index 8263d99a0..2e02b8745 100644 --- a/src/nsq/src/Event/FailToConsume.php +++ b/src/nsq/src/Event/FailToConsume.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Event; use Hyperf\Nsq\AbstractConsumer; diff --git a/src/nsq/src/Exception/SocketSendException.php b/src/nsq/src/Exception/SocketSendException.php index b848f6e34..7f8928cb5 100644 --- a/src/nsq/src/Exception/SocketSendException.php +++ b/src/nsq/src/Exception/SocketSendException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Exception; use RuntimeException; diff --git a/src/nsq/src/Listener/BeforeMainServerStartListener.php b/src/nsq/src/Listener/BeforeMainServerStartListener.php index dbbf44799..fb2a4ad5e 100644 --- a/src/nsq/src/Listener/BeforeMainServerStartListener.php +++ b/src/nsq/src/Listener/BeforeMainServerStartListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/nsq/src/Message.php b/src/nsq/src/Message.php index 1f1a39216..b1fe02f83 100644 --- a/src/nsq/src/Message.php +++ b/src/nsq/src/Message.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq; class Message diff --git a/src/nsq/src/MessageBuilder.php b/src/nsq/src/MessageBuilder.php index af6a8111c..ba2177019 100644 --- a/src/nsq/src/MessageBuilder.php +++ b/src/nsq/src/MessageBuilder.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq; use Jean85\PrettyVersions; diff --git a/src/nsq/src/Nsq.php b/src/nsq/src/Nsq.php index 8257427d1..85a0515d6 100644 --- a/src/nsq/src/Nsq.php +++ b/src/nsq/src/Nsq.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq; use Closure; diff --git a/src/nsq/src/Packer.php b/src/nsq/src/Packer.php index 89cddfe03..325fe1dbe 100644 --- a/src/nsq/src/Packer.php +++ b/src/nsq/src/Packer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq; class Packer diff --git a/src/nsq/src/Pool/NsqConnection.php b/src/nsq/src/Pool/NsqConnection.php index 08b76d190..9c20b484e 100644 --- a/src/nsq/src/Pool/NsqConnection.php +++ b/src/nsq/src/Pool/NsqConnection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Pool; use Hyperf\Nsq\MessageBuilder; diff --git a/src/nsq/src/Pool/NsqPool.php b/src/nsq/src/Pool/NsqPool.php index 0ea4e3255..998a0256e 100644 --- a/src/nsq/src/Pool/NsqPool.php +++ b/src/nsq/src/Pool/NsqPool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Pool; use Hyperf\Contract\ConfigInterface; diff --git a/src/nsq/src/Pool/NsqPoolFactory.php b/src/nsq/src/Pool/NsqPoolFactory.php index 3ef707265..cf91e5445 100644 --- a/src/nsq/src/Pool/NsqPoolFactory.php +++ b/src/nsq/src/Pool/NsqPoolFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq\Pool; use Hyperf\Di\Container; diff --git a/src/nsq/src/Result.php b/src/nsq/src/Result.php index 05a6526dc..9f475e371 100644 --- a/src/nsq/src/Result.php +++ b/src/nsq/src/Result.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq; class Result diff --git a/src/nsq/src/Subscriber.php b/src/nsq/src/Subscriber.php index 39a6f3130..6c3f2db01 100644 --- a/src/nsq/src/Subscriber.php +++ b/src/nsq/src/Subscriber.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Nsq; use Hyperf\Utils\Codec\Json; diff --git a/src/nsq/tests/ConsumerManagerTest.php b/src/nsq/tests/ConsumerManagerTest.php index 368b3567a..ce184fe7d 100644 --- a/src/nsq/tests/ConsumerManagerTest.php +++ b/src/nsq/tests/ConsumerManagerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Nsq; use Hyperf\Config\Config; diff --git a/src/nsq/tests/NsqTest.php b/src/nsq/tests/NsqTest.php index 826578a2b..0122608dc 100644 --- a/src/nsq/tests/NsqTest.php +++ b/src/nsq/tests/NsqTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Nsq; use PHPUnit\Framework\TestCase; diff --git a/src/nsq/tests/Stub/ContainerStub.php b/src/nsq/tests/Stub/ContainerStub.php index 6c0807c17..c0f52e901 100644 --- a/src/nsq/tests/Stub/ContainerStub.php +++ b/src/nsq/tests/Stub/ContainerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Nsq\Stub; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/nsq/tests/Stub/DemoConsumer.php b/src/nsq/tests/Stub/DemoConsumer.php index ee33cc308..5c834b0b8 100644 --- a/src/nsq/tests/Stub/DemoConsumer.php +++ b/src/nsq/tests/Stub/DemoConsumer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Nsq\Stub; use Hyperf\Nsq\AbstractConsumer; diff --git a/src/nsq/tests/Stub/DisabledDemoConsumer.php b/src/nsq/tests/Stub/DisabledDemoConsumer.php index 2afdd31f8..2d17a2b40 100644 --- a/src/nsq/tests/Stub/DisabledDemoConsumer.php +++ b/src/nsq/tests/Stub/DisabledDemoConsumer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Nsq\Stub; use Hyperf\Nsq\AbstractConsumer; diff --git a/src/nsq/tests/SubscriberTest.php b/src/nsq/tests/SubscriberTest.php index fe1c7bd8b..57e02871e 100644 --- a/src/nsq/tests/SubscriberTest.php +++ b/src/nsq/tests/SubscriberTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Nsq; use Hyperf\Nsq\Subscriber; diff --git a/src/paginator/src/AbstractPaginator.php b/src/paginator/src/AbstractPaginator.php index 5c111ac6b..6892d5c84 100644 --- a/src/paginator/src/AbstractPaginator.php +++ b/src/paginator/src/AbstractPaginator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Paginator; use ArrayIterator; diff --git a/src/paginator/src/ConfigProvider.php b/src/paginator/src/ConfigProvider.php index 53206794b..1cbd257a7 100644 --- a/src/paginator/src/ConfigProvider.php +++ b/src/paginator/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Paginator; use Hyperf\Contract\LengthAwarePaginatorInterface; diff --git a/src/paginator/src/LengthAwarePaginator.php b/src/paginator/src/LengthAwarePaginator.php index 6aa64cee5..695aa2ac8 100644 --- a/src/paginator/src/LengthAwarePaginator.php +++ b/src/paginator/src/LengthAwarePaginator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Paginator; use ArrayAccess; diff --git a/src/paginator/src/Listener/PageResolverListener.php b/src/paginator/src/Listener/PageResolverListener.php index f9298aad5..46a59a1d7 100644 --- a/src/paginator/src/Listener/PageResolverListener.php +++ b/src/paginator/src/Listener/PageResolverListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Paginator\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/paginator/src/Paginator.php b/src/paginator/src/Paginator.php index 70dde1b7f..46aa49f8e 100644 --- a/src/paginator/src/Paginator.php +++ b/src/paginator/src/Paginator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Paginator; use ArrayAccess; diff --git a/src/paginator/src/UrlWindow.php b/src/paginator/src/UrlWindow.php index 582878e10..8a74ab319 100644 --- a/src/paginator/src/UrlWindow.php +++ b/src/paginator/src/UrlWindow.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Paginator; use Hyperf\Contract\LengthAwarePaginatorInterface; diff --git a/src/paginator/tests/LengthAwarePaginatorTest.php b/src/paginator/tests/LengthAwarePaginatorTest.php index 143bae108..fe3bf8908 100644 --- a/src/paginator/tests/LengthAwarePaginatorTest.php +++ b/src/paginator/tests/LengthAwarePaginatorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Paginator; use Hyperf\Paginator\LengthAwarePaginator; diff --git a/src/paginator/tests/PageResolverListenerTest.php b/src/paginator/tests/PageResolverListenerTest.php index fc4fb3c1d..8d982447f 100644 --- a/src/paginator/tests/PageResolverListenerTest.php +++ b/src/paginator/tests/PageResolverListenerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Paginator; use Hyperf\Di\Container; diff --git a/src/pool/src/Channel.php b/src/pool/src/Channel.php index a7283c49d..df02a60a4 100644 --- a/src/pool/src/Channel.php +++ b/src/pool/src/Channel.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool; use Hyperf\Utils\Coroutine; diff --git a/src/pool/src/ConfigProvider.php b/src/pool/src/ConfigProvider.php index 51080c63f..640e5413c 100644 --- a/src/pool/src/ConfigProvider.php +++ b/src/pool/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool; class ConfigProvider diff --git a/src/pool/src/Connection.php b/src/pool/src/Connection.php index e11c6d456..13907f13d 100644 --- a/src/pool/src/Connection.php +++ b/src/pool/src/Connection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool; use Hyperf\Contract\ConnectionInterface; diff --git a/src/pool/src/Context.php b/src/pool/src/Context.php index 76b7dcc76..968022f27 100644 --- a/src/pool/src/Context.php +++ b/src/pool/src/Context.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool; use Hyperf\Contract\ConnectionInterface; diff --git a/src/pool/src/Exception/ConnectionException.php b/src/pool/src/Exception/ConnectionException.php index 00bb4e38f..82327f65c 100644 --- a/src/pool/src/Exception/ConnectionException.php +++ b/src/pool/src/Exception/ConnectionException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool\Exception; use Exception; diff --git a/src/pool/src/Exception/InvalidArgumentException.php b/src/pool/src/Exception/InvalidArgumentException.php index 182e1a2a4..94f88e34a 100644 --- a/src/pool/src/Exception/InvalidArgumentException.php +++ b/src/pool/src/Exception/InvalidArgumentException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool\Exception; class InvalidArgumentException extends \InvalidArgumentException diff --git a/src/pool/src/Exception/SocketPopException.php b/src/pool/src/Exception/SocketPopException.php index 2576076a7..5f9cd5b1c 100644 --- a/src/pool/src/Exception/SocketPopException.php +++ b/src/pool/src/Exception/SocketPopException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool\Exception; use RuntimeException; diff --git a/src/pool/src/Frequency.php b/src/pool/src/Frequency.php index 7979fbb64..14eb0735b 100644 --- a/src/pool/src/Frequency.php +++ b/src/pool/src/Frequency.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool; use Hyperf\Contract\FrequencyInterface; diff --git a/src/pool/src/KeepaliveConnection.php b/src/pool/src/KeepaliveConnection.php index 31e7b5427..edb08a000 100644 --- a/src/pool/src/KeepaliveConnection.php +++ b/src/pool/src/KeepaliveConnection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool; use Closure; diff --git a/src/pool/src/LowFrequencyInterface.php b/src/pool/src/LowFrequencyInterface.php index 91729aa8d..2524672c0 100644 --- a/src/pool/src/LowFrequencyInterface.php +++ b/src/pool/src/LowFrequencyInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool; interface LowFrequencyInterface diff --git a/src/pool/src/Pool.php b/src/pool/src/Pool.php index ed97480c2..5baeb8916 100644 --- a/src/pool/src/Pool.php +++ b/src/pool/src/Pool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool; use Hyperf\Contract\ConnectionInterface; diff --git a/src/pool/src/PoolOption.php b/src/pool/src/PoolOption.php index 98189d595..420d3387d 100644 --- a/src/pool/src/PoolOption.php +++ b/src/pool/src/PoolOption.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool; use Hyperf\Contract\PoolOptionInterface; diff --git a/src/pool/src/SimplePool/Config.php b/src/pool/src/SimplePool/Config.php index 4779a0729..d9d66a50f 100644 --- a/src/pool/src/SimplePool/Config.php +++ b/src/pool/src/SimplePool/Config.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool\SimplePool; class Config diff --git a/src/pool/src/SimplePool/Connection.php b/src/pool/src/SimplePool/Connection.php index c15e916ea..ebc7650b5 100644 --- a/src/pool/src/SimplePool/Connection.php +++ b/src/pool/src/SimplePool/Connection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool\SimplePool; use Hyperf\Pool\Connection as AbstractConnection; diff --git a/src/pool/src/SimplePool/Pool.php b/src/pool/src/SimplePool/Pool.php index 53e64a117..ce314edec 100644 --- a/src/pool/src/SimplePool/Pool.php +++ b/src/pool/src/SimplePool/Pool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool\SimplePool; use Hyperf\Contract\ConnectionInterface; diff --git a/src/pool/src/SimplePool/PoolFactory.php b/src/pool/src/SimplePool/PoolFactory.php index d80469fee..06080cc83 100644 --- a/src/pool/src/SimplePool/PoolFactory.php +++ b/src/pool/src/SimplePool/PoolFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Pool\SimplePool; use Psr\Container\ContainerInterface; diff --git a/src/pool/tests/FrequencyTest.php b/src/pool/tests/FrequencyTest.php index 8f197262f..91be4bb7e 100644 --- a/src/pool/tests/FrequencyTest.php +++ b/src/pool/tests/FrequencyTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Pool; use HyperfTest\Pool\Stub\FrequencyStub; diff --git a/src/pool/tests/HeartbeatConnectionTest.php b/src/pool/tests/HeartbeatConnectionTest.php index 0eaf3edc5..7563c7968 100644 --- a/src/pool/tests/HeartbeatConnectionTest.php +++ b/src/pool/tests/HeartbeatConnectionTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Pool; use Hyperf\Contract\ContainerInterface; diff --git a/src/pool/tests/Stub/FrequencyStub.php b/src/pool/tests/Stub/FrequencyStub.php index f43ed263f..00955c920 100644 --- a/src/pool/tests/Stub/FrequencyStub.php +++ b/src/pool/tests/Stub/FrequencyStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Pool\Stub; use Hyperf\Pool\Frequency; diff --git a/src/pool/tests/Stub/HeartbeatPoolStub.php b/src/pool/tests/Stub/HeartbeatPoolStub.php index 68086b93f..14bfe6d6e 100644 --- a/src/pool/tests/Stub/HeartbeatPoolStub.php +++ b/src/pool/tests/Stub/HeartbeatPoolStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Pool\Stub; use Hyperf\Contract\ConnectionInterface; diff --git a/src/pool/tests/Stub/KeepaliveConnectionStub.php b/src/pool/tests/Stub/KeepaliveConnectionStub.php index 095d811d0..89df42881 100644 --- a/src/pool/tests/Stub/KeepaliveConnectionStub.php +++ b/src/pool/tests/Stub/KeepaliveConnectionStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Pool\Stub; use Hyperf\Pool\KeepaliveConnection; diff --git a/src/process/src/AbstractProcess.php b/src/process/src/AbstractProcess.php index 1065e1b96..aa42c067f 100644 --- a/src/process/src/AbstractProcess.php +++ b/src/process/src/AbstractProcess.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Process; use Hyperf\Contract\ProcessInterface; diff --git a/src/process/src/Annotation/Process.php b/src/process/src/Annotation/Process.php index 366024cd6..3224f0d8c 100644 --- a/src/process/src/Annotation/Process.php +++ b/src/process/src/Annotation/Process.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Process\Annotation; use Doctrine\Common\Annotations\Annotation\Target; diff --git a/src/process/src/ConfigProvider.php b/src/process/src/ConfigProvider.php index ad13a6784..6318bc529 100644 --- a/src/process/src/ConfigProvider.php +++ b/src/process/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Process; use Hyperf\Process\Listener\BootProcessListener; diff --git a/src/process/src/Event/AfterProcessHandle.php b/src/process/src/Event/AfterProcessHandle.php index f21893353..0d3e02f78 100644 --- a/src/process/src/Event/AfterProcessHandle.php +++ b/src/process/src/Event/AfterProcessHandle.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Process\Event; use Hyperf\Process\AbstractProcess; diff --git a/src/process/src/Event/BeforeProcessHandle.php b/src/process/src/Event/BeforeProcessHandle.php index 15cbada86..04b45f063 100644 --- a/src/process/src/Event/BeforeProcessHandle.php +++ b/src/process/src/Event/BeforeProcessHandle.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Process\Event; use Hyperf\Process\AbstractProcess; diff --git a/src/process/src/Event/PipeMessage.php b/src/process/src/Event/PipeMessage.php index ff699ebe7..d728cbd83 100644 --- a/src/process/src/Event/PipeMessage.php +++ b/src/process/src/Event/PipeMessage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Process\Event; class PipeMessage diff --git a/src/process/src/Exception/SocketAcceptException.php b/src/process/src/Exception/SocketAcceptException.php index be249e2e2..818968ec0 100644 --- a/src/process/src/Exception/SocketAcceptException.php +++ b/src/process/src/Exception/SocketAcceptException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Process\Exception; class SocketAcceptException extends \RuntimeException diff --git a/src/process/src/Listener/BootProcessListener.php b/src/process/src/Listener/BootProcessListener.php index 53ec5ec0f..047cb2a71 100644 --- a/src/process/src/Listener/BootProcessListener.php +++ b/src/process/src/Listener/BootProcessListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Process\Listener; use Hyperf\Contract\ConfigInterface; diff --git a/src/process/src/Listener/LogAfterProcessStoppedListener.php b/src/process/src/Listener/LogAfterProcessStoppedListener.php index 286d84abf..ec4e3e21c 100644 --- a/src/process/src/Listener/LogAfterProcessStoppedListener.php +++ b/src/process/src/Listener/LogAfterProcessStoppedListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Process\Listener; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/process/src/Listener/LogBeforeProcessStartListener.php b/src/process/src/Listener/LogBeforeProcessStartListener.php index c2f065062..c089081bf 100644 --- a/src/process/src/Listener/LogBeforeProcessStartListener.php +++ b/src/process/src/Listener/LogBeforeProcessStartListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Process\Listener; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/process/src/ProcessCollector.php b/src/process/src/ProcessCollector.php index 86b53c26a..161ee7cd3 100644 --- a/src/process/src/ProcessCollector.php +++ b/src/process/src/ProcessCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Process; use Swoole\Process; diff --git a/src/process/src/ProcessManager.php b/src/process/src/ProcessManager.php index 6228e9ad7..e30d6eb2a 100644 --- a/src/process/src/ProcessManager.php +++ b/src/process/src/ProcessManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Process; use Hyperf\Contract\ProcessInterface; diff --git a/src/protocol/src/ConfigProvider.php b/src/protocol/src/ConfigProvider.php index 25584647f..2b745027b 100644 --- a/src/protocol/src/ConfigProvider.php +++ b/src/protocol/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Protocol; use Hyperf\Protocol\Packer\SerializePacker; diff --git a/src/protocol/src/Packer/SerializePacker.php b/src/protocol/src/Packer/SerializePacker.php index 0de613d16..868f39a5b 100644 --- a/src/protocol/src/Packer/SerializePacker.php +++ b/src/protocol/src/Packer/SerializePacker.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Protocol\Packer; use Hyperf\Protocol\ProtocolPackerInterface; diff --git a/src/protocol/src/ProtocolPackerInterface.php b/src/protocol/src/ProtocolPackerInterface.php index 0b8759973..309e02524 100644 --- a/src/protocol/src/ProtocolPackerInterface.php +++ b/src/protocol/src/ProtocolPackerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Protocol; use Hyperf\Contract\PackerInterface; diff --git a/src/protocol/tests/SerializePackerTest.php b/src/protocol/tests/SerializePackerTest.php index ea1522b38..23f6c6dcd 100644 --- a/src/protocol/tests/SerializePackerTest.php +++ b/src/protocol/tests/SerializePackerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Protocol; use Hyperf\Protocol\Packer\SerializePacker; diff --git a/src/protocol/tests/Stub/DemoStub.php b/src/protocol/tests/Stub/DemoStub.php index d0fd93ef5..f78ec1f28 100644 --- a/src/protocol/tests/Stub/DemoStub.php +++ b/src/protocol/tests/Stub/DemoStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Protocol\Stub; class DemoStub diff --git a/src/rate-limit/publish/rate_limit.php b/src/rate-limit/publish/rate_limit.php index 5c40610b3..72509a36b 100644 --- a/src/rate-limit/publish/rate_limit.php +++ b/src/rate-limit/publish/rate_limit.php @@ -1,9 +1,18 @@ 1, 'consume' => 1, 'capacity' => 2, 'limitCallback' => [], 'waitTimeout' => 1, -]; \ No newline at end of file +]; diff --git a/src/rate-limit/src/Annotation/RateLimit.php b/src/rate-limit/src/Annotation/RateLimit.php index 4c3f8c510..f238d778a 100644 --- a/src/rate-limit/src/Annotation/RateLimit.php +++ b/src/rate-limit/src/Annotation/RateLimit.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RateLimit\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/rate-limit/src/Aspect/RateLimitAnnotationAspect.php b/src/rate-limit/src/Aspect/RateLimitAnnotationAspect.php index 1ecf214c9..1bb29f0c8 100644 --- a/src/rate-limit/src/Aspect/RateLimitAnnotationAspect.php +++ b/src/rate-limit/src/Aspect/RateLimitAnnotationAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RateLimit\Aspect; use bandwidthThrottle\tokenBucket\storage\StorageException; diff --git a/src/rate-limit/src/ConfigProvider.php b/src/rate-limit/src/ConfigProvider.php index ae2c1f219..09dfb1930 100644 --- a/src/rate-limit/src/ConfigProvider.php +++ b/src/rate-limit/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RateLimit; class ConfigProvider diff --git a/src/rate-limit/src/Exception/RateLimitException.php b/src/rate-limit/src/Exception/RateLimitException.php index 64f8a8f01..0a5eb61d1 100644 --- a/src/rate-limit/src/Exception/RateLimitException.php +++ b/src/rate-limit/src/Exception/RateLimitException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RateLimit\Exception; use RuntimeException; diff --git a/src/rate-limit/src/Handler/RateLimitHandler.php b/src/rate-limit/src/Handler/RateLimitHandler.php index bcc3a4a17..c222f0c27 100644 --- a/src/rate-limit/src/Handler/RateLimitHandler.php +++ b/src/rate-limit/src/Handler/RateLimitHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RateLimit\Handler; use bandwidthThrottle\tokenBucket\Rate; diff --git a/src/rate-limit/src/Storage/RedisStorage.php b/src/rate-limit/src/Storage/RedisStorage.php index 7eab53deb..5b3ffc813 100644 --- a/src/rate-limit/src/Storage/RedisStorage.php +++ b/src/rate-limit/src/Storage/RedisStorage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RateLimit\Storage; use bandwidthThrottle\tokenBucket\storage\scope\GlobalScope; diff --git a/src/rate-limit/tests/RateLimitTest.php b/src/rate-limit/tests/RateLimitTest.php index 4c528cee8..4336b5340 100644 --- a/src/rate-limit/tests/RateLimitTest.php +++ b/src/rate-limit/tests/RateLimitTest.php @@ -9,11 +9,9 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\RateLimit; use Hyperf\Config\Config; -use Hyperf\Contract\ConfigInterface; use Hyperf\Contract\StdoutLoggerInterface; use Hyperf\HttpServer\Contract\RequestInterface; use Hyperf\RateLimit\Aspect\RateLimitAnnotationAspect; diff --git a/src/redis/publish/redis.php b/src/redis/publish/redis.php index 13b99c87d..1e4b3fd8e 100644 --- a/src/redis/publish/redis.php +++ b/src/redis/publish/redis.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'default' => [ 'host' => env('REDIS_HOST', 'localhost'), diff --git a/src/redis/src/ConfigProvider.php b/src/redis/src/ConfigProvider.php index de7f3a545..a71523537 100644 --- a/src/redis/src/ConfigProvider.php +++ b/src/redis/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis; class ConfigProvider diff --git a/src/redis/src/Exception/InvalidRedisConnectionException.php b/src/redis/src/Exception/InvalidRedisConnectionException.php index 0754cfae0..d236a0592 100644 --- a/src/redis/src/Exception/InvalidRedisConnectionException.php +++ b/src/redis/src/Exception/InvalidRedisConnectionException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis\Exception; use RuntimeException; diff --git a/src/redis/src/Exception/InvalidRedisProxyException.php b/src/redis/src/Exception/InvalidRedisProxyException.php index 33be538a7..3a405af23 100644 --- a/src/redis/src/Exception/InvalidRedisProxyException.php +++ b/src/redis/src/Exception/InvalidRedisProxyException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis\Exception; class InvalidRedisProxyException extends \RuntimeException diff --git a/src/redis/src/Exception/RedisNotFoundException.php b/src/redis/src/Exception/RedisNotFoundException.php index b6ee790c2..37ec3fe29 100644 --- a/src/redis/src/Exception/RedisNotFoundException.php +++ b/src/redis/src/Exception/RedisNotFoundException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis\Exception; class RedisNotFoundException extends \RuntimeException diff --git a/src/redis/src/Frequency.php b/src/redis/src/Frequency.php index 4897fa7a1..04323f95d 100644 --- a/src/redis/src/Frequency.php +++ b/src/redis/src/Frequency.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis; use Hyperf\Pool\Frequency as DefaultFrequency; diff --git a/src/redis/src/Lua/Hash/HGetAllMultiple.php b/src/redis/src/Lua/Hash/HGetAllMultiple.php index 711de9d93..63831fa97 100644 --- a/src/redis/src/Lua/Hash/HGetAllMultiple.php +++ b/src/redis/src/Lua/Hash/HGetAllMultiple.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis\Lua\Hash; use Hyperf\Redis\Lua\Script; diff --git a/src/redis/src/Lua/Hash/HIncrByFloatIfExists.php b/src/redis/src/Lua/Hash/HIncrByFloatIfExists.php index eb468b3f2..2104885a9 100644 --- a/src/redis/src/Lua/Hash/HIncrByFloatIfExists.php +++ b/src/redis/src/Lua/Hash/HIncrByFloatIfExists.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis\Lua\Hash; use Hyperf\Redis\Lua\Script; diff --git a/src/redis/src/Lua/Script.php b/src/redis/src/Lua/Script.php index ba5e7c6e4..c5321b771 100644 --- a/src/redis/src/Lua/Script.php +++ b/src/redis/src/Lua/Script.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis\Lua; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/redis/src/Lua/ScriptInterface.php b/src/redis/src/Lua/ScriptInterface.php index 7451fea0a..c2bf30bf8 100644 --- a/src/redis/src/Lua/ScriptInterface.php +++ b/src/redis/src/Lua/ScriptInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis\Lua; interface ScriptInterface diff --git a/src/redis/src/Pool/PoolFactory.php b/src/redis/src/Pool/PoolFactory.php index f26c5fc77..8a94afacd 100644 --- a/src/redis/src/Pool/PoolFactory.php +++ b/src/redis/src/Pool/PoolFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis\Pool; use Hyperf\Di\Container; diff --git a/src/redis/src/Pool/RedisPool.php b/src/redis/src/Pool/RedisPool.php index 0c0137eff..d21b80102 100644 --- a/src/redis/src/Pool/RedisPool.php +++ b/src/redis/src/Pool/RedisPool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis\Pool; use Hyperf\Contract\ConfigInterface; diff --git a/src/redis/src/Redis.php b/src/redis/src/Redis.php index 60c04c669..b8bb69af9 100644 --- a/src/redis/src/Redis.php +++ b/src/redis/src/Redis.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis; use Hyperf\Redis\Exception\InvalidRedisConnectionException; diff --git a/src/redis/src/RedisConnection.php b/src/redis/src/RedisConnection.php index b91c9d455..0e1ab1e74 100644 --- a/src/redis/src/RedisConnection.php +++ b/src/redis/src/RedisConnection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis; use Hyperf\Contract\ConnectionInterface; diff --git a/src/redis/src/RedisFactory.php b/src/redis/src/RedisFactory.php index 57067a5b7..1ad6e6ba3 100644 --- a/src/redis/src/RedisFactory.php +++ b/src/redis/src/RedisFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis; use Hyperf\Contract\ConfigInterface; diff --git a/src/redis/src/RedisProxy.php b/src/redis/src/RedisProxy.php index 716ea5e44..b4a5d24a5 100644 --- a/src/redis/src/RedisProxy.php +++ b/src/redis/src/RedisProxy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis; use Hyperf\Redis\Pool\PoolFactory; diff --git a/src/redis/src/ScanCaller.php b/src/redis/src/ScanCaller.php index ad88161cc..b64d73033 100644 --- a/src/redis/src/ScanCaller.php +++ b/src/redis/src/ScanCaller.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Redis; trait ScanCaller diff --git a/src/redis/tests/Lua/EvalTest.php b/src/redis/tests/Lua/EvalTest.php index ed9af276d..b69584a49 100644 --- a/src/redis/tests/Lua/EvalTest.php +++ b/src/redis/tests/Lua/EvalTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Redis\Lua; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/redis/tests/Lua/HashTest.php b/src/redis/tests/Lua/HashTest.php index b06f4b46c..a096d5b7a 100644 --- a/src/redis/tests/Lua/HashTest.php +++ b/src/redis/tests/Lua/HashTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Redis\Lua; use Hyperf\Redis\Lua\Hash\HGetAllMultiple; diff --git a/src/redis/tests/RedisConnectionTest.php b/src/redis/tests/RedisConnectionTest.php index de6e6f2a1..9cbae7e28 100644 --- a/src/redis/tests/RedisConnectionTest.php +++ b/src/redis/tests/RedisConnectionTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Redis; use Hyperf\Config\Config; diff --git a/src/redis/tests/RedisProxyTest.php b/src/redis/tests/RedisProxyTest.php index b47768c3a..73389c70d 100644 --- a/src/redis/tests/RedisProxyTest.php +++ b/src/redis/tests/RedisProxyTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Redis; use Hyperf\Config\Config; diff --git a/src/redis/tests/RedisTest.php b/src/redis/tests/RedisTest.php index c4705ebc1..c1b6d5c7a 100644 --- a/src/redis/tests/RedisTest.php +++ b/src/redis/tests/RedisTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Redis; use Hyperf\Config\Config; diff --git a/src/redis/tests/Stub/ContainerStub.php b/src/redis/tests/Stub/ContainerStub.php index 7efc31bee..f150afdfc 100644 --- a/src/redis/tests/Stub/ContainerStub.php +++ b/src/redis/tests/Stub/ContainerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Redis\Stub; use Hyperf\Config\Config; diff --git a/src/redis/tests/Stub/HGetAllMultipleStub.php b/src/redis/tests/Stub/HGetAllMultipleStub.php index 4cd201dd5..4afc3bda4 100644 --- a/src/redis/tests/Stub/HGetAllMultipleStub.php +++ b/src/redis/tests/Stub/HGetAllMultipleStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Redis\Stub; use Hyperf\Redis\Lua\Hash\HGetAllMultiple; diff --git a/src/redis/tests/Stub/HIncrByFloatIfExistsStub.php b/src/redis/tests/Stub/HIncrByFloatIfExistsStub.php index 99b52c78d..38e1ea33e 100644 --- a/src/redis/tests/Stub/HIncrByFloatIfExistsStub.php +++ b/src/redis/tests/Stub/HIncrByFloatIfExistsStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Redis\Stub; use Hyperf\Redis\Lua\Hash\HIncrByFloatIfExists; diff --git a/src/redis/tests/Stub/RedisConnectionFailedStub.php b/src/redis/tests/Stub/RedisConnectionFailedStub.php index 199d37117..efcd5fe9c 100644 --- a/src/redis/tests/Stub/RedisConnectionFailedStub.php +++ b/src/redis/tests/Stub/RedisConnectionFailedStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Redis\Stub; class RedisConnectionFailedStub extends RedisConnectionStub diff --git a/src/redis/tests/Stub/RedisConnectionStub.php b/src/redis/tests/Stub/RedisConnectionStub.php index 7f535a625..c9870236a 100644 --- a/src/redis/tests/Stub/RedisConnectionStub.php +++ b/src/redis/tests/Stub/RedisConnectionStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Redis\Stub; use Hyperf\Redis\RedisConnection; diff --git a/src/redis/tests/Stub/RedisPoolFailedStub.php b/src/redis/tests/Stub/RedisPoolFailedStub.php index 685f68ca5..316a8a64a 100644 --- a/src/redis/tests/Stub/RedisPoolFailedStub.php +++ b/src/redis/tests/Stub/RedisPoolFailedStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Redis\Stub; use Hyperf\Contract\ConnectionInterface; diff --git a/src/redis/tests/Stub/RedisPoolStub.php b/src/redis/tests/Stub/RedisPoolStub.php index dc9dc8a92..22c1a3fc2 100644 --- a/src/redis/tests/Stub/RedisPoolStub.php +++ b/src/redis/tests/Stub/RedisPoolStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Redis\Stub; use Hyperf\Contract\ConnectionInterface; diff --git a/src/retry/src/Annotation/AbstractRetry.php b/src/retry/src/Annotation/AbstractRetry.php index 1d25dc40d..e2f9f9d73 100644 --- a/src/retry/src/Annotation/AbstractRetry.php +++ b/src/retry/src/Annotation/AbstractRetry.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/retry/src/Annotation/BackoffRetryFalsy.php b/src/retry/src/Annotation/BackoffRetryFalsy.php index 4198e5ab7..d0cf57338 100644 --- a/src/retry/src/Annotation/BackoffRetryFalsy.php +++ b/src/retry/src/Annotation/BackoffRetryFalsy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Annotation; use Doctrine\Common\Annotations\Annotation\Target; diff --git a/src/retry/src/Annotation/BackoffRetryThrowable.php b/src/retry/src/Annotation/BackoffRetryThrowable.php index 1ddde183a..9b5d34c36 100644 --- a/src/retry/src/Annotation/BackoffRetryThrowable.php +++ b/src/retry/src/Annotation/BackoffRetryThrowable.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Annotation; use Doctrine\Common\Annotations\Annotation\Target; diff --git a/src/retry/src/Annotation/CircuitBreaker.php b/src/retry/src/Annotation/CircuitBreaker.php index cbfd34995..190544652 100644 --- a/src/retry/src/Annotation/CircuitBreaker.php +++ b/src/retry/src/Annotation/CircuitBreaker.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Annotation; use Hyperf\Retry\CircuitBreakerState; diff --git a/src/retry/src/Annotation/Retry.php b/src/retry/src/Annotation/Retry.php index f8a60bd9f..4e7e0bddb 100644 --- a/src/retry/src/Annotation/Retry.php +++ b/src/retry/src/Annotation/Retry.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Annotation; use Doctrine\Common\Annotations\Annotation\Target; diff --git a/src/retry/src/Annotation/RetryFalsy.php b/src/retry/src/Annotation/RetryFalsy.php index d61a21e1f..574d6a104 100644 --- a/src/retry/src/Annotation/RetryFalsy.php +++ b/src/retry/src/Annotation/RetryFalsy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Annotation; use Doctrine\Common\Annotations\Annotation\Target; diff --git a/src/retry/src/Annotation/RetryThrowable.php b/src/retry/src/Annotation/RetryThrowable.php index a4c85b8fc..4ad26a846 100644 --- a/src/retry/src/Annotation/RetryThrowable.php +++ b/src/retry/src/Annotation/RetryThrowable.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Annotation; use Doctrine\Common\Annotations\Annotation\Target; diff --git a/src/retry/src/Aspect/RetryAnnotationAspect.php b/src/retry/src/Aspect/RetryAnnotationAspect.php index 554637093..8002ecd85 100644 --- a/src/retry/src/Aspect/RetryAnnotationAspect.php +++ b/src/retry/src/Aspect/RetryAnnotationAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Aspect; use Hyperf\Di\Annotation\Aspect; diff --git a/src/retry/src/BackoffStrategy.php b/src/retry/src/BackoffStrategy.php index d5dd95b05..aa7b75217 100644 --- a/src/retry/src/BackoffStrategy.php +++ b/src/retry/src/BackoffStrategy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry; use Hyperf\Utils\Backoff; diff --git a/src/retry/src/CircuitBreakerState.php b/src/retry/src/CircuitBreakerState.php index 4346dafa4..594c25de1 100644 --- a/src/retry/src/CircuitBreakerState.php +++ b/src/retry/src/CircuitBreakerState.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry; class CircuitBreakerState diff --git a/src/retry/src/ConfigProvider.php b/src/retry/src/ConfigProvider.php index 3ad4b72fd..a86e496fb 100644 --- a/src/retry/src/ConfigProvider.php +++ b/src/retry/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry; class ConfigProvider diff --git a/src/retry/src/FlatStrategy.php b/src/retry/src/FlatStrategy.php index ac520cfe9..30eab447f 100644 --- a/src/retry/src/FlatStrategy.php +++ b/src/retry/src/FlatStrategy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry; class FlatStrategy implements SleepStrategyInterface diff --git a/src/retry/src/FluentRetry.php b/src/retry/src/FluentRetry.php index 0d3ca2cf6..0fb39face 100644 --- a/src/retry/src/FluentRetry.php +++ b/src/retry/src/FluentRetry.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry; use Hyperf\Di\Aop\ProceedingJoinPoint; diff --git a/src/retry/src/NoOpRetryBudget.php b/src/retry/src/NoOpRetryBudget.php index 357585bb5..805d6121c 100644 --- a/src/retry/src/NoOpRetryBudget.php +++ b/src/retry/src/NoOpRetryBudget.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry; class NoOpRetryBudget implements RetryBudgetInterface diff --git a/src/retry/src/Policy/BaseRetryPolicy.php b/src/retry/src/Policy/BaseRetryPolicy.php index cf91a2b01..0b5e06ff3 100644 --- a/src/retry/src/Policy/BaseRetryPolicy.php +++ b/src/retry/src/Policy/BaseRetryPolicy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Policy; use Hyperf\Retry\RetryContext; diff --git a/src/retry/src/Policy/BudgetRetryPolicy.php b/src/retry/src/Policy/BudgetRetryPolicy.php index f5435dedd..f6040dcc6 100644 --- a/src/retry/src/Policy/BudgetRetryPolicy.php +++ b/src/retry/src/Policy/BudgetRetryPolicy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Policy; use Hyperf\Retry\RetryBudgetInterface; diff --git a/src/retry/src/Policy/CircuitBreakerRetryPolicy.php b/src/retry/src/Policy/CircuitBreakerRetryPolicy.php index dc1f15d29..6e1ecdded 100644 --- a/src/retry/src/Policy/CircuitBreakerRetryPolicy.php +++ b/src/retry/src/Policy/CircuitBreakerRetryPolicy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Policy; use Hyperf\Retry\CircuitBreakerState; diff --git a/src/retry/src/Policy/ClassifierRetryPolicy.php b/src/retry/src/Policy/ClassifierRetryPolicy.php index 3daaaa77c..4b9a7c714 100644 --- a/src/retry/src/Policy/ClassifierRetryPolicy.php +++ b/src/retry/src/Policy/ClassifierRetryPolicy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Policy; use Hyperf\Retry\RetryContext; diff --git a/src/retry/src/Policy/ExpressionRetryPolicy.php b/src/retry/src/Policy/ExpressionRetryPolicy.php index e2ec9e10f..977a2ffb1 100644 --- a/src/retry/src/Policy/ExpressionRetryPolicy.php +++ b/src/retry/src/Policy/ExpressionRetryPolicy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Policy; use Hyperf\Retry\RetryContext; diff --git a/src/retry/src/Policy/FallbackRetryPolicy.php b/src/retry/src/Policy/FallbackRetryPolicy.php index 95fad6a50..00c43e554 100644 --- a/src/retry/src/Policy/FallbackRetryPolicy.php +++ b/src/retry/src/Policy/FallbackRetryPolicy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Policy; use Hyperf\Retry\RetryContext; diff --git a/src/retry/src/Policy/HybridRetryPolicy.php b/src/retry/src/Policy/HybridRetryPolicy.php index c1835646f..f1989242b 100644 --- a/src/retry/src/Policy/HybridRetryPolicy.php +++ b/src/retry/src/Policy/HybridRetryPolicy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Policy; use Hyperf\Retry\RetryContext; diff --git a/src/retry/src/Policy/MaxAttemptsRetryPolicy.php b/src/retry/src/Policy/MaxAttemptsRetryPolicy.php index 25ab8bf34..c02bbdaac 100644 --- a/src/retry/src/Policy/MaxAttemptsRetryPolicy.php +++ b/src/retry/src/Policy/MaxAttemptsRetryPolicy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Policy; use Hyperf\Retry\RetryContext; diff --git a/src/retry/src/Policy/RetryPolicyInterface.php b/src/retry/src/Policy/RetryPolicyInterface.php index 26f2151ad..8d06cdd7e 100644 --- a/src/retry/src/Policy/RetryPolicyInterface.php +++ b/src/retry/src/Policy/RetryPolicyInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Policy; use Hyperf\Retry\RetryContext; diff --git a/src/retry/src/Policy/SleepRetryPolicy.php b/src/retry/src/Policy/SleepRetryPolicy.php index 7df835856..af5e88691 100644 --- a/src/retry/src/Policy/SleepRetryPolicy.php +++ b/src/retry/src/Policy/SleepRetryPolicy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Policy; use Hyperf\Retry\RetryContext; diff --git a/src/retry/src/Policy/TimeoutRetryPolicy.php b/src/retry/src/Policy/TimeoutRetryPolicy.php index 6500386f3..55f851c72 100644 --- a/src/retry/src/Policy/TimeoutRetryPolicy.php +++ b/src/retry/src/Policy/TimeoutRetryPolicy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry\Policy; use Hyperf\Retry\RetryContext; diff --git a/src/retry/src/Retry.php b/src/retry/src/Retry.php index a0e4dba99..2afb8f7cd 100644 --- a/src/retry/src/Retry.php +++ b/src/retry/src/Retry.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry; use Hyperf\Retry\Policy\RetryPolicyInterface; diff --git a/src/retry/src/RetryBudget.php b/src/retry/src/RetryBudget.php index 4739519ca..faf9beaf1 100644 --- a/src/retry/src/RetryBudget.php +++ b/src/retry/src/RetryBudget.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry; use SplQueue; diff --git a/src/retry/src/RetryBudgetInterface.php b/src/retry/src/RetryBudgetInterface.php index 58309279f..77b7f6e76 100644 --- a/src/retry/src/RetryBudgetInterface.php +++ b/src/retry/src/RetryBudgetInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry; interface RetryBudgetInterface diff --git a/src/retry/src/RetryContext.php b/src/retry/src/RetryContext.php index f5901e9e9..309334894 100644 --- a/src/retry/src/RetryContext.php +++ b/src/retry/src/RetryContext.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry; use Hyperf\Utils\Fluent; diff --git a/src/retry/src/SleepStrategyInterface.php b/src/retry/src/SleepStrategyInterface.php index 129ee3913..fe7b4b22f 100644 --- a/src/retry/src/SleepStrategyInterface.php +++ b/src/retry/src/SleepStrategyInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Retry; interface SleepStrategyInterface diff --git a/src/retry/tests/CircuitBreakerStateTest.php b/src/retry/tests/CircuitBreakerStateTest.php index b74f5a63b..016796cad 100644 --- a/src/retry/tests/CircuitBreakerStateTest.php +++ b/src/retry/tests/CircuitBreakerStateTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Retry; use Hyperf\Retry\CircuitBreakerState; diff --git a/src/retry/tests/RetryAnnotationAspectTest.php b/src/retry/tests/RetryAnnotationAspectTest.php index 33c91db36..7b461cff1 100644 --- a/src/retry/tests/RetryAnnotationAspectTest.php +++ b/src/retry/tests/RetryAnnotationAspectTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Retry; use Hyperf\Contract\ContainerInterface; diff --git a/src/retry/tests/RetryBudgetTest.php b/src/retry/tests/RetryBudgetTest.php index 2990258fc..d3f0b9f9d 100644 --- a/src/retry/tests/RetryBudgetTest.php +++ b/src/retry/tests/RetryBudgetTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Retry; use Hyperf\Retry\RetryBudget; diff --git a/src/retry/tests/RetryTest.php b/src/retry/tests/RetryTest.php index 4cdaa8e44..64f59ab3e 100644 --- a/src/retry/tests/RetryTest.php +++ b/src/retry/tests/RetryTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Retry; use Hyperf\Retry\Policy\MaxAttemptsRetryPolicy; diff --git a/src/rpc-client/src/AbstractServiceClient.php b/src/rpc-client/src/AbstractServiceClient.php index 253a947ad..0d5b412d5 100644 --- a/src/rpc-client/src/AbstractServiceClient.php +++ b/src/rpc-client/src/AbstractServiceClient.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient; use Hyperf\Consul\Health; diff --git a/src/rpc-client/src/Client.php b/src/rpc-client/src/Client.php index 44ee02102..387b96e15 100644 --- a/src/rpc-client/src/Client.php +++ b/src/rpc-client/src/Client.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient; use Hyperf\Contract\PackerInterface; diff --git a/src/rpc-client/src/ConfigProvider.php b/src/rpc-client/src/ConfigProvider.php index e341c93c5..53f242dd8 100644 --- a/src/rpc-client/src/ConfigProvider.php +++ b/src/rpc-client/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient; use Hyperf\RpcClient\Listener\AddConsumerDefinitionListener; diff --git a/src/rpc-client/src/Exception/RequestException.php b/src/rpc-client/src/Exception/RequestException.php index f9f0a82cb..cd658def0 100644 --- a/src/rpc-client/src/Exception/RequestException.php +++ b/src/rpc-client/src/Exception/RequestException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient\Exception; class RequestException extends \RuntimeException diff --git a/src/rpc-client/src/Listener/AddConsumerDefinitionListener.php b/src/rpc-client/src/Listener/AddConsumerDefinitionListener.php index b6ae205af..3844812ff 100644 --- a/src/rpc-client/src/Listener/AddConsumerDefinitionListener.php +++ b/src/rpc-client/src/Listener/AddConsumerDefinitionListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient\Listener; use Hyperf\Contract\ConfigInterface; diff --git a/src/rpc-client/src/Pool/PoolFactory.php b/src/rpc-client/src/Pool/PoolFactory.php index a0c0ff876..4f1ba108b 100644 --- a/src/rpc-client/src/Pool/PoolFactory.php +++ b/src/rpc-client/src/Pool/PoolFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient\Pool; use Hyperf\Di\Container; diff --git a/src/rpc-client/src/Pool/RpcClientPool.php b/src/rpc-client/src/Pool/RpcClientPool.php index 04186d05e..0baf1570d 100644 --- a/src/rpc-client/src/Pool/RpcClientPool.php +++ b/src/rpc-client/src/Pool/RpcClientPool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient\Pool; use Hyperf\Contract\ConfigInterface; diff --git a/src/rpc-client/src/Proxy/AbstractProxyService.php b/src/rpc-client/src/Proxy/AbstractProxyService.php index fc657e3ad..9d51b7dc1 100644 --- a/src/rpc-client/src/Proxy/AbstractProxyService.php +++ b/src/rpc-client/src/Proxy/AbstractProxyService.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient\Proxy; use Hyperf\RpcClient\ServiceClient; diff --git a/src/rpc-client/src/Proxy/Ast.php b/src/rpc-client/src/Proxy/Ast.php index 4d877d0ca..f092f6aa5 100644 --- a/src/rpc-client/src/Proxy/Ast.php +++ b/src/rpc-client/src/Proxy/Ast.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient\Proxy; use PhpParser\NodeTraverser; diff --git a/src/rpc-client/src/Proxy/CodeLoader.php b/src/rpc-client/src/Proxy/CodeLoader.php index eeb1847aa..63c9502f7 100644 --- a/src/rpc-client/src/Proxy/CodeLoader.php +++ b/src/rpc-client/src/Proxy/CodeLoader.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient\Proxy; use Hyperf\Utils\Composer; diff --git a/src/rpc-client/src/Proxy/ProxyCallVisitor.php b/src/rpc-client/src/Proxy/ProxyCallVisitor.php index dd7c823c1..4c36d62dc 100644 --- a/src/rpc-client/src/Proxy/ProxyCallVisitor.php +++ b/src/rpc-client/src/Proxy/ProxyCallVisitor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient\Proxy; use PhpParser\Node; diff --git a/src/rpc-client/src/ProxyFactory.php b/src/rpc-client/src/ProxyFactory.php index 25de0357d..98b4003fd 100644 --- a/src/rpc-client/src/ProxyFactory.php +++ b/src/rpc-client/src/ProxyFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient; use Hyperf\RpcClient\Proxy\Ast; diff --git a/src/rpc-client/src/ServiceClient.php b/src/rpc-client/src/ServiceClient.php index 5e6d9141c..a035a15f3 100644 --- a/src/rpc-client/src/ServiceClient.php +++ b/src/rpc-client/src/ServiceClient.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcClient; use Hyperf\Contract\IdGeneratorInterface; diff --git a/src/rpc-server/src/Annotation/RpcService.php b/src/rpc-server/src/Annotation/RpcService.php index 5c4cdf7df..fce340228 100644 --- a/src/rpc-server/src/Annotation/RpcService.php +++ b/src/rpc-server/src/Annotation/RpcService.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcServer\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/rpc-server/src/ConfigProvider.php b/src/rpc-server/src/ConfigProvider.php index a505fcd51..355c1c0f4 100644 --- a/src/rpc-server/src/ConfigProvider.php +++ b/src/rpc-server/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcServer; class ConfigProvider diff --git a/src/rpc-server/src/CoreMiddleware.php b/src/rpc-server/src/CoreMiddleware.php index ebe530400..c1a1096d8 100644 --- a/src/rpc-server/src/CoreMiddleware.php +++ b/src/rpc-server/src/CoreMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcServer; use Closure; diff --git a/src/rpc-server/src/Event/AfterPathRegister.php b/src/rpc-server/src/Event/AfterPathRegister.php index 8c591e683..8d829a287 100644 --- a/src/rpc-server/src/Event/AfterPathRegister.php +++ b/src/rpc-server/src/Event/AfterPathRegister.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcServer\Event; use Hyperf\RpcServer\Annotation\RpcService as Annotation; diff --git a/src/rpc-server/src/RequestDispatcher.php b/src/rpc-server/src/RequestDispatcher.php index 41daea0a3..53c7de428 100644 --- a/src/rpc-server/src/RequestDispatcher.php +++ b/src/rpc-server/src/RequestDispatcher.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcServer; use Hyperf\Dispatcher\HttpDispatcher; diff --git a/src/rpc-server/src/Router/DispatcherFactory.php b/src/rpc-server/src/Router/DispatcherFactory.php index af7281b77..51e637ca7 100644 --- a/src/rpc-server/src/Router/DispatcherFactory.php +++ b/src/rpc-server/src/Router/DispatcherFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcServer\Router; use FastRoute\DataGenerator\GroupCountBased as DataGenerator; diff --git a/src/rpc-server/src/Router/RouteCollector.php b/src/rpc-server/src/Router/RouteCollector.php index 38b436158..73d56a5b4 100644 --- a/src/rpc-server/src/Router/RouteCollector.php +++ b/src/rpc-server/src/Router/RouteCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcServer\Router; use FastRoute\DataGenerator; diff --git a/src/rpc-server/src/Router/Router.php b/src/rpc-server/src/Router/Router.php index 4a850c376..76ce443e3 100644 --- a/src/rpc-server/src/Router/Router.php +++ b/src/rpc-server/src/Router/Router.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcServer\Router; /** diff --git a/src/rpc-server/src/Server.php b/src/rpc-server/src/Server.php index b5f35a0b5..7f742cbff 100644 --- a/src/rpc-server/src/Server.php +++ b/src/rpc-server/src/Server.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\RpcServer; use Hyperf\Contract\ConfigInterface; diff --git a/src/rpc/src/Context.php b/src/rpc/src/Context.php index 48e6e2092..fd1a68d2b 100644 --- a/src/rpc/src/Context.php +++ b/src/rpc/src/Context.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc; use Hyperf\Utils\Arr; diff --git a/src/rpc/src/Contract/DataFormatterInterface.php b/src/rpc/src/Contract/DataFormatterInterface.php index dbd3ec66e..86ef44e24 100644 --- a/src/rpc/src/Contract/DataFormatterInterface.php +++ b/src/rpc/src/Contract/DataFormatterInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\Contract; interface DataFormatterInterface diff --git a/src/rpc/src/Contract/EofInterface.php b/src/rpc/src/Contract/EofInterface.php index fa4f0a620..660fbb07d 100644 --- a/src/rpc/src/Contract/EofInterface.php +++ b/src/rpc/src/Contract/EofInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\Contract; interface EofInterface diff --git a/src/rpc/src/Contract/PackerInterface.php b/src/rpc/src/Contract/PackerInterface.php index 98cfae330..238cad0eb 100644 --- a/src/rpc/src/Contract/PackerInterface.php +++ b/src/rpc/src/Contract/PackerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\Contract; /** diff --git a/src/rpc/src/Contract/PathGeneratorInterface.php b/src/rpc/src/Contract/PathGeneratorInterface.php index 6a645461c..906c974db 100644 --- a/src/rpc/src/Contract/PathGeneratorInterface.php +++ b/src/rpc/src/Contract/PathGeneratorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\Contract; interface PathGeneratorInterface diff --git a/src/rpc/src/Contract/RequestInterface.php b/src/rpc/src/Contract/RequestInterface.php index 4d4093b22..29a7801fa 100644 --- a/src/rpc/src/Contract/RequestInterface.php +++ b/src/rpc/src/Contract/RequestInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\Contract; interface RequestInterface diff --git a/src/rpc/src/Contract/ResponseInterface.php b/src/rpc/src/Contract/ResponseInterface.php index 3a3663149..3a9cc8e4a 100644 --- a/src/rpc/src/Contract/ResponseInterface.php +++ b/src/rpc/src/Contract/ResponseInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\Contract; interface ResponseInterface extends \Psr\Http\Message\ResponseInterface diff --git a/src/rpc/src/Contract/TransporterInterface.php b/src/rpc/src/Contract/TransporterInterface.php index a74262965..9b7463ade 100644 --- a/src/rpc/src/Contract/TransporterInterface.php +++ b/src/rpc/src/Contract/TransporterInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\Contract; use Hyperf\LoadBalancer\LoadBalancerInterface; diff --git a/src/rpc/src/Exception/RecvException.php b/src/rpc/src/Exception/RecvException.php index 76f6a730b..a8b3b054f 100644 --- a/src/rpc/src/Exception/RecvException.php +++ b/src/rpc/src/Exception/RecvException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\Exception; class RecvException extends \RuntimeException diff --git a/src/rpc/src/IdGenerator/IdGeneratorInterface.php b/src/rpc/src/IdGenerator/IdGeneratorInterface.php index 4328bbcbd..cadff677e 100644 --- a/src/rpc/src/IdGenerator/IdGeneratorInterface.php +++ b/src/rpc/src/IdGenerator/IdGeneratorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\IdGenerator; use Hyperf\Contract; diff --git a/src/rpc/src/IdGenerator/NodeRequestIdGenerator.php b/src/rpc/src/IdGenerator/NodeRequestIdGenerator.php index 2bdc3513b..47f0af781 100644 --- a/src/rpc/src/IdGenerator/NodeRequestIdGenerator.php +++ b/src/rpc/src/IdGenerator/NodeRequestIdGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\IdGenerator; use Hyperf\Contract\IdGeneratorInterface; diff --git a/src/rpc/src/IdGenerator/RequestIdGenerator.php b/src/rpc/src/IdGenerator/RequestIdGenerator.php index 59c263f24..816d36331 100644 --- a/src/rpc/src/IdGenerator/RequestIdGenerator.php +++ b/src/rpc/src/IdGenerator/RequestIdGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\IdGenerator; use Hyperf\Contract\IdGeneratorInterface; diff --git a/src/rpc/src/IdGenerator/UniqidIdGenerator.php b/src/rpc/src/IdGenerator/UniqidIdGenerator.php index 8e20f3cc5..895e79700 100644 --- a/src/rpc/src/IdGenerator/UniqidIdGenerator.php +++ b/src/rpc/src/IdGenerator/UniqidIdGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\IdGenerator; class UniqidIdGenerator implements IdGeneratorInterface diff --git a/src/rpc/src/PathGenerator/FullPathGenerator.php b/src/rpc/src/PathGenerator/FullPathGenerator.php index 9d0bbc94b..f012596db 100644 --- a/src/rpc/src/PathGenerator/FullPathGenerator.php +++ b/src/rpc/src/PathGenerator/FullPathGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\PathGenerator; use Hyperf\Rpc\Contract\PathGeneratorInterface; diff --git a/src/rpc/src/PathGenerator/PathGenerator.php b/src/rpc/src/PathGenerator/PathGenerator.php index 448587fde..efcbfd0c4 100644 --- a/src/rpc/src/PathGenerator/PathGenerator.php +++ b/src/rpc/src/PathGenerator/PathGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc\PathGenerator; use Hyperf\Rpc\Contract\PathGeneratorInterface; diff --git a/src/rpc/src/Protocol.php b/src/rpc/src/Protocol.php index ede33fbf3..f30aa897f 100644 --- a/src/rpc/src/Protocol.php +++ b/src/rpc/src/Protocol.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc; use Hyperf\Contract\PackerInterface; diff --git a/src/rpc/src/ProtocolManager.php b/src/rpc/src/ProtocolManager.php index 1f7dc54cd..b12258353 100644 --- a/src/rpc/src/ProtocolManager.php +++ b/src/rpc/src/ProtocolManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Rpc; use Hyperf\Contract\ConfigInterface; diff --git a/src/rpc/tests/ContextTest.php b/src/rpc/tests/ContextTest.php index 69492204e..ef0d60aee 100644 --- a/src/rpc/tests/ContextTest.php +++ b/src/rpc/tests/ContextTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Rpc; use Hyperf\Rpc\Context; diff --git a/src/rpc/tests/IdGenerator/NodeRequestIdGeneratorTest.php b/src/rpc/tests/IdGenerator/NodeRequestIdGeneratorTest.php index a40763644..16bc664ea 100644 --- a/src/rpc/tests/IdGenerator/NodeRequestIdGeneratorTest.php +++ b/src/rpc/tests/IdGenerator/NodeRequestIdGeneratorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Rpc\IdGenerator; use Hyperf\Rpc\IdGenerator\NodeRequestIdGenerator; diff --git a/src/rpc/tests/IdGenerator/RequestIdGeneratorTest.php b/src/rpc/tests/IdGenerator/RequestIdGeneratorTest.php index f8d72e0aa..9f0ace787 100644 --- a/src/rpc/tests/IdGenerator/RequestIdGeneratorTest.php +++ b/src/rpc/tests/IdGenerator/RequestIdGeneratorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Rpc\IdGenerator; use Hyperf\Rpc\IdGenerator\RequestIdGenerator; diff --git a/src/rpc/tests/PathGenerator/FullPathGeneratorTest.php b/src/rpc/tests/PathGenerator/FullPathGeneratorTest.php index 663fc1d14..d3e096a5d 100644 --- a/src/rpc/tests/PathGenerator/FullPathGeneratorTest.php +++ b/src/rpc/tests/PathGenerator/FullPathGeneratorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Rpc\PathGenerator; use Hyperf\Rpc\PathGenerator\FullPathGenerator; diff --git a/src/rpc/tests/PathGenerator/PathGeneratorTest.php b/src/rpc/tests/PathGenerator/PathGeneratorTest.php index 1e9e788a2..4de1eefd9 100644 --- a/src/rpc/tests/PathGenerator/PathGeneratorTest.php +++ b/src/rpc/tests/PathGenerator/PathGeneratorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Rpc\PathGenerator; use Hyperf\JsonRpc\PathGenerator; diff --git a/src/server/publish/server.php b/src/server/publish/server.php index 4c2863a15..d985823ab 100644 --- a/src/server/publish/server.php +++ b/src/server/publish/server.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - use Hyperf\Server\Server; use Hyperf\Server\SwooleEvent; diff --git a/src/server/src/Command/StartServer.php b/src/server/src/Command/StartServer.php index b12630394..7add36c61 100644 --- a/src/server/src/Command/StartServer.php +++ b/src/server/src/Command/StartServer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server\Command; use Hyperf\Contract\ConfigInterface; diff --git a/src/server/src/ConfigProvider.php b/src/server/src/ConfigProvider.php index 8129af8d6..65b704624 100644 --- a/src/server/src/ConfigProvider.php +++ b/src/server/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server; use Hyperf\Server\Command\StartServer; diff --git a/src/server/src/Entry/EventDispatcher.php b/src/server/src/Entry/EventDispatcher.php index 5e06f57e6..5a152f233 100644 --- a/src/server/src/Entry/EventDispatcher.php +++ b/src/server/src/Entry/EventDispatcher.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server\Entry; use Psr\EventDispatcher\EventDispatcherInterface; diff --git a/src/server/src/Entry/Logger.php b/src/server/src/Entry/Logger.php index aac08682b..eb897d8ee 100644 --- a/src/server/src/Entry/Logger.php +++ b/src/server/src/Entry/Logger.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server\Entry; use Psr\Log\LoggerInterface; diff --git a/src/server/src/Exception/InvalidArgumentException.php b/src/server/src/Exception/InvalidArgumentException.php index d8b3d6155..ba3ffc138 100644 --- a/src/server/src/Exception/InvalidArgumentException.php +++ b/src/server/src/Exception/InvalidArgumentException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server\Exception; class InvalidArgumentException extends \InvalidArgumentException diff --git a/src/server/src/Exception/RuntimeException.php b/src/server/src/Exception/RuntimeException.php index 21488998f..303d5457c 100644 --- a/src/server/src/Exception/RuntimeException.php +++ b/src/server/src/Exception/RuntimeException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server\Exception; class RuntimeException extends \RuntimeException diff --git a/src/server/src/Exception/ServerException.php b/src/server/src/Exception/ServerException.php index 8b4a44762..786cb325c 100644 --- a/src/server/src/Exception/ServerException.php +++ b/src/server/src/Exception/ServerException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server\Exception; class ServerException extends RuntimeException diff --git a/src/server/src/Listener/AfterWorkerStartListener.php b/src/server/src/Listener/AfterWorkerStartListener.php index 03728247d..4cb2f44e8 100644 --- a/src/server/src/Listener/AfterWorkerStartListener.php +++ b/src/server/src/Listener/AfterWorkerStartListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server\Listener; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/server/src/Listener/InitProcessTitleListener.php b/src/server/src/Listener/InitProcessTitleListener.php index 94bd1e5d7..1ed451caa 100644 --- a/src/server/src/Listener/InitProcessTitleListener.php +++ b/src/server/src/Listener/InitProcessTitleListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server\Listener; use Hyperf\Contract\ConfigInterface; diff --git a/src/server/src/Port.php b/src/server/src/Port.php index d736e28cd..baf8e7281 100644 --- a/src/server/src/Port.php +++ b/src/server/src/Port.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server; class Port diff --git a/src/server/src/Server.php b/src/server/src/Server.php index 8a888459e..0b4f11567 100644 --- a/src/server/src/Server.php +++ b/src/server/src/Server.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server; use Hyperf\Contract\MiddlewareInitializerInterface; diff --git a/src/server/src/ServerConfig.php b/src/server/src/ServerConfig.php index 134d3e674..b303cad94 100644 --- a/src/server/src/ServerConfig.php +++ b/src/server/src/ServerConfig.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server; use Hyperf\Server\Exception\InvalidArgumentException; diff --git a/src/server/src/ServerFactory.php b/src/server/src/ServerFactory.php index 804bbab98..77c6facaf 100644 --- a/src/server/src/ServerFactory.php +++ b/src/server/src/ServerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server; use Hyperf\Server\Entry\EventDispatcher; diff --git a/src/server/src/ServerInterface.php b/src/server/src/ServerInterface.php index 06aef3d03..5d49662b0 100644 --- a/src/server/src/ServerInterface.php +++ b/src/server/src/ServerInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server; use Psr\Container\ContainerInterface; diff --git a/src/server/src/ServerManager.php b/src/server/src/ServerManager.php index b5eb3ff50..d8233bea4 100644 --- a/src/server/src/ServerManager.php +++ b/src/server/src/ServerManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server; use Hyperf\Utils\Traits\Container; diff --git a/src/server/src/SwooleEvent.php b/src/server/src/SwooleEvent.php index 167a255cc..0fad2922e 100644 --- a/src/server/src/SwooleEvent.php +++ b/src/server/src/SwooleEvent.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server; class SwooleEvent diff --git a/src/server/src/SwooleServerFactory.php b/src/server/src/SwooleServerFactory.php index dd859827e..3f971c2bd 100644 --- a/src/server/src/SwooleServerFactory.php +++ b/src/server/src/SwooleServerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Server; use Psr\Container\ContainerInterface; diff --git a/src/server/tests/Listener/InitProcessTitleListenerTest.php b/src/server/tests/Listener/InitProcessTitleListenerTest.php index e3c5c89c8..4a68c3f35 100644 --- a/src/server/tests/Listener/InitProcessTitleListenerTest.php +++ b/src/server/tests/Listener/InitProcessTitleListenerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Server\Listener; use Hyperf\Config\Config; diff --git a/src/server/tests/PortTest.php b/src/server/tests/PortTest.php index dfe2f0c4d..f85b7be58 100644 --- a/src/server/tests/PortTest.php +++ b/src/server/tests/PortTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Server; use Hyperf\Server\Port; diff --git a/src/server/tests/Stub/DemoProcess.php b/src/server/tests/Stub/DemoProcess.php index 6089bf4fc..8bbdd27fb 100644 --- a/src/server/tests/Stub/DemoProcess.php +++ b/src/server/tests/Stub/DemoProcess.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Server\Stub; use Hyperf\Process\AbstractProcess; diff --git a/src/server/tests/Stub/InitProcessTitleListenerStub.php b/src/server/tests/Stub/InitProcessTitleListenerStub.php index 77dcc6b54..24b3fba97 100644 --- a/src/server/tests/Stub/InitProcessTitleListenerStub.php +++ b/src/server/tests/Stub/InitProcessTitleListenerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Server\Stub; use Hyperf\Server\Listener\InitProcessTitleListener; diff --git a/src/server/tests/Stub/InitProcessTitleListenerStub2.php b/src/server/tests/Stub/InitProcessTitleListenerStub2.php index 2d17099e7..6945fa04a 100644 --- a/src/server/tests/Stub/InitProcessTitleListenerStub2.php +++ b/src/server/tests/Stub/InitProcessTitleListenerStub2.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Server\Stub; use Hyperf\Server\Listener\InitProcessTitleListener; diff --git a/src/service-governance/src/ConfigProvider.php b/src/service-governance/src/ConfigProvider.php index 947464d93..1c13dc1c5 100644 --- a/src/service-governance/src/ConfigProvider.php +++ b/src/service-governance/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ServiceGovernance; use Hyperf\ServiceGovernance\Listener\RegisterServiceListener; diff --git a/src/service-governance/src/Listener/RegisterServiceListener.php b/src/service-governance/src/Listener/RegisterServiceListener.php index 4cb1cd757..ded4d1f4b 100644 --- a/src/service-governance/src/Listener/RegisterServiceListener.php +++ b/src/service-governance/src/Listener/RegisterServiceListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ServiceGovernance\Listener; use Hyperf\Consul\Exception\ServerException; diff --git a/src/service-governance/src/Register/ConsulAgent.php b/src/service-governance/src/Register/ConsulAgent.php index 4cd7a68bd..ef4a47116 100644 --- a/src/service-governance/src/Register/ConsulAgent.php +++ b/src/service-governance/src/Register/ConsulAgent.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ServiceGovernance\Register; use Hyperf\Consul\AgentInterface; diff --git a/src/service-governance/src/Register/ConsulAgentFactory.php b/src/service-governance/src/Register/ConsulAgentFactory.php index cf956b737..566243f44 100644 --- a/src/service-governance/src/Register/ConsulAgentFactory.php +++ b/src/service-governance/src/Register/ConsulAgentFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ServiceGovernance\Register; use Hyperf\Consul\Agent; diff --git a/src/service-governance/src/ServiceManager.php b/src/service-governance/src/ServiceManager.php index 949fa6243..1bb00082e 100644 --- a/src/service-governance/src/ServiceManager.php +++ b/src/service-governance/src/ServiceManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\ServiceGovernance; class ServiceManager diff --git a/src/service-governance/tests/Listener/RegisterServiceListenerTest.php b/src/service-governance/tests/Listener/RegisterServiceListenerTest.php index 771e0b697..0b1a4729b 100644 --- a/src/service-governance/tests/Listener/RegisterServiceListenerTest.php +++ b/src/service-governance/tests/Listener/RegisterServiceListenerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ServiceGovernance\Listener; use GuzzleHttp\Psr7\Response; diff --git a/src/service-governance/tests/ServiceManagerTest.php b/src/service-governance/tests/ServiceManagerTest.php index be98219c8..abeab6968 100644 --- a/src/service-governance/tests/ServiceManagerTest.php +++ b/src/service-governance/tests/ServiceManagerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\ServiceGovernance; use Hyperf\ServiceGovernance\ServiceManager; diff --git a/src/session/publish/session.php b/src/session/publish/session.php index 496307e7e..2501637e3 100644 --- a/src/session/publish/session.php +++ b/src/session/publish/session.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - use Hyperf\Session\Handler; return [ diff --git a/src/session/src/ConfigProvider.php b/src/session/src/ConfigProvider.php index 1e0c096e2..a09eb4317 100644 --- a/src/session/src/ConfigProvider.php +++ b/src/session/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Session; use Hyperf\Contract\SessionInterface; diff --git a/src/session/src/FlashTrait.php b/src/session/src/FlashTrait.php index be56b75e1..9ab5d2517 100644 --- a/src/session/src/FlashTrait.php +++ b/src/session/src/FlashTrait.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Session; trait FlashTrait diff --git a/src/session/src/Handler/FileHandler.php b/src/session/src/Handler/FileHandler.php index d33071c7d..534973fb4 100644 --- a/src/session/src/Handler/FileHandler.php +++ b/src/session/src/Handler/FileHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Session\Handler; use Carbon\Carbon; diff --git a/src/session/src/Handler/FileHandlerFactory.php b/src/session/src/Handler/FileHandlerFactory.php index b118358b1..e11ede480 100644 --- a/src/session/src/Handler/FileHandlerFactory.php +++ b/src/session/src/Handler/FileHandlerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Session\Handler; use Hyperf\Contract\ConfigInterface; diff --git a/src/session/src/Handler/NullHandler.php b/src/session/src/Handler/NullHandler.php index 96243d572..2727e75fa 100644 --- a/src/session/src/Handler/NullHandler.php +++ b/src/session/src/Handler/NullHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Session\Handler; use SessionHandlerInterface; diff --git a/src/session/src/Handler/RedisHandler.php b/src/session/src/Handler/RedisHandler.php index a0c479f35..eed6cb031 100644 --- a/src/session/src/Handler/RedisHandler.php +++ b/src/session/src/Handler/RedisHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Session\Handler; use Hyperf\Redis\Redis as RedisProxy; diff --git a/src/session/src/Handler/RedisHandlerFactory.php b/src/session/src/Handler/RedisHandlerFactory.php index 5d108f988..b5e028ff3 100644 --- a/src/session/src/Handler/RedisHandlerFactory.php +++ b/src/session/src/Handler/RedisHandlerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Session\Handler; use Hyperf\Contract\ConfigInterface; diff --git a/src/session/src/Middleware/SessionMiddleware.php b/src/session/src/Middleware/SessionMiddleware.php index 789f81198..c2554794f 100644 --- a/src/session/src/Middleware/SessionMiddleware.php +++ b/src/session/src/Middleware/SessionMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Session\Middleware; use Carbon\Carbon; diff --git a/src/session/src/Session.php b/src/session/src/Session.php index 020059f5f..c281fe996 100644 --- a/src/session/src/Session.php +++ b/src/session/src/Session.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Session; use Hyperf\Contract\SessionInterface; @@ -29,9 +28,6 @@ class Session implements SessionInterface */ protected $id; - /** - * @var - */ protected $name; /** diff --git a/src/session/src/SessionManager.php b/src/session/src/SessionManager.php index c0acc69fd..b8fa1d69d 100644 --- a/src/session/src/SessionManager.php +++ b/src/session/src/SessionManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Session; use Hyperf\Contract\ConfigInterface; diff --git a/src/session/src/SessionProxy.php b/src/session/src/SessionProxy.php index d4f94c211..633a68aed 100644 --- a/src/session/src/SessionProxy.php +++ b/src/session/src/SessionProxy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Session; use Hyperf\Contract\SessionInterface; diff --git a/src/session/tests/ConfigProviderTest.php b/src/session/tests/ConfigProviderTest.php index 35a939856..00837523e 100644 --- a/src/session/tests/ConfigProviderTest.php +++ b/src/session/tests/ConfigProviderTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Session; use Hyperf\Session\ConfigProvider; diff --git a/src/session/tests/FileHandlerTest.php b/src/session/tests/FileHandlerTest.php index 5c811f958..f9bb64759 100644 --- a/src/session/tests/FileHandlerTest.php +++ b/src/session/tests/FileHandlerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Session; use Hyperf\Session\Handler\FileHandler; diff --git a/src/session/tests/SessionManagerTest.php b/src/session/tests/SessionManagerTest.php index e532dcbff..bacf61870 100644 --- a/src/session/tests/SessionManagerTest.php +++ b/src/session/tests/SessionManagerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Session; use Hyperf\Contract\ConfigInterface; diff --git a/src/session/tests/SessionMiddlewareTest.php b/src/session/tests/SessionMiddlewareTest.php index 23c870f95..fe26bc8bd 100644 --- a/src/session/tests/SessionMiddlewareTest.php +++ b/src/session/tests/SessionMiddlewareTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Session; use Carbon\Carbon; diff --git a/src/session/tests/SessionTest.php b/src/session/tests/SessionTest.php index 7e6312b94..7b5a0429d 100644 --- a/src/session/tests/SessionTest.php +++ b/src/session/tests/SessionTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Session; use Hyperf\Session\Handler\FileHandler; diff --git a/src/session/tests/Stub/FooHandler.php b/src/session/tests/Stub/FooHandler.php index 3cb8e171d..a5deb40ca 100644 --- a/src/session/tests/Stub/FooHandler.php +++ b/src/session/tests/Stub/FooHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Session\Stub; use SessionHandlerInterface; diff --git a/src/session/tests/Stub/MockStub.php b/src/session/tests/Stub/MockStub.php index 1dfecd972..6bf3c4c6b 100644 --- a/src/session/tests/Stub/MockStub.php +++ b/src/session/tests/Stub/MockStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Session\Stub; use Hyperf\Config\Config; diff --git a/src/session/tests/Stub/NonSessionHandler.php b/src/session/tests/Stub/NonSessionHandler.php index 34382c327..83eb8c30b 100644 --- a/src/session/tests/Stub/NonSessionHandler.php +++ b/src/session/tests/Stub/NonSessionHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Session\Stub; class NonSessionHandler diff --git a/src/snowflake/publish/snowflake.php b/src/snowflake/publish/snowflake.php index 2a9ee03b1..15e02c4bc 100644 --- a/src/snowflake/publish/snowflake.php +++ b/src/snowflake/publish/snowflake.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - use Hyperf\Snowflake\MetaGenerator\RedisMilliSecondMetaGenerator; use Hyperf\Snowflake\MetaGenerator\RedisSecondMetaGenerator; use Hyperf\Snowflake\MetaGeneratorInterface; diff --git a/src/snowflake/src/ConfigProvider.php b/src/snowflake/src/ConfigProvider.php index 64cc14ac6..a59f735fe 100644 --- a/src/snowflake/src/ConfigProvider.php +++ b/src/snowflake/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake; use Hyperf\Snowflake\IdGenerator\SnowflakeIdGenerator; diff --git a/src/snowflake/src/Configuration.php b/src/snowflake/src/Configuration.php index c8d92dcea..b68fa1c32 100644 --- a/src/snowflake/src/Configuration.php +++ b/src/snowflake/src/Configuration.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake; class Configuration implements ConfigurationInterface diff --git a/src/snowflake/src/ConfigurationInterface.php b/src/snowflake/src/ConfigurationInterface.php index 30fb02db0..fab15970b 100644 --- a/src/snowflake/src/ConfigurationInterface.php +++ b/src/snowflake/src/ConfigurationInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake; interface ConfigurationInterface diff --git a/src/snowflake/src/Exception/SnowflakeException.php b/src/snowflake/src/Exception/SnowflakeException.php index 7da3270af..6fdea505e 100644 --- a/src/snowflake/src/Exception/SnowflakeException.php +++ b/src/snowflake/src/Exception/SnowflakeException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake\Exception; use RuntimeException; diff --git a/src/snowflake/src/IdGenerator.php b/src/snowflake/src/IdGenerator.php index 3ce9ab326..9361bc92b 100644 --- a/src/snowflake/src/IdGenerator.php +++ b/src/snowflake/src/IdGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake; abstract class IdGenerator implements IdGeneratorInterface diff --git a/src/snowflake/src/IdGenerator/SnowflakeIdGenerator.php b/src/snowflake/src/IdGenerator/SnowflakeIdGenerator.php index 0a67fcd64..f49d88899 100644 --- a/src/snowflake/src/IdGenerator/SnowflakeIdGenerator.php +++ b/src/snowflake/src/IdGenerator/SnowflakeIdGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake\IdGenerator; use Hyperf\Snowflake\IdGenerator; diff --git a/src/snowflake/src/IdGeneratorInterface.php b/src/snowflake/src/IdGeneratorInterface.php index e258595f6..8449d46cf 100644 --- a/src/snowflake/src/IdGeneratorInterface.php +++ b/src/snowflake/src/IdGeneratorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake; interface IdGeneratorInterface extends \Hyperf\Contract\IdGeneratorInterface diff --git a/src/snowflake/src/Meta.php b/src/snowflake/src/Meta.php index a8604350a..60835de17 100644 --- a/src/snowflake/src/Meta.php +++ b/src/snowflake/src/Meta.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake; class Meta diff --git a/src/snowflake/src/MetaGenerator.php b/src/snowflake/src/MetaGenerator.php index 253221576..f084701fd 100644 --- a/src/snowflake/src/MetaGenerator.php +++ b/src/snowflake/src/MetaGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake; use Hyperf\Snowflake\Exception\SnowflakeException; diff --git a/src/snowflake/src/MetaGenerator/RandomMilliSecondMetaGenerator.php b/src/snowflake/src/MetaGenerator/RandomMilliSecondMetaGenerator.php index d75b400b7..d496fc966 100644 --- a/src/snowflake/src/MetaGenerator/RandomMilliSecondMetaGenerator.php +++ b/src/snowflake/src/MetaGenerator/RandomMilliSecondMetaGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake\MetaGenerator; use Hyperf\Snowflake\ConfigurationInterface; diff --git a/src/snowflake/src/MetaGenerator/RedisMetaGenerator.php b/src/snowflake/src/MetaGenerator/RedisMetaGenerator.php index 755fd88ac..32a2fd774 100644 --- a/src/snowflake/src/MetaGenerator/RedisMetaGenerator.php +++ b/src/snowflake/src/MetaGenerator/RedisMetaGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake\MetaGenerator; use Hyperf\Contract\ConfigInterface; diff --git a/src/snowflake/src/MetaGenerator/RedisMilliSecondMetaGenerator.php b/src/snowflake/src/MetaGenerator/RedisMilliSecondMetaGenerator.php index 1ecdf28f7..8c57137f5 100644 --- a/src/snowflake/src/MetaGenerator/RedisMilliSecondMetaGenerator.php +++ b/src/snowflake/src/MetaGenerator/RedisMilliSecondMetaGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake\MetaGenerator; use Hyperf\Contract\ConfigInterface; diff --git a/src/snowflake/src/MetaGenerator/RedisSecondMetaGenerator.php b/src/snowflake/src/MetaGenerator/RedisSecondMetaGenerator.php index c773b3fde..cec441f79 100644 --- a/src/snowflake/src/MetaGenerator/RedisSecondMetaGenerator.php +++ b/src/snowflake/src/MetaGenerator/RedisSecondMetaGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake\MetaGenerator; use Hyperf\Contract\ConfigInterface; diff --git a/src/snowflake/src/MetaGeneratorFactory.php b/src/snowflake/src/MetaGeneratorFactory.php index 3062251b3..88a56be6c 100644 --- a/src/snowflake/src/MetaGeneratorFactory.php +++ b/src/snowflake/src/MetaGeneratorFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake; use Hyperf\Contract\ConfigInterface; diff --git a/src/snowflake/src/MetaGeneratorInterface.php b/src/snowflake/src/MetaGeneratorInterface.php index 7e547c40e..395162676 100644 --- a/src/snowflake/src/MetaGeneratorInterface.php +++ b/src/snowflake/src/MetaGeneratorInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Snowflake; interface MetaGeneratorInterface diff --git a/src/snowflake/tests/RedisMetaGeneratorTest.php b/src/snowflake/tests/RedisMetaGeneratorTest.php index 9361647a7..4eb2755b5 100644 --- a/src/snowflake/tests/RedisMetaGeneratorTest.php +++ b/src/snowflake/tests/RedisMetaGeneratorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Snowflake; use Hyperf\Config\Config; diff --git a/src/snowflake/tests/SnowflakeGeneratorTest.php b/src/snowflake/tests/SnowflakeGeneratorTest.php index d57b114c8..276e87e66 100644 --- a/src/snowflake/tests/SnowflakeGeneratorTest.php +++ b/src/snowflake/tests/SnowflakeGeneratorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Snowflake; use Hyperf\Snowflake\Configuration; diff --git a/src/snowflake/tests/Stub/UserDefinedIdGenerator.php b/src/snowflake/tests/Stub/UserDefinedIdGenerator.php index 0b72e7d4b..f32c877d3 100644 --- a/src/snowflake/tests/Stub/UserDefinedIdGenerator.php +++ b/src/snowflake/tests/Stub/UserDefinedIdGenerator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Snowflake\Stub; use Hyperf\Snowflake\IdGenerator; diff --git a/src/socket/src/ConfigProvider.php b/src/socket/src/ConfigProvider.php index 1a42ba7e2..3dc757547 100644 --- a/src/socket/src/ConfigProvider.php +++ b/src/socket/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Socket; class ConfigProvider diff --git a/src/socket/src/Exception/SocketException.php b/src/socket/src/Exception/SocketException.php index 85923cd7f..17cbe8606 100644 --- a/src/socket/src/Exception/SocketException.php +++ b/src/socket/src/Exception/SocketException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Socket\Exception; class SocketException extends \RuntimeException diff --git a/src/socket/src/Socket.php b/src/socket/src/Socket.php index 13c0dad6f..e661bedc4 100644 --- a/src/socket/src/Socket.php +++ b/src/socket/src/Socket.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Socket; use Hyperf\Protocol\ProtocolPackerInterface; diff --git a/src/socket/src/SocketInterface.php b/src/socket/src/SocketInterface.php index 0b5a1cc8e..94faf7168 100644 --- a/src/socket/src/SocketInterface.php +++ b/src/socket/src/SocketInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Socket; interface SocketInterface diff --git a/src/socket/tests/SocketTest.php b/src/socket/tests/SocketTest.php index fdb1f10c3..6fa801960 100644 --- a/src/socket/tests/SocketTest.php +++ b/src/socket/tests/SocketTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Socket; use Hyperf\Protocol\Packer\SerializePacker; diff --git a/src/socket/tests/Stub/BigDemoStub.php b/src/socket/tests/Stub/BigDemoStub.php index 4df823e9d..18afed6e5 100644 --- a/src/socket/tests/Stub/BigDemoStub.php +++ b/src/socket/tests/Stub/BigDemoStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Socket\Stub; class BigDemoStub diff --git a/src/socket/tests/Stub/DemoStub.php b/src/socket/tests/Stub/DemoStub.php index 196deb694..122aabc3f 100644 --- a/src/socket/tests/Stub/DemoStub.php +++ b/src/socket/tests/Stub/DemoStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Socket\Stub; class DemoStub diff --git a/src/super-globals/src/ConfigProvider.php b/src/super-globals/src/ConfigProvider.php index 705a53b1c..4064f4eea 100644 --- a/src/super-globals/src/ConfigProvider.php +++ b/src/super-globals/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals; use Hyperf\SuperGlobals\Listener\SuperGlobalsInitializeListener; diff --git a/src/super-globals/src/Exception/ContainerNotFoundException.php b/src/super-globals/src/Exception/ContainerNotFoundException.php index d6cfbe887..f65cbe017 100644 --- a/src/super-globals/src/Exception/ContainerNotFoundException.php +++ b/src/super-globals/src/Exception/ContainerNotFoundException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals\Exception; class ContainerNotFoundException extends \RuntimeException diff --git a/src/super-globals/src/Exception/InvalidOperationException.php b/src/super-globals/src/Exception/InvalidOperationException.php index 54a0ad711..80c4d76a1 100644 --- a/src/super-globals/src/Exception/InvalidOperationException.php +++ b/src/super-globals/src/Exception/InvalidOperationException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals\Exception; class InvalidOperationException extends \RuntimeException diff --git a/src/super-globals/src/Exception/RequestNotFoundException.php b/src/super-globals/src/Exception/RequestNotFoundException.php index 61bb69474..0a4261172 100644 --- a/src/super-globals/src/Exception/RequestNotFoundException.php +++ b/src/super-globals/src/Exception/RequestNotFoundException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals\Exception; class RequestNotFoundException extends \RuntimeException diff --git a/src/super-globals/src/Exception/SessionNotFoundException.php b/src/super-globals/src/Exception/SessionNotFoundException.php index e5bedfde8..ecbf252c2 100644 --- a/src/super-globals/src/Exception/SessionNotFoundException.php +++ b/src/super-globals/src/Exception/SessionNotFoundException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals\Exception; class SessionNotFoundException extends \RuntimeException diff --git a/src/super-globals/src/Listener/SuperGlobalsInitializeListener.php b/src/super-globals/src/Listener/SuperGlobalsInitializeListener.php index 72dfdcf96..2d899bda7 100644 --- a/src/super-globals/src/Listener/SuperGlobalsInitializeListener.php +++ b/src/super-globals/src/Listener/SuperGlobalsInitializeListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals\Listener; use Hyperf\Contract\ContainerInterface; diff --git a/src/super-globals/src/Proxy.php b/src/super-globals/src/Proxy.php index 07d778619..ff6f9a13d 100644 --- a/src/super-globals/src/Proxy.php +++ b/src/super-globals/src/Proxy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals; use ArrayAccess; diff --git a/src/super-globals/src/Proxy/Cookie.php b/src/super-globals/src/Proxy/Cookie.php index f3b8d5892..4edd484e7 100644 --- a/src/super-globals/src/Proxy/Cookie.php +++ b/src/super-globals/src/Proxy/Cookie.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals\Proxy; use Hyperf\SuperGlobals\Proxy; diff --git a/src/super-globals/src/Proxy/File.php b/src/super-globals/src/Proxy/File.php index 8de7a6093..7fdf0cc8c 100644 --- a/src/super-globals/src/Proxy/File.php +++ b/src/super-globals/src/Proxy/File.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals\Proxy; use Hyperf\SuperGlobals\Proxy; diff --git a/src/super-globals/src/Proxy/Get.php b/src/super-globals/src/Proxy/Get.php index 8d0424893..11c5b446a 100644 --- a/src/super-globals/src/Proxy/Get.php +++ b/src/super-globals/src/Proxy/Get.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals\Proxy; use Hyperf\SuperGlobals\Proxy; diff --git a/src/super-globals/src/Proxy/Post.php b/src/super-globals/src/Proxy/Post.php index 0f2b97070..30604c6b2 100644 --- a/src/super-globals/src/Proxy/Post.php +++ b/src/super-globals/src/Proxy/Post.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals\Proxy; use Hyperf\SuperGlobals\Proxy; diff --git a/src/super-globals/src/Proxy/Request.php b/src/super-globals/src/Proxy/Request.php index 7c286432e..de8ea21a3 100644 --- a/src/super-globals/src/Proxy/Request.php +++ b/src/super-globals/src/Proxy/Request.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals\Proxy; use Hyperf\HttpServer\Request as HyperfRequest; diff --git a/src/super-globals/src/Proxy/Server.php b/src/super-globals/src/Proxy/Server.php index 3db25b5e3..c8a360293 100644 --- a/src/super-globals/src/Proxy/Server.php +++ b/src/super-globals/src/Proxy/Server.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals\Proxy; use Hyperf\SuperGlobals\Exception\InvalidOperationException; diff --git a/src/super-globals/src/Proxy/Session.php b/src/super-globals/src/Proxy/Session.php index 7fd383655..f7e20a342 100644 --- a/src/super-globals/src/Proxy/Session.php +++ b/src/super-globals/src/Proxy/Session.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SuperGlobals\Proxy; use Hyperf\Contract\SessionInterface; diff --git a/src/super-globals/tests/ProxyTest.php b/src/super-globals/tests/ProxyTest.php index d913f8d7c..4049f70be 100644 --- a/src/super-globals/tests/ProxyTest.php +++ b/src/super-globals/tests/ProxyTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\SuperGlobals; use Hyperf\Contract\SessionInterface; diff --git a/src/super-globals/tests/Stub/ContainerStub.php b/src/super-globals/tests/Stub/ContainerStub.php index f2a9010e7..c4468dc08 100644 --- a/src/super-globals/tests/Stub/ContainerStub.php +++ b/src/super-globals/tests/Stub/ContainerStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\SuperGlobals\Stub; use Hyperf\Contract\ContainerInterface; diff --git a/src/swagger/src/Command/GenCommand.php b/src/swagger/src/Command/GenCommand.php index 886e172a1..ca83c7aff 100644 --- a/src/swagger/src/Command/GenCommand.php +++ b/src/swagger/src/Command/GenCommand.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Swagger\Command; use Hyperf\Command\Command; diff --git a/src/swagger/src/ConfigProvider.php b/src/swagger/src/ConfigProvider.php index 99fb78543..48c22c360 100644 --- a/src/swagger/src/ConfigProvider.php +++ b/src/swagger/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Swagger; use Hyperf\Swagger\Command\GenCommand; diff --git a/src/swoole-enterprise/src/ConfigProvider.php b/src/swoole-enterprise/src/ConfigProvider.php index b92c75fbb..fcd9ac546 100644 --- a/src/swoole-enterprise/src/ConfigProvider.php +++ b/src/swoole-enterprise/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SwooleEnterprise; class ConfigProvider diff --git a/src/swoole-enterprise/src/Middleware/HttpServerMiddleware.php b/src/swoole-enterprise/src/Middleware/HttpServerMiddleware.php index 7d7728e60..5c61b2476 100644 --- a/src/swoole-enterprise/src/Middleware/HttpServerMiddleware.php +++ b/src/swoole-enterprise/src/Middleware/HttpServerMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SwooleEnterprise\Middleware; use Hyperf\Contract\ConfigInterface; diff --git a/src/swoole-tracker/src/ConfigProvider.php b/src/swoole-tracker/src/ConfigProvider.php index 61b0b5805..21d6a2d0a 100644 --- a/src/swoole-tracker/src/ConfigProvider.php +++ b/src/swoole-tracker/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SwooleTracker; class ConfigProvider diff --git a/src/swoole-tracker/src/Middleware/HttpServerMiddleware.php b/src/swoole-tracker/src/Middleware/HttpServerMiddleware.php index 5e0d723f8..8b4ad5d51 100644 --- a/src/swoole-tracker/src/Middleware/HttpServerMiddleware.php +++ b/src/swoole-tracker/src/Middleware/HttpServerMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\SwooleTracker\Middleware; use Hyperf\Contract\ConfigInterface; @@ -36,8 +35,8 @@ class HttpServerMiddleware implements MiddlewareInterface if (class_exists(Stats::class)) { $path = $request->getUri()->getPath(); $ip = current(swoole_get_local_ip()); - $traceId = $request->getHeaderLine("x-swoole-traceid") ?: ""; - $spanId = $request->getHeaderLine("x-swoole-spanid") ?: ""; + $traceId = $request->getHeaderLine('x-swoole-traceid') ?: ''; + $spanId = $request->getHeaderLine('x-swoole-spanid') ?: ''; $tick = Stats::beforeExecRpc($path, $this->name, $ip, $traceId, $spanId); try { diff --git a/src/task/src/Annotation/Task.php b/src/task/src/Annotation/Task.php index d2c9a48fa..9711c0cd3 100644 --- a/src/task/src/Annotation/Task.php +++ b/src/task/src/Annotation/Task.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task\Annotation; use Hyperf\Di\Annotation\AbstractAnnotation; diff --git a/src/task/src/Aspect/TaskAspect.php b/src/task/src/Aspect/TaskAspect.php index 1b10ebd64..89a6a2751 100644 --- a/src/task/src/Aspect/TaskAspect.php +++ b/src/task/src/Aspect/TaskAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task\Aspect; use Hyperf\Di\Annotation\Aspect; diff --git a/src/task/src/ChannelFactory.php b/src/task/src/ChannelFactory.php index 9da5e9af0..a2f0e0327 100644 --- a/src/task/src/ChannelFactory.php +++ b/src/task/src/ChannelFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task; use Hyperf\Task\Exception\TaskExecuteTimeoutException; diff --git a/src/task/src/ConfigProvider.php b/src/task/src/ConfigProvider.php index 61d54974b..324d153dc 100644 --- a/src/task/src/ConfigProvider.php +++ b/src/task/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task; class ConfigProvider diff --git a/src/task/src/Exception.php b/src/task/src/Exception.php index eb6d8a8c0..7b010b072 100644 --- a/src/task/src/Exception.php +++ b/src/task/src/Exception.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task; use Hyperf\Utils\Serializer\ExceptionNormalizer; diff --git a/src/task/src/Exception/TaskException.php b/src/task/src/Exception/TaskException.php index 0f3361e34..e942cbba0 100644 --- a/src/task/src/Exception/TaskException.php +++ b/src/task/src/Exception/TaskException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task\Exception; class TaskException extends \RuntimeException diff --git a/src/task/src/Exception/TaskExecuteException.php b/src/task/src/Exception/TaskExecuteException.php index 4f852c81e..ce6bb57d5 100644 --- a/src/task/src/Exception/TaskExecuteException.php +++ b/src/task/src/Exception/TaskExecuteException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task\Exception; class TaskExecuteException extends TaskException diff --git a/src/task/src/Exception/TaskExecuteTimeoutException.php b/src/task/src/Exception/TaskExecuteTimeoutException.php index d08895188..a5d892af7 100644 --- a/src/task/src/Exception/TaskExecuteTimeoutException.php +++ b/src/task/src/Exception/TaskExecuteTimeoutException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task\Exception; class TaskExecuteTimeoutException extends TaskException diff --git a/src/task/src/Finish.php b/src/task/src/Finish.php index 1d09cd9f7..bbc8c9fb4 100644 --- a/src/task/src/Finish.php +++ b/src/task/src/Finish.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task; class Finish diff --git a/src/task/src/Listener/InitServerListener.php b/src/task/src/Listener/InitServerListener.php index a534a590c..2a960f937 100644 --- a/src/task/src/Listener/InitServerListener.php +++ b/src/task/src/Listener/InitServerListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/task/src/Listener/OnFinishListener.php b/src/task/src/Listener/OnFinishListener.php index 1c0f8b7db..ddba8dc01 100644 --- a/src/task/src/Listener/OnFinishListener.php +++ b/src/task/src/Listener/OnFinishListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/task/src/Listener/OnTaskListener.php b/src/task/src/Listener/OnTaskListener.php index 1bf373892..e0ee275c1 100644 --- a/src/task/src/Listener/OnTaskListener.php +++ b/src/task/src/Listener/OnTaskListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/task/src/Task.php b/src/task/src/Task.php index a752c4a36..6fdc49558 100644 --- a/src/task/src/Task.php +++ b/src/task/src/Task.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task; class Task diff --git a/src/task/src/TaskData.php b/src/task/src/TaskData.php index dda28ac48..88fd0b6b7 100644 --- a/src/task/src/TaskData.php +++ b/src/task/src/TaskData.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task; class TaskData diff --git a/src/task/src/TaskExecutor.php b/src/task/src/TaskExecutor.php index 295ba6c79..1bea537de 100644 --- a/src/task/src/TaskExecutor.php +++ b/src/task/src/TaskExecutor.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Task; use Hyperf\Task\Exception\TaskException; diff --git a/src/task/tests/ChannelFactoryTest.php b/src/task/tests/ChannelFactoryTest.php index 3cc56852b..4dbb3fad4 100644 --- a/src/task/tests/ChannelFactoryTest.php +++ b/src/task/tests/ChannelFactoryTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Task; use Hyperf\Task\ChannelFactory; diff --git a/src/task/tests/OnTaskListenerTest.php b/src/task/tests/OnTaskListenerTest.php index 591e5b2f3..e50ef7ba1 100644 --- a/src/task/tests/OnTaskListenerTest.php +++ b/src/task/tests/OnTaskListenerTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Task; use Hyperf\Framework\Event\OnTask; diff --git a/src/task/tests/Stub/Foo.php b/src/task/tests/Stub/Foo.php index 2611d87e2..0e281d1dc 100644 --- a/src/task/tests/Stub/Foo.php +++ b/src/task/tests/Stub/Foo.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Task\Stub; class Foo diff --git a/src/task/tests/Stub/SwooleServer.php b/src/task/tests/Stub/SwooleServer.php index db76cd582..01688bbb9 100644 --- a/src/task/tests/Stub/SwooleServer.php +++ b/src/task/tests/Stub/SwooleServer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Task\Stub; use Hyperf\Server\Server; diff --git a/src/task/tests/TaskAspectTest.php b/src/task/tests/TaskAspectTest.php index 4f8ba3025..d8648d142 100644 --- a/src/task/tests/TaskAspectTest.php +++ b/src/task/tests/TaskAspectTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Task; use Hyperf\Contract\ContainerInterface; diff --git a/src/testing/src/Client.php b/src/testing/src/Client.php index 6aecaf5fa..f19379a43 100644 --- a/src/testing/src/Client.php +++ b/src/testing/src/Client.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Testing; use Hyperf\Contract\PackerInterface; diff --git a/src/testing/src/HttpClient.php b/src/testing/src/HttpClient.php index 80088c69b..26f1aa863 100644 --- a/src/testing/src/HttpClient.php +++ b/src/testing/src/HttpClient.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Testing; use GuzzleHttp\Client; diff --git a/src/testing/tests/ClientTest.php b/src/testing/tests/ClientTest.php index 27583d403..093dda211 100644 --- a/src/testing/tests/ClientTest.php +++ b/src/testing/tests/ClientTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Testing; use Hyperf\Config\Config; diff --git a/src/testing/tests/Stub/Exception/Handler/FooExceptionHandler.php b/src/testing/tests/Stub/Exception/Handler/FooExceptionHandler.php index 226b597b0..0a871edab 100644 --- a/src/testing/tests/Stub/Exception/Handler/FooExceptionHandler.php +++ b/src/testing/tests/Stub/Exception/Handler/FooExceptionHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Testing\Stub\Exception\Handler; use Hyperf\ExceptionHandler\ExceptionHandler; diff --git a/src/testing/tests/Stub/FooController.php b/src/testing/tests/Stub/FooController.php index 0d5ac567f..3909ce7e8 100644 --- a/src/testing/tests/Stub/FooController.php +++ b/src/testing/tests/Stub/FooController.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Testing\Stub; class FooController diff --git a/src/tracer/publish/opentracing.php b/src/tracer/publish/opentracing.php index 1a4f72337..7c37ef194 100644 --- a/src/tracer/publish/opentracing.php +++ b/src/tracer/publish/opentracing.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - use Zipkin\Samplers\BinarySampler; return [ diff --git a/src/tracer/src/Adapter/HttpClientFactory.php b/src/tracer/src/Adapter/HttpClientFactory.php index 8d6a6d807..ea148dd86 100644 --- a/src/tracer/src/Adapter/HttpClientFactory.php +++ b/src/tracer/src/Adapter/HttpClientFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Adapter; use Hyperf\Guzzle\ClientFactory as GuzzleClientFactory; diff --git a/src/tracer/src/Adapter/JaegerTracerFactory.php b/src/tracer/src/Adapter/JaegerTracerFactory.php index 69451042f..472dd3ece 100644 --- a/src/tracer/src/Adapter/JaegerTracerFactory.php +++ b/src/tracer/src/Adapter/JaegerTracerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Adapter; use Hyperf\Contract\ConfigInterface; diff --git a/src/tracer/src/Adapter/ZipkinTracerFactory.php b/src/tracer/src/Adapter/ZipkinTracerFactory.php index 846d59e3e..b573dc979 100644 --- a/src/tracer/src/Adapter/ZipkinTracerFactory.php +++ b/src/tracer/src/Adapter/ZipkinTracerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Adapter; use Hyperf\Contract\ConfigInterface; diff --git a/src/tracer/src/Annotation/Trace.php b/src/tracer/src/Annotation/Trace.php index 3f4a9fd0d..f183e614f 100644 --- a/src/tracer/src/Annotation/Trace.php +++ b/src/tracer/src/Annotation/Trace.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Annotation; use Doctrine\Common\Annotations\Annotation\Target; diff --git a/src/tracer/src/Aspect/HttpClientAspect.php b/src/tracer/src/Aspect/HttpClientAspect.php index 07dfcbbdf..faea0fab2 100644 --- a/src/tracer/src/Aspect/HttpClientAspect.php +++ b/src/tracer/src/Aspect/HttpClientAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Aspect; use GuzzleHttp\Client; diff --git a/src/tracer/src/Aspect/MethodAspect.php b/src/tracer/src/Aspect/MethodAspect.php index 12f01ece9..b9ca81b37 100644 --- a/src/tracer/src/Aspect/MethodAspect.php +++ b/src/tracer/src/Aspect/MethodAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Aspect; use Hyperf\Di\Aop\AbstractAspect; diff --git a/src/tracer/src/Aspect/RedisAspect.php b/src/tracer/src/Aspect/RedisAspect.php index 32529be77..5193defbb 100644 --- a/src/tracer/src/Aspect/RedisAspect.php +++ b/src/tracer/src/Aspect/RedisAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Aspect; use Hyperf\Di\Annotation\Aspect; diff --git a/src/tracer/src/Aspect/TraceAnnotationAspect.php b/src/tracer/src/Aspect/TraceAnnotationAspect.php index 30aeaa06a..8a2598cdc 100644 --- a/src/tracer/src/Aspect/TraceAnnotationAspect.php +++ b/src/tracer/src/Aspect/TraceAnnotationAspect.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Aspect; use Hyperf\Di\Annotation\Aspect; diff --git a/src/tracer/src/ConfigProvider.php b/src/tracer/src/ConfigProvider.php index 738077a46..5f8e786a4 100644 --- a/src/tracer/src/ConfigProvider.php +++ b/src/tracer/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer; use GuzzleHttp\Client; diff --git a/src/tracer/src/Contract/NamedFactoryInterface.php b/src/tracer/src/Contract/NamedFactoryInterface.php index d0f06c990..0081110a0 100644 --- a/src/tracer/src/Contract/NamedFactoryInterface.php +++ b/src/tracer/src/Contract/NamedFactoryInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Contract; interface NamedFactoryInterface diff --git a/src/tracer/src/Exception/InvalidArgumentException.php b/src/tracer/src/Exception/InvalidArgumentException.php index 9039ac9a2..2ad87d710 100644 --- a/src/tracer/src/Exception/InvalidArgumentException.php +++ b/src/tracer/src/Exception/InvalidArgumentException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Exception; class InvalidArgumentException extends \InvalidArgumentException diff --git a/src/tracer/src/Listener/DbQueryExecutedListener.php b/src/tracer/src/Listener/DbQueryExecutedListener.php index f8dc6535f..2d783dd95 100644 --- a/src/tracer/src/Listener/DbQueryExecutedListener.php +++ b/src/tracer/src/Listener/DbQueryExecutedListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Listener; use Hyperf\Database\Events\QueryExecuted; diff --git a/src/tracer/src/Middleware/TraceMiddeware.php b/src/tracer/src/Middleware/TraceMiddeware.php index 22abaabdf..9fa515974 100644 --- a/src/tracer/src/Middleware/TraceMiddeware.php +++ b/src/tracer/src/Middleware/TraceMiddeware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Middleware; /** diff --git a/src/tracer/src/Middleware/TraceMiddleware.php b/src/tracer/src/Middleware/TraceMiddleware.php index f293d2f34..1675419bd 100644 --- a/src/tracer/src/Middleware/TraceMiddleware.php +++ b/src/tracer/src/Middleware/TraceMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer\Middleware; use Hyperf\Tracer\SpanStarter; diff --git a/src/tracer/src/SpanStarter.php b/src/tracer/src/SpanStarter.php index 956b997a8..b1fd7d390 100644 --- a/src/tracer/src/SpanStarter.php +++ b/src/tracer/src/SpanStarter.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer; use Hyperf\Utils\Context; diff --git a/src/tracer/src/SpanTagManager.php b/src/tracer/src/SpanTagManager.php index 193b88614..1eeccdda5 100644 --- a/src/tracer/src/SpanTagManager.php +++ b/src/tracer/src/SpanTagManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer; class SpanTagManager diff --git a/src/tracer/src/SpanTagManagerFactory.php b/src/tracer/src/SpanTagManagerFactory.php index 62018dd25..c77fbade5 100644 --- a/src/tracer/src/SpanTagManagerFactory.php +++ b/src/tracer/src/SpanTagManagerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer; use Hyperf\Contract\ConfigInterface; diff --git a/src/tracer/src/SwitchManager.php b/src/tracer/src/SwitchManager.php index 0ddbc3b43..bb93f87a4 100644 --- a/src/tracer/src/SwitchManager.php +++ b/src/tracer/src/SwitchManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer; use Hyperf\Utils\Context; diff --git a/src/tracer/src/SwitchManagerFactory.php b/src/tracer/src/SwitchManagerFactory.php index 88c9df6c2..bea1760f3 100644 --- a/src/tracer/src/SwitchManagerFactory.php +++ b/src/tracer/src/SwitchManagerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer; use Hyperf\Contract\ConfigInterface; diff --git a/src/tracer/src/TracerFactory.php b/src/tracer/src/TracerFactory.php index 7c2935bff..95a0f4321 100644 --- a/src/tracer/src/TracerFactory.php +++ b/src/tracer/src/TracerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Tracer; use Hyperf\Contract\ConfigInterface; diff --git a/src/tracer/tests/TracerFactoryTest.php b/src/tracer/tests/TracerFactoryTest.php index a6a64601c..a1f80d2c6 100644 --- a/src/tracer/tests/TracerFactoryTest.php +++ b/src/tracer/tests/TracerFactoryTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Tracer; use Hyperf\Config\Config; diff --git a/src/translation/publish/translation.php b/src/translation/publish/translation.php index 82c7eda85..488290339 100644 --- a/src/translation/publish/translation.php +++ b/src/translation/publish/translation.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ 'locale' => 'zh_CN', 'fallback_locale' => 'en', diff --git a/src/translation/src/ArrayLoader.php b/src/translation/src/ArrayLoader.php index d71cb72c8..bfb9625ad 100644 --- a/src/translation/src/ArrayLoader.php +++ b/src/translation/src/ArrayLoader.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Translation; use Hyperf\Contract\TranslatorLoaderInterface; diff --git a/src/translation/src/ConfigProvider.php b/src/translation/src/ConfigProvider.php index 409fe4398..ef45611fc 100644 --- a/src/translation/src/ConfigProvider.php +++ b/src/translation/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Translation; use Hyperf\Contract\TranslatorInterface; diff --git a/src/translation/src/FileLoader.php b/src/translation/src/FileLoader.php index 1bed6e896..6122ad91a 100755 --- a/src/translation/src/FileLoader.php +++ b/src/translation/src/FileLoader.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Translation; use Hyperf\Contract\TranslatorLoaderInterface; @@ -48,9 +47,6 @@ class FileLoader implements TranslatorLoaderInterface /** * Create a new file loader instance. - * - * @param Filesystem $files - * @param string $path */ public function __construct(Filesystem $files, string $path) { diff --git a/src/translation/src/FileLoaderFactory.php b/src/translation/src/FileLoaderFactory.php index 45f726519..a71c55316 100644 --- a/src/translation/src/FileLoaderFactory.php +++ b/src/translation/src/FileLoaderFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Translation; use Hyperf\Contract\ConfigInterface; diff --git a/src/translation/src/Functions.php b/src/translation/src/Functions.php index c10481006..6f1311c79 100644 --- a/src/translation/src/Functions.php +++ b/src/translation/src/Functions.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - use Hyperf\Contract\TranslatorInterface; use Hyperf\Utils\ApplicationContext; diff --git a/src/translation/src/MessageSelector.php b/src/translation/src/MessageSelector.php index 64e624251..919e78ca2 100755 --- a/src/translation/src/MessageSelector.php +++ b/src/translation/src/MessageSelector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Translation; use Hyperf\Utils\Str; @@ -19,9 +18,7 @@ class MessageSelector /** * Select a proper translation string based on the given number. * - * @param string $line * @param int $number - * @param string $locale * @return mixed */ public function choose(string $line, $number, string $locale) @@ -49,10 +46,6 @@ class MessageSelector * The plural rules are derived from code of the Zend Framework (2010-09-25), which * is subject to the new BSD license (http://framework.zend.com/license/new-bsd) * Copyright (c) 2005-2010 - Zend Technologies USA Inc. (http://www.zend.com) - * - * @param string $locale - * @param int $number - * @return int */ public function getPluralIndex(string $locale, int $number): int { @@ -360,7 +353,6 @@ class MessageSelector /** * Extract a translation string using inline conditions. * - * @param array $segments * @param int $number * @return mixed */ @@ -376,7 +368,6 @@ class MessageSelector /** * Get the translation string if the condition matches. * - * @param string $part * @param int $number * @return mixed */ @@ -411,9 +402,6 @@ class MessageSelector /** * Strip the inline conditions from each segment, just leaving the text. - * - * @param array $segments - * @return array */ private function stripConditions(array $segments): array { diff --git a/src/translation/src/Translator.php b/src/translation/src/Translator.php index c953b938c..ecf769089 100755 --- a/src/translation/src/Translator.php +++ b/src/translation/src/Translator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Translation; use Countable; @@ -368,9 +367,6 @@ class Translator implements TranslatorInterface /** * Set the parsed value of a key. - * - * @param string $key - * @param array $parsed */ public function setParsedKey(string $key, array $parsed) { @@ -489,9 +485,6 @@ class Translator implements TranslatorInterface /** * Parse an array of namespaced segments. - * - * @param string $key - * @return array */ protected function parseNamespacedSegments(string $key): array { diff --git a/src/translation/src/TranslatorFactory.php b/src/translation/src/TranslatorFactory.php index fb81c8656..31dbc1422 100644 --- a/src/translation/src/TranslatorFactory.php +++ b/src/translation/src/TranslatorFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Translation; use Hyperf\Contract\ConfigInterface; diff --git a/src/translation/tests/FileLoaderTest.php b/src/translation/tests/FileLoaderTest.php index 7203ba886..0c36f0ef3 100755 --- a/src/translation/tests/FileLoaderTest.php +++ b/src/translation/tests/FileLoaderTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Translation; use Hyperf\Translation\FileLoader; diff --git a/src/translation/tests/MessageSelectorTest.php b/src/translation/tests/MessageSelectorTest.php index 38890195d..388e634c1 100755 --- a/src/translation/tests/MessageSelectorTest.php +++ b/src/translation/tests/MessageSelectorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Translation; use Hyperf\Translation\MessageSelector; diff --git a/src/translation/tests/TranslatorTest.php b/src/translation/tests/TranslatorTest.php index 9ec70c08c..5bd454e6e 100755 --- a/src/translation/tests/TranslatorTest.php +++ b/src/translation/tests/TranslatorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Translation; use Hyperf\Contract\TranslatorLoaderInterface; diff --git a/src/utils/src/ApplicationContext.php b/src/utils/src/ApplicationContext.php index f67acf20c..6a7ef4ff4 100644 --- a/src/utils/src/ApplicationContext.php +++ b/src/utils/src/ApplicationContext.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Psr\Container\ContainerInterface; diff --git a/src/utils/src/Arr.php b/src/utils/src/Arr.php index 621c68b1b..8980babde 100644 --- a/src/utils/src/Arr.php +++ b/src/utils/src/Arr.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use ArrayAccess; diff --git a/src/utils/src/Backoff.php b/src/utils/src/Backoff.php index 0cac3652f..ad1aaac7d 100644 --- a/src/utils/src/Backoff.php +++ b/src/utils/src/Backoff.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; class Backoff diff --git a/src/utils/src/ChannelPool.php b/src/utils/src/ChannelPool.php index 25d11dcc2..05b71aaa9 100644 --- a/src/utils/src/ChannelPool.php +++ b/src/utils/src/ChannelPool.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Swoole\Coroutine\Channel; diff --git a/src/utils/src/ClearStatCache.php b/src/utils/src/ClearStatCache.php index ee99c951b..17de4dd90 100644 --- a/src/utils/src/ClearStatCache.php +++ b/src/utils/src/ClearStatCache.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; class ClearStatCache diff --git a/src/utils/src/CodeGen/Project.php b/src/utils/src/CodeGen/Project.php index 7ba35486a..edbd3195e 100644 --- a/src/utils/src/CodeGen/Project.php +++ b/src/utils/src/CodeGen/Project.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\CodeGen; use Hyperf\Utils\Composer; diff --git a/src/utils/src/Codec/Base62.php b/src/utils/src/Codec/Base62.php index 376ce29b7..9803ab3db 100644 --- a/src/utils/src/Codec/Base62.php +++ b/src/utils/src/Codec/Base62.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Codec; class Base62 diff --git a/src/utils/src/Codec/Json.php b/src/utils/src/Codec/Json.php index 25245da16..7e06aa03e 100644 --- a/src/utils/src/Codec/Json.php +++ b/src/utils/src/Codec/Json.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Codec; use Hyperf\Utils\Contracts\Arrayable; diff --git a/src/utils/src/Collection.php b/src/utils/src/Collection.php index c612904e7..4f059ec02 100644 --- a/src/utils/src/Collection.php +++ b/src/utils/src/Collection.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use ArrayAccess; diff --git a/src/utils/src/Composer.php b/src/utils/src/Composer.php index 585108db8..7f863af96 100644 --- a/src/utils/src/Composer.php +++ b/src/utils/src/Composer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Composer\Autoload\ClassLoader; diff --git a/src/utils/src/ConfigProvider.php b/src/utils/src/ConfigProvider.php index bd0cdf6fc..31f36cd65 100644 --- a/src/utils/src/ConfigProvider.php +++ b/src/utils/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Hyperf\Contract\NormalizerInterface; diff --git a/src/utils/src/Context.php b/src/utils/src/Context.php index 6cec5b605..6bcba9475 100644 --- a/src/utils/src/Context.php +++ b/src/utils/src/Context.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Swoole\Coroutine as SwCoroutine; diff --git a/src/utils/src/Contracts/Arrayable.php b/src/utils/src/Contracts/Arrayable.php index 04ef4b931..5404c3719 100644 --- a/src/utils/src/Contracts/Arrayable.php +++ b/src/utils/src/Contracts/Arrayable.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Contracts; interface Arrayable diff --git a/src/utils/src/Contracts/Jsonable.php b/src/utils/src/Contracts/Jsonable.php index fcd323c83..6da20f1c8 100644 --- a/src/utils/src/Contracts/Jsonable.php +++ b/src/utils/src/Contracts/Jsonable.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Contracts; interface Jsonable diff --git a/src/utils/src/Contracts/MessageBag.php b/src/utils/src/Contracts/MessageBag.php index a3c069d6c..c39aa88d1 100644 --- a/src/utils/src/Contracts/MessageBag.php +++ b/src/utils/src/Contracts/MessageBag.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Contracts; use Hyperf\Validation\Contracts\Support\MessageProvider; diff --git a/src/utils/src/Contracts/MessageProvider.php b/src/utils/src/Contracts/MessageProvider.php index fc6fd4ef6..154a59778 100644 --- a/src/utils/src/Contracts/MessageProvider.php +++ b/src/utils/src/Contracts/MessageProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Contracts; interface MessageProvider diff --git a/src/utils/src/Contracts/Xmlable.php b/src/utils/src/Contracts/Xmlable.php index 16adc9568..016be732c 100644 --- a/src/utils/src/Contracts/Xmlable.php +++ b/src/utils/src/Contracts/Xmlable.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Contracts; interface Xmlable diff --git a/src/utils/src/Coordinator/Constants.php b/src/utils/src/Coordinator/Constants.php index d971e7914..e717fcc20 100644 --- a/src/utils/src/Coordinator/Constants.php +++ b/src/utils/src/Coordinator/Constants.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Coordinator; class Constants diff --git a/src/utils/src/Coordinator/Coordinator.php b/src/utils/src/Coordinator/Coordinator.php index 18bfae45b..ac9ea7f27 100644 --- a/src/utils/src/Coordinator/Coordinator.php +++ b/src/utils/src/Coordinator/Coordinator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Coordinator; use Swoole\Coroutine\Channel; diff --git a/src/utils/src/Coordinator/CoordinatorManager.php b/src/utils/src/Coordinator/CoordinatorManager.php index 0ded206d0..d07314d2f 100644 --- a/src/utils/src/Coordinator/CoordinatorManager.php +++ b/src/utils/src/Coordinator/CoordinatorManager.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Coordinator; class CoordinatorManager @@ -44,7 +43,7 @@ class CoordinatorManager } /** - * Alias of static::until + * Alias of static::until. */ public static function get(string $identifier): Coordinator { diff --git a/src/utils/src/Coroutine.php b/src/utils/src/Coroutine.php index 7e04affe0..6e6063b3e 100644 --- a/src/utils/src/Coroutine.php +++ b/src/utils/src/Coroutine.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/utils/src/Coroutine/Concurrent.php b/src/utils/src/Coroutine/Concurrent.php index ce4ffe9ef..392f5a098 100644 --- a/src/utils/src/Coroutine/Concurrent.php +++ b/src/utils/src/Coroutine/Concurrent.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Coroutine; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/utils/src/Coroutine/Locker.php b/src/utils/src/Coroutine/Locker.php index ae1d4d220..95b554c28 100644 --- a/src/utils/src/Coroutine/Locker.php +++ b/src/utils/src/Coroutine/Locker.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Coroutine; use Hyperf\Utils\Coroutine; diff --git a/src/utils/src/Exception/ParallelExecutionException.php b/src/utils/src/Exception/ParallelExecutionException.php index 22f9a0681..1b745face 100644 --- a/src/utils/src/Exception/ParallelExecutionException.php +++ b/src/utils/src/Exception/ParallelExecutionException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Exception; class ParallelExecutionException extends \RuntimeException diff --git a/src/utils/src/Filesystem/FileNotFoundException.php b/src/utils/src/Filesystem/FileNotFoundException.php index 0c0ddd8a6..03e807ce5 100644 --- a/src/utils/src/Filesystem/FileNotFoundException.php +++ b/src/utils/src/Filesystem/FileNotFoundException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Filesystem; class FileNotFoundException extends \Exception diff --git a/src/utils/src/Fluent.php b/src/utils/src/Fluent.php index 28bbb2ad4..557fd9b5b 100755 --- a/src/utils/src/Fluent.php +++ b/src/utils/src/Fluent.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use ArrayAccess; diff --git a/src/utils/src/Functions.php b/src/utils/src/Functions.php index 80259e6fb..721225930 100644 --- a/src/utils/src/Functions.php +++ b/src/utils/src/Functions.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - use Hyperf\Utils\ApplicationContext; use Hyperf\Utils\Arr; use Hyperf\Utils\Backoff; diff --git a/src/utils/src/HigherOrderCollectionProxy.php b/src/utils/src/HigherOrderCollectionProxy.php index 237924016..7cd90b19e 100644 --- a/src/utils/src/HigherOrderCollectionProxy.php +++ b/src/utils/src/HigherOrderCollectionProxy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; /** diff --git a/src/utils/src/HigherOrderTapProxy.php b/src/utils/src/HigherOrderTapProxy.php index 9b1585dd1..bd3ef2877 100644 --- a/src/utils/src/HigherOrderTapProxy.php +++ b/src/utils/src/HigherOrderTapProxy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; class HigherOrderTapProxy diff --git a/src/utils/src/InteractsWithTime.php b/src/utils/src/InteractsWithTime.php index 7ee6e0d2f..4130f1e74 100644 --- a/src/utils/src/InteractsWithTime.php +++ b/src/utils/src/InteractsWithTime.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Carbon\Carbon; diff --git a/src/utils/src/MessageBag.php b/src/utils/src/MessageBag.php index 3bbb3d81f..9d360b4ff 100644 --- a/src/utils/src/MessageBag.php +++ b/src/utils/src/MessageBag.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Countable; diff --git a/src/utils/src/MimeTypeExtensionGuesser.php b/src/utils/src/MimeTypeExtensionGuesser.php index 3f0141e48..fc7aea837 100644 --- a/src/utils/src/MimeTypeExtensionGuesser.php +++ b/src/utils/src/MimeTypeExtensionGuesser.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; class MimeTypeExtensionGuesser diff --git a/src/utils/src/Packer/JsonPacker.php b/src/utils/src/Packer/JsonPacker.php index 7ccc432e5..9822ba11d 100644 --- a/src/utils/src/Packer/JsonPacker.php +++ b/src/utils/src/Packer/JsonPacker.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Packer; use Hyperf\Contract\PackerInterface; diff --git a/src/utils/src/Packer/PhpSerializerPacker.php b/src/utils/src/Packer/PhpSerializerPacker.php index 4faf2c79d..3e952b306 100644 --- a/src/utils/src/Packer/PhpSerializerPacker.php +++ b/src/utils/src/Packer/PhpSerializerPacker.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Packer; use Hyperf\Contract\PackerInterface; diff --git a/src/utils/src/Parallel.php b/src/utils/src/Parallel.php index 589e28557..2aa84271b 100644 --- a/src/utils/src/Parallel.php +++ b/src/utils/src/Parallel.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Hyperf\Utils\Exception\ParallelExecutionException; diff --git a/src/utils/src/Pipeline.php b/src/utils/src/Pipeline.php index ea14813c2..db97fab50 100644 --- a/src/utils/src/Pipeline.php +++ b/src/utils/src/Pipeline.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Closure; diff --git a/src/utils/src/Pluralizer.php b/src/utils/src/Pluralizer.php index 03e65ba3d..a3510c166 100644 --- a/src/utils/src/Pluralizer.php +++ b/src/utils/src/Pluralizer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Doctrine\Common\Inflector\Inflector; diff --git a/src/utils/src/Serializer/ExceptionNormalizer.php b/src/utils/src/Serializer/ExceptionNormalizer.php index f065ff66a..7a7265230 100644 --- a/src/utils/src/Serializer/ExceptionNormalizer.php +++ b/src/utils/src/Serializer/ExceptionNormalizer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Serializer; use Doctrine\Instantiator\Instantiator; diff --git a/src/utils/src/Serializer/ScalarNormalizer.php b/src/utils/src/Serializer/ScalarNormalizer.php index 51421d7a9..d64dcefe9 100644 --- a/src/utils/src/Serializer/ScalarNormalizer.php +++ b/src/utils/src/Serializer/ScalarNormalizer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Serializer; use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; diff --git a/src/utils/src/Serializer/SerializerFactory.php b/src/utils/src/Serializer/SerializerFactory.php index 93976fac6..102cab0ba 100644 --- a/src/utils/src/Serializer/SerializerFactory.php +++ b/src/utils/src/Serializer/SerializerFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Serializer; use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer; diff --git a/src/utils/src/Serializer/SimpleNormalizer.php b/src/utils/src/Serializer/SimpleNormalizer.php index 1240df311..835272990 100644 --- a/src/utils/src/Serializer/SimpleNormalizer.php +++ b/src/utils/src/Serializer/SimpleNormalizer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Serializer; use Hyperf\Contract\NormalizerInterface; diff --git a/src/utils/src/Serializer/SymfonyNormalizer.php b/src/utils/src/Serializer/SymfonyNormalizer.php index 63d3e2304..7939725a9 100644 --- a/src/utils/src/Serializer/SymfonyNormalizer.php +++ b/src/utils/src/Serializer/SymfonyNormalizer.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Serializer; use Hyperf\Contract\NormalizerInterface; diff --git a/src/utils/src/Str.php b/src/utils/src/Str.php index 219e668e8..fca7bcabc 100644 --- a/src/utils/src/Str.php +++ b/src/utils/src/Str.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Hyperf\Utils\Traits\Macroable; diff --git a/src/utils/src/Traits/Container.php b/src/utils/src/Traits/Container.php index 031710bd7..1f04d11b2 100644 --- a/src/utils/src/Traits/Container.php +++ b/src/utils/src/Traits/Container.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Traits; trait Container diff --git a/src/utils/src/Traits/CoroutineProxy.php b/src/utils/src/Traits/CoroutineProxy.php index 156c4960b..e6b012c30 100644 --- a/src/utils/src/Traits/CoroutineProxy.php +++ b/src/utils/src/Traits/CoroutineProxy.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Traits; use Hyperf\Utils\Context; diff --git a/src/utils/src/Traits/ForwardsCalls.php b/src/utils/src/Traits/ForwardsCalls.php index 311728baf..749b1c30d 100644 --- a/src/utils/src/Traits/ForwardsCalls.php +++ b/src/utils/src/Traits/ForwardsCalls.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Traits; use BadMethodCallException; diff --git a/src/utils/src/Traits/Macroable.php b/src/utils/src/Traits/Macroable.php index c14389c63..8c68441e5 100644 --- a/src/utils/src/Traits/Macroable.php +++ b/src/utils/src/Traits/Macroable.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Traits; use BadMethodCallException; diff --git a/src/utils/src/Traits/StaticInstance.php b/src/utils/src/Traits/StaticInstance.php index db6cef747..ace9479b6 100644 --- a/src/utils/src/Traits/StaticInstance.php +++ b/src/utils/src/Traits/StaticInstance.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils\Traits; use Hyperf\Utils\Context; diff --git a/src/utils/src/WaitGroup.php b/src/utils/src/WaitGroup.php index 4090c0e68..901ba86f8 100644 --- a/src/utils/src/WaitGroup.php +++ b/src/utils/src/WaitGroup.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Utils; use Swoole\Coroutine\WaitGroup as SwooleWaitGroup; diff --git a/src/utils/tests/FilesystemTest.php b/src/utils/tests/FilesystemTest.php index 497a47143..4713ed382 100644 --- a/src/utils/tests/FilesystemTest.php +++ b/src/utils/tests/FilesystemTest.php @@ -14,6 +14,7 @@ namespace HyperfTest\Utils; use Hyperf\Utils\Parallel; use PHPUnit\Framework\TestCase; use Swoole\Runtime; +use Swoole\Coroutine\Channel; /** * @internal @@ -41,4 +42,62 @@ class FilesystemTest extends TestCase $p->wait(); unlink('./test.txt'); } + + /** + * @group NonCoroutine + */ + public function testFopenInCoroutine() + { + run(function () { + $max = 2; + $chan = new Channel($max); + go(function () use ($chan) { + $handler = fopen(BASE_PATH . '/.travis/hyperf.sql', 'rb'); + $chan->push(1); + }); + $chan->push(2); + $result = []; + + for ($i = 0; $i < $max; ++$i) { + $result[] = $chan->pop(); + } + + $this->assertSame([2, 1], $result); + }); + } + + /** + * @group NonCoroutine + */ + public function testPutLockInCoroutine() + { + run(function () { + $max = 3; + $chan = new Channel($max); + $path = BASE_PATH . '/runtime/data.log'; + go(function () use ($chan, $path) { + $content = str_repeat('a', 70000); + file_put_contents($path, $content, LOCK_EX); + $chan->push(1); + }); + go(function () use ($chan, $path) { + $content = str_repeat('b', 70000); + file_put_contents($path, $content, LOCK_EX); + $chan->push(2); + }); + $chan->push(3); + $result = []; + + for ($i = 0; $i < $max; ++$i) { + $result[] = $chan->pop(); + } + + $this->assertSame(3, $result[0]); + $this->assertSame(70000, strlen(file_get_contents($path))); + $content = file_get_contents($path); + $this->assertTrue( + str_repeat('a', 70000) == $content || str_repeat('b', 70000) == $content + ); + }); + } } diff --git a/src/validation/publish/en/validation.php b/src/validation/publish/en/validation.php index 42e637ad2..3d246e778 100644 --- a/src/validation/publish/en/validation.php +++ b/src/validation/publish/en/validation.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ /* |-------------------------------------------------------------------------- diff --git a/src/validation/publish/zh_CN/validation.php b/src/validation/publish/zh_CN/validation.php index 5441e4f84..c4c95ec46 100644 --- a/src/validation/publish/zh_CN/validation.php +++ b/src/validation/publish/zh_CN/validation.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - return [ /* |-------------------------------------------------------------------------- diff --git a/src/validation/src/ClosureValidationRule.php b/src/validation/src/ClosureValidationRule.php index c910eade0..dbad29b72 100755 --- a/src/validation/src/ClosureValidationRule.php +++ b/src/validation/src/ClosureValidationRule.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use Hyperf\Validation\Contract\Rule; diff --git a/src/validation/src/Concerns/FormatsMessages.php b/src/validation/src/Concerns/FormatsMessages.php index 4e66d1bdc..dc03ddf8e 100755 --- a/src/validation/src/Concerns/FormatsMessages.php +++ b/src/validation/src/Concerns/FormatsMessages.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Concerns; use Closure; diff --git a/src/validation/src/Concerns/ReplacesAttributes.php b/src/validation/src/Concerns/ReplacesAttributes.php index 4c2dbda52..755891dd1 100755 --- a/src/validation/src/Concerns/ReplacesAttributes.php +++ b/src/validation/src/Concerns/ReplacesAttributes.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Concerns; use Hyperf\Utils\Arr; diff --git a/src/validation/src/Concerns/ValidatesAttributes.php b/src/validation/src/Concerns/ValidatesAttributes.php index dc6622c2a..839a1f5e0 100755 --- a/src/validation/src/Concerns/ValidatesAttributes.php +++ b/src/validation/src/Concerns/ValidatesAttributes.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Concerns; use Carbon\Carbon; diff --git a/src/validation/src/ConfigProvider.php b/src/validation/src/ConfigProvider.php index 37eff5019..c91ed55be 100644 --- a/src/validation/src/ConfigProvider.php +++ b/src/validation/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use Hyperf\Validation\Contract\PresenceVerifierInterface; diff --git a/src/validation/src/Contract/ImplicitRule.php b/src/validation/src/Contract/ImplicitRule.php index 90412eba0..cbfe9a314 100755 --- a/src/validation/src/Contract/ImplicitRule.php +++ b/src/validation/src/Contract/ImplicitRule.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Contract; interface ImplicitRule extends Rule diff --git a/src/validation/src/Contract/PresenceVerifierInterface.php b/src/validation/src/Contract/PresenceVerifierInterface.php index d792dcbe9..50f399607 100755 --- a/src/validation/src/Contract/PresenceVerifierInterface.php +++ b/src/validation/src/Contract/PresenceVerifierInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Contract; interface PresenceVerifierInterface diff --git a/src/validation/src/Contract/Rule.php b/src/validation/src/Contract/Rule.php index b65c66be6..c50b5d928 100755 --- a/src/validation/src/Contract/Rule.php +++ b/src/validation/src/Contract/Rule.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Contract; interface Rule diff --git a/src/validation/src/Contract/ValidatesWhenResolved.php b/src/validation/src/Contract/ValidatesWhenResolved.php index fa699df43..f42ab1885 100755 --- a/src/validation/src/Contract/ValidatesWhenResolved.php +++ b/src/validation/src/Contract/ValidatesWhenResolved.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Contract; /** diff --git a/src/validation/src/Contract/ValidatorFactoryInterface.php b/src/validation/src/Contract/ValidatorFactoryInterface.php index 39dd95d71..419d5578e 100755 --- a/src/validation/src/Contract/ValidatorFactoryInterface.php +++ b/src/validation/src/Contract/ValidatorFactoryInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Contract; use Hyperf\Contract\ValidatorInterface; diff --git a/src/validation/src/DatabasePresenceVerifier.php b/src/validation/src/DatabasePresenceVerifier.php index fac2e68fb..d15026e6f 100755 --- a/src/validation/src/DatabasePresenceVerifier.php +++ b/src/validation/src/DatabasePresenceVerifier.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use Closure; diff --git a/src/validation/src/DatabasePresenceVerifierFactory.php b/src/validation/src/DatabasePresenceVerifierFactory.php index b0009226c..9c7fe19ec 100755 --- a/src/validation/src/DatabasePresenceVerifierFactory.php +++ b/src/validation/src/DatabasePresenceVerifierFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use Hyperf\Database\ConnectionResolverInterface; diff --git a/src/validation/src/Event/ValidatorFactoryResolved.php b/src/validation/src/Event/ValidatorFactoryResolved.php index 2bdf8234d..9a0b70798 100644 --- a/src/validation/src/Event/ValidatorFactoryResolved.php +++ b/src/validation/src/Event/ValidatorFactoryResolved.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Event; use Hyperf\Validation\Contract\ValidatorFactoryInterface; diff --git a/src/validation/src/Middleware/ValidationMiddleware.php b/src/validation/src/Middleware/ValidationMiddleware.php index e75180938..b50fb8836 100644 --- a/src/validation/src/Middleware/ValidationMiddleware.php +++ b/src/validation/src/Middleware/ValidationMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Middleware; use Closure; diff --git a/src/validation/src/Request/FormRequest.php b/src/validation/src/Request/FormRequest.php index e80becde2..049f89c21 100755 --- a/src/validation/src/Request/FormRequest.php +++ b/src/validation/src/Request/FormRequest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Request; use Hyperf\Contract\ValidatorInterface; diff --git a/src/validation/src/Rule.php b/src/validation/src/Rule.php index 69478dbca..220cd4d5d 100755 --- a/src/validation/src/Rule.php +++ b/src/validation/src/Rule.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use Hyperf\Utils\Contracts\Arrayable; diff --git a/src/validation/src/Rules/DatabaseRule.php b/src/validation/src/Rules/DatabaseRule.php index 843e1a561..04fa6daaf 100755 --- a/src/validation/src/Rules/DatabaseRule.php +++ b/src/validation/src/Rules/DatabaseRule.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Rules; use Closure; diff --git a/src/validation/src/Rules/Dimensions.php b/src/validation/src/Rules/Dimensions.php index 45839b3fc..bcf246819 100755 --- a/src/validation/src/Rules/Dimensions.php +++ b/src/validation/src/Rules/Dimensions.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Rules; class Dimensions diff --git a/src/validation/src/Rules/Exists.php b/src/validation/src/Rules/Exists.php index ef1c8bd25..946e41e5b 100755 --- a/src/validation/src/Rules/Exists.php +++ b/src/validation/src/Rules/Exists.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Rules; class Exists diff --git a/src/validation/src/Rules/In.php b/src/validation/src/Rules/In.php index 86f5e4051..a5c14085c 100755 --- a/src/validation/src/Rules/In.php +++ b/src/validation/src/Rules/In.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Rules; class In diff --git a/src/validation/src/Rules/NotIn.php b/src/validation/src/Rules/NotIn.php index 6a9f20c2a..423316e7f 100755 --- a/src/validation/src/Rules/NotIn.php +++ b/src/validation/src/Rules/NotIn.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Rules; class NotIn diff --git a/src/validation/src/Rules/RequiredIf.php b/src/validation/src/Rules/RequiredIf.php index 114efc2fd..3b5a81fdd 100755 --- a/src/validation/src/Rules/RequiredIf.php +++ b/src/validation/src/Rules/RequiredIf.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Rules; class RequiredIf diff --git a/src/validation/src/Rules/Unique.php b/src/validation/src/Rules/Unique.php index 00abee40d..fd4b3a868 100755 --- a/src/validation/src/Rules/Unique.php +++ b/src/validation/src/Rules/Unique.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation\Rules; use Hyperf\Database\Model\Model; diff --git a/src/validation/src/UnauthorizedException.php b/src/validation/src/UnauthorizedException.php index 6179ec721..42701c056 100755 --- a/src/validation/src/UnauthorizedException.php +++ b/src/validation/src/UnauthorizedException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use RuntimeException; diff --git a/src/validation/src/ValidatesWhenResolvedTrait.php b/src/validation/src/ValidatesWhenResolvedTrait.php index 7cc9f21f7..56215a98a 100755 --- a/src/validation/src/ValidatesWhenResolvedTrait.php +++ b/src/validation/src/ValidatesWhenResolvedTrait.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use Hyperf\Contract\ValidatorInterface; diff --git a/src/validation/src/ValidationData.php b/src/validation/src/ValidationData.php index e35ccaf14..a8ba85717 100755 --- a/src/validation/src/ValidationData.php +++ b/src/validation/src/ValidationData.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use Hyperf\Utils\Arr; diff --git a/src/validation/src/ValidationException.php b/src/validation/src/ValidationException.php index 5189d6127..942807d48 100755 --- a/src/validation/src/ValidationException.php +++ b/src/validation/src/ValidationException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use Hyperf\Contract\ValidatorInterface; diff --git a/src/validation/src/ValidationExceptionHandler.php b/src/validation/src/ValidationExceptionHandler.php index b031c45ea..3dd6de0dd 100755 --- a/src/validation/src/ValidationExceptionHandler.php +++ b/src/validation/src/ValidationExceptionHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use Hyperf\ExceptionHandler\ExceptionHandler; diff --git a/src/validation/src/ValidationRuleParser.php b/src/validation/src/ValidationRuleParser.php index eedd22ab0..ad631d726 100755 --- a/src/validation/src/ValidationRuleParser.php +++ b/src/validation/src/ValidationRuleParser.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use Closure; diff --git a/src/validation/src/Validator.php b/src/validation/src/Validator.php index 2f46ff090..9ea42bfc5 100755 --- a/src/validation/src/Validator.php +++ b/src/validation/src/Validator.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use BadMethodCallException; diff --git a/src/validation/src/ValidatorFactory.php b/src/validation/src/ValidatorFactory.php index b969e3e18..1c4ce490c 100755 --- a/src/validation/src/ValidatorFactory.php +++ b/src/validation/src/ValidatorFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use Closure; diff --git a/src/validation/src/ValidatorFactoryFactory.php b/src/validation/src/ValidatorFactoryFactory.php index 07fa2aee5..5970e3cda 100755 --- a/src/validation/src/ValidatorFactoryFactory.php +++ b/src/validation/src/ValidatorFactoryFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\Validation; use Hyperf\Contract\TranslatorInterface; diff --git a/src/validation/tests/Cases/AbstractTestCase.php b/src/validation/tests/Cases/AbstractTestCase.php index a566a3eba..1bda2b2de 100644 --- a/src/validation/tests/Cases/AbstractTestCase.php +++ b/src/validation/tests/Cases/AbstractTestCase.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use PHPUnit\Framework\TestCase; diff --git a/src/validation/tests/Cases/FormRequestTest.php b/src/validation/tests/Cases/FormRequestTest.php index 029d00241..96dfa6dfd 100644 --- a/src/validation/tests/Cases/FormRequestTest.php +++ b/src/validation/tests/Cases/FormRequestTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Hyperf\HttpMessage\Upload\UploadedFile; diff --git a/src/validation/tests/Cases/Stub/DemoController.php b/src/validation/tests/Cases/Stub/DemoController.php index 625ae6995..433bb9273 100644 --- a/src/validation/tests/Cases/Stub/DemoController.php +++ b/src/validation/tests/Cases/Stub/DemoController.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases\Stub; class DemoController diff --git a/src/validation/tests/Cases/Stub/DemoRequest.php b/src/validation/tests/Cases/Stub/DemoRequest.php index 60cfa50da..15d5be3e7 100644 --- a/src/validation/tests/Cases/Stub/DemoRequest.php +++ b/src/validation/tests/Cases/Stub/DemoRequest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases\Stub; use Hyperf\Utils\Context; diff --git a/src/validation/tests/Cases/Stub/ValidatesAttributesStub.php b/src/validation/tests/Cases/Stub/ValidatesAttributesStub.php index 9453af3e0..6f0530664 100644 --- a/src/validation/tests/Cases/Stub/ValidatesAttributesStub.php +++ b/src/validation/tests/Cases/Stub/ValidatesAttributesStub.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases\Stub; use Hyperf\Validation\Concerns\ValidatesAttributes; diff --git a/src/validation/tests/Cases/ValidateAttributesTest.php b/src/validation/tests/Cases/ValidateAttributesTest.php index 29684de4b..591fa3a1e 100644 --- a/src/validation/tests/Cases/ValidateAttributesTest.php +++ b/src/validation/tests/Cases/ValidateAttributesTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use HyperfTest\Validation\Cases\Stub\ValidatesAttributesStub; diff --git a/src/validation/tests/Cases/ValidationAddFailureTest.php b/src/validation/tests/Cases/ValidationAddFailureTest.php index 9dd7321c4..ea1cebbb7 100644 --- a/src/validation/tests/Cases/ValidationAddFailureTest.php +++ b/src/validation/tests/Cases/ValidationAddFailureTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Hyperf\Validation\Validator; diff --git a/src/validation/tests/Cases/ValidationDatabasePresenceVerifierTest.php b/src/validation/tests/Cases/ValidationDatabasePresenceVerifierTest.php index 8750c0aa3..dd4cb1349 100644 --- a/src/validation/tests/Cases/ValidationDatabasePresenceVerifierTest.php +++ b/src/validation/tests/Cases/ValidationDatabasePresenceVerifierTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Closure; diff --git a/src/validation/tests/Cases/ValidationDimensionsRuleTest.php b/src/validation/tests/Cases/ValidationDimensionsRuleTest.php index 37054d7b5..d7e98c136 100644 --- a/src/validation/tests/Cases/ValidationDimensionsRuleTest.php +++ b/src/validation/tests/Cases/ValidationDimensionsRuleTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Hyperf\Validation\Rule; diff --git a/src/validation/tests/Cases/ValidationExceptionTest.php b/src/validation/tests/Cases/ValidationExceptionTest.php index 8993cb26b..604b95ac6 100644 --- a/src/validation/tests/Cases/ValidationExceptionTest.php +++ b/src/validation/tests/Cases/ValidationExceptionTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Hyperf\Contract\TranslatorInterface; diff --git a/src/validation/tests/Cases/ValidationExistsRuleTest.php b/src/validation/tests/Cases/ValidationExistsRuleTest.php index 275c86aeb..c1ed26a9e 100644 --- a/src/validation/tests/Cases/ValidationExistsRuleTest.php +++ b/src/validation/tests/Cases/ValidationExistsRuleTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Hyperf\Database\Connection; diff --git a/src/validation/tests/Cases/ValidationFactoryTest.php b/src/validation/tests/Cases/ValidationFactoryTest.php index dd4aba47d..476d58698 100755 --- a/src/validation/tests/Cases/ValidationFactoryTest.php +++ b/src/validation/tests/Cases/ValidationFactoryTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Hyperf\Contract\TranslatorInterface; diff --git a/src/validation/tests/Cases/ValidationInRuleTest.php b/src/validation/tests/Cases/ValidationInRuleTest.php index e12172be3..c1f8a839c 100644 --- a/src/validation/tests/Cases/ValidationInRuleTest.php +++ b/src/validation/tests/Cases/ValidationInRuleTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Hyperf\Validation\Rule; diff --git a/src/validation/tests/Cases/ValidationMiddlewareTest.php b/src/validation/tests/Cases/ValidationMiddlewareTest.php index 94dd4f8e3..2eec5abba 100644 --- a/src/validation/tests/Cases/ValidationMiddlewareTest.php +++ b/src/validation/tests/Cases/ValidationMiddlewareTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Hyperf\Contract\NormalizerInterface; diff --git a/src/validation/tests/Cases/ValidationNotInRuleTest.php b/src/validation/tests/Cases/ValidationNotInRuleTest.php index 27f2b1199..650393ee8 100644 --- a/src/validation/tests/Cases/ValidationNotInRuleTest.php +++ b/src/validation/tests/Cases/ValidationNotInRuleTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Hyperf\Validation\Rule; diff --git a/src/validation/tests/Cases/ValidationRequiredIfTest.php b/src/validation/tests/Cases/ValidationRequiredIfTest.php index fb21fdfbd..6d99b2561 100644 --- a/src/validation/tests/Cases/ValidationRequiredIfTest.php +++ b/src/validation/tests/Cases/ValidationRequiredIfTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Hyperf\Validation\Rules\RequiredIf; diff --git a/src/validation/tests/Cases/ValidationRuleTest.php b/src/validation/tests/Cases/ValidationRuleTest.php index c3fc84cc7..780a70543 100644 --- a/src/validation/tests/Cases/ValidationRuleTest.php +++ b/src/validation/tests/Cases/ValidationRuleTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Hyperf\Validation\Rule; diff --git a/src/validation/tests/Cases/ValidationUniqueRuleTest.php b/src/validation/tests/Cases/ValidationUniqueRuleTest.php index c3f96cd70..14b221d9a 100644 --- a/src/validation/tests/Cases/ValidationUniqueRuleTest.php +++ b/src/validation/tests/Cases/ValidationUniqueRuleTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Hyperf\Database\Model\Model; diff --git a/src/validation/tests/Cases/ValidationValidatorTest.php b/src/validation/tests/Cases/ValidationValidatorTest.php index a20946885..23de2d10c 100755 --- a/src/validation/tests/Cases/ValidationValidatorTest.php +++ b/src/validation/tests/Cases/ValidationValidatorTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases; use Carbon\Carbon; diff --git a/src/validation/tests/Cases/fixtures/Values.php b/src/validation/tests/Cases/fixtures/Values.php index c133d390a..10ea563b7 100644 --- a/src/validation/tests/Cases/fixtures/Values.php +++ b/src/validation/tests/Cases/fixtures/Values.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\Validation\Cases\fixtures; use Hyperf\Utils\Contracts\Arrayable; diff --git a/src/validation/tests/bootstrap.php b/src/validation/tests/bootstrap.php index 3d1876ee6..caf1cd333 100644 --- a/src/validation/tests/bootstrap.php +++ b/src/validation/tests/bootstrap.php @@ -9,5 +9,4 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - require_once dirname(dirname(__FILE__)) . '/vendor/autoload.php'; diff --git a/src/view/publish/view.php b/src/view/publish/view.php index ea8b5c576..915d5bce9 100644 --- a/src/view/publish/view.php +++ b/src/view/publish/view.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - use Hyperf\View\Engine\BladeEngine; use Hyperf\View\Mode; diff --git a/src/view/src/ConfigProvider.php b/src/view/src/ConfigProvider.php index 3d30bbcd8..a37488c6b 100644 --- a/src/view/src/ConfigProvider.php +++ b/src/view/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\View; class ConfigProvider diff --git a/src/view/src/Engine/BladeEngine.php b/src/view/src/Engine/BladeEngine.php index ce1db4ada..3f8edb224 100644 --- a/src/view/src/Engine/BladeEngine.php +++ b/src/view/src/Engine/BladeEngine.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\View\Engine; use duncan3dc\Laravel\BladeInstance; diff --git a/src/view/src/Engine/EngineInterface.php b/src/view/src/Engine/EngineInterface.php index 81839a9b6..e913f914d 100644 --- a/src/view/src/Engine/EngineInterface.php +++ b/src/view/src/Engine/EngineInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\View\Engine; interface EngineInterface diff --git a/src/view/src/Engine/PlatesEngine.php b/src/view/src/Engine/PlatesEngine.php index bcc8dfc2d..f7fb65824 100644 --- a/src/view/src/Engine/PlatesEngine.php +++ b/src/view/src/Engine/PlatesEngine.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\View\Engine; use League\Plates\Engine; diff --git a/src/view/src/Engine/SmartyEngine.php b/src/view/src/Engine/SmartyEngine.php index fa27582b2..1590e8c5b 100644 --- a/src/view/src/Engine/SmartyEngine.php +++ b/src/view/src/Engine/SmartyEngine.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\View\Engine; use Smarty; diff --git a/src/view/src/Engine/ThinkEngine.php b/src/view/src/Engine/ThinkEngine.php index 30ca19f4e..db40dcb2b 100644 --- a/src/view/src/Engine/ThinkEngine.php +++ b/src/view/src/Engine/ThinkEngine.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\View\Engine; use think\Template; diff --git a/src/view/src/Engine/TwigEngine.php b/src/view/src/Engine/TwigEngine.php index f535a8880..0d5f74c1e 100644 --- a/src/view/src/Engine/TwigEngine.php +++ b/src/view/src/Engine/TwigEngine.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\View\Engine; use Twig\Environment; diff --git a/src/view/src/Exception/EngineNotFindException.php b/src/view/src/Exception/EngineNotFindException.php index 9f84129a5..5eeb70429 100644 --- a/src/view/src/Exception/EngineNotFindException.php +++ b/src/view/src/Exception/EngineNotFindException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\View\Exception; class EngineNotFindException extends \RuntimeException diff --git a/src/view/src/Mode.php b/src/view/src/Mode.php index c9ecea921..729e13ceb 100644 --- a/src/view/src/Mode.php +++ b/src/view/src/Mode.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\View; class Mode diff --git a/src/view/src/Render.php b/src/view/src/Render.php index 78cb59881..87e1b8873 100644 --- a/src/view/src/Render.php +++ b/src/view/src/Render.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\View; use Hyperf\Contract\ConfigInterface; diff --git a/src/view/src/RenderInterface.php b/src/view/src/RenderInterface.php index 8fb047177..1dae69601 100644 --- a/src/view/src/RenderInterface.php +++ b/src/view/src/RenderInterface.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\View; use Psr\Http\Message\ResponseInterface; diff --git a/src/view/tests/PlatesTest.php b/src/view/tests/PlatesTest.php index b6a8dc5a9..4c0708251 100644 --- a/src/view/tests/PlatesTest.php +++ b/src/view/tests/PlatesTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\View; use Hyperf\View\Engine\PlatesEngine; diff --git a/src/view/tests/RenderTest.php b/src/view/tests/RenderTest.php index e3e179656..50c7d8b26 100644 --- a/src/view/tests/RenderTest.php +++ b/src/view/tests/RenderTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\View; use Hyperf\Config\Config; diff --git a/src/view/tests/SmartyTest.php b/src/view/tests/SmartyTest.php index 36e686a5f..2bacecdac 100644 --- a/src/view/tests/SmartyTest.php +++ b/src/view/tests/SmartyTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\View; use Hyperf\View\Engine\SmartyEngine; diff --git a/src/view/tests/ThinkTest.php b/src/view/tests/ThinkTest.php index b0a78aa1d..d2e94817f 100644 --- a/src/view/tests/ThinkTest.php +++ b/src/view/tests/ThinkTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\View; use Hyperf\View\Engine\ThinkEngine; diff --git a/src/view/tests/TwigTest.php b/src/view/tests/TwigTest.php index a7ec67295..d46ee2b1d 100644 --- a/src/view/tests/TwigTest.php +++ b/src/view/tests/TwigTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\View; use Hyperf\View\Engine\TwigEngine; diff --git a/src/websocket-client/src/Client.php b/src/websocket-client/src/Client.php index 01fe7140c..216e84320 100644 --- a/src/websocket-client/src/Client.php +++ b/src/websocket-client/src/Client.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketClient; use Hyperf\WebSocketClient\Exception\ConnectException; diff --git a/src/websocket-client/src/ClientFactory.php b/src/websocket-client/src/ClientFactory.php index 0fd634620..0653959db 100644 --- a/src/websocket-client/src/ClientFactory.php +++ b/src/websocket-client/src/ClientFactory.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketClient; use Hyperf\HttpMessage\Uri\Uri; diff --git a/src/websocket-client/src/ConfigProvider.php b/src/websocket-client/src/ConfigProvider.php index 48662c625..9eca70c05 100644 --- a/src/websocket-client/src/ConfigProvider.php +++ b/src/websocket-client/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketClient; class ConfigProvider diff --git a/src/websocket-client/src/Exception/ConnectException.php b/src/websocket-client/src/Exception/ConnectException.php index 12352ce7e..102c886d6 100644 --- a/src/websocket-client/src/Exception/ConnectException.php +++ b/src/websocket-client/src/Exception/ConnectException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketClient\Exception; class ConnectException extends \RuntimeException diff --git a/src/websocket-client/src/Frame.php b/src/websocket-client/src/Frame.php index 4642994c1..3ca1d825c 100644 --- a/src/websocket-client/src/Frame.php +++ b/src/websocket-client/src/Frame.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketClient; use Swoole\WebSocket\Frame as SwFrame; diff --git a/src/websocket-client/tests/ClientTest.php b/src/websocket-client/tests/ClientTest.php index b87d213f5..4ea17e21a 100644 --- a/src/websocket-client/tests/ClientTest.php +++ b/src/websocket-client/tests/ClientTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\WebSocketClient; use Hyperf\HttpMessage\Uri\Uri; diff --git a/src/websocket-client/tests/FrameTest.php b/src/websocket-client/tests/FrameTest.php index f9ae89c89..fc2dc7009 100644 --- a/src/websocket-client/tests/FrameTest.php +++ b/src/websocket-client/tests/FrameTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace HyperfTest\WebSocketClient; use Hyperf\WebSocketClient\Frame; diff --git a/src/websocket-server/src/Collector/Fd.php b/src/websocket-server/src/Collector/Fd.php index 6a57634f0..01594a53d 100644 --- a/src/websocket-server/src/Collector/Fd.php +++ b/src/websocket-server/src/Collector/Fd.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer\Collector; class Fd diff --git a/src/websocket-server/src/Collector/FdCollector.php b/src/websocket-server/src/Collector/FdCollector.php index d14bec01a..3ddf35ca3 100644 --- a/src/websocket-server/src/Collector/FdCollector.php +++ b/src/websocket-server/src/Collector/FdCollector.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer\Collector; class FdCollector diff --git a/src/websocket-server/src/ConfigProvider.php b/src/websocket-server/src/ConfigProvider.php index 60626f9aa..3f12be997 100644 --- a/src/websocket-server/src/ConfigProvider.php +++ b/src/websocket-server/src/ConfigProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer; class ConfigProvider diff --git a/src/websocket-server/src/CoreMiddleware.php b/src/websocket-server/src/CoreMiddleware.php index 18c3bccb0..2a5b8be22 100644 --- a/src/websocket-server/src/CoreMiddleware.php +++ b/src/websocket-server/src/CoreMiddleware.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer; use Hyperf\HttpServer\CoreMiddleware as HttpCoreMiddleware; diff --git a/src/websocket-server/src/Event/OnOpenEvent.php b/src/websocket-server/src/Event/OnOpenEvent.php index 4d86eb40f..1ba1ff2e0 100644 --- a/src/websocket-server/src/Event/OnOpenEvent.php +++ b/src/websocket-server/src/Event/OnOpenEvent.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer\Event; use Swoole\Http\Request; diff --git a/src/websocket-server/src/Exception/Handler/WebSocketExceptionHandler.php b/src/websocket-server/src/Exception/Handler/WebSocketExceptionHandler.php index def31698e..d2ceeace3 100644 --- a/src/websocket-server/src/Exception/Handler/WebSocketExceptionHandler.php +++ b/src/websocket-server/src/Exception/Handler/WebSocketExceptionHandler.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer\Exception\Handler; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/websocket-server/src/Exception/InvalidMethodException.php b/src/websocket-server/src/Exception/InvalidMethodException.php index 4fc341e36..dd562b310 100644 --- a/src/websocket-server/src/Exception/InvalidMethodException.php +++ b/src/websocket-server/src/Exception/InvalidMethodException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer\Exception; use Hyperf\Server\Exception\ServerException; diff --git a/src/websocket-server/src/Exception/WebSocketHandeShakeException.php b/src/websocket-server/src/Exception/WebSocketHandeShakeException.php index 7c9031652..c63865e4a 100644 --- a/src/websocket-server/src/Exception/WebSocketHandeShakeException.php +++ b/src/websocket-server/src/Exception/WebSocketHandeShakeException.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer\Exception; use Hyperf\Server\Exception\ServerException; diff --git a/src/websocket-server/src/Listener/InitSenderListener.php b/src/websocket-server/src/Listener/InitSenderListener.php index b7c663e9e..980b87a97 100644 --- a/src/websocket-server/src/Listener/InitSenderListener.php +++ b/src/websocket-server/src/Listener/InitSenderListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/websocket-server/src/Listener/OnPipeMessageListener.php b/src/websocket-server/src/Listener/OnPipeMessageListener.php index c9d2fdba4..7cbb53d4a 100644 --- a/src/websocket-server/src/Listener/OnPipeMessageListener.php +++ b/src/websocket-server/src/Listener/OnPipeMessageListener.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer\Listener; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/websocket-server/src/Security.php b/src/websocket-server/src/Security.php index cd7fab3f5..529a95225 100644 --- a/src/websocket-server/src/Security.php +++ b/src/websocket-server/src/Security.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer; class Security diff --git a/src/websocket-server/src/Sender.php b/src/websocket-server/src/Sender.php index e3b3c9a76..0028453ac 100644 --- a/src/websocket-server/src/Sender.php +++ b/src/websocket-server/src/Sender.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer; use Hyperf\Contract\StdoutLoggerInterface; diff --git a/src/websocket-server/src/SenderPipeMessage.php b/src/websocket-server/src/SenderPipeMessage.php index 30c7f179f..53ebdc0ea 100644 --- a/src/websocket-server/src/SenderPipeMessage.php +++ b/src/websocket-server/src/SenderPipeMessage.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer; class SenderPipeMessage diff --git a/src/websocket-server/src/Server.php b/src/websocket-server/src/Server.php index 414b95f06..4a08a0a2a 100644 --- a/src/websocket-server/src/Server.php +++ b/src/websocket-server/src/Server.php @@ -9,7 +9,6 @@ declare(strict_types=1); * @contact group@hyperf.io * @license https://github.com/hyperf/hyperf/blob/master/LICENSE */ - namespace Hyperf\WebSocketServer; use Hyperf\Contract\ConfigInterface;