Use Hyperf\Coroutine\Channel\Pool instead of `Hyperf\Utils\ChannelP…

…ool` (#5671)

.phpstorm.meta.php

@@ -11,10 +11,16 @@
  */
 namespace PHPSTORM_META;
 
+use function di;
+use function make;
+use function optional;
+use function tap;
+
 // Reflect
 override(\Psr\Container\ContainerInterface::get(0), map(['' => '@']));
 override(\Hyperf\Context\Context::get(0), map(['' => '@']));
-override(\make(0), map(['' => '@']));
-override(\di(0), map(['' => '@']));
-override(\optional(0), type(0));
-override(\tap(0), type(0));
+override(make(0), map(['' => '@']));
+override(di(0), map(['' => '@']));
+override(optional(0), type(0));
+override(tap(0), type(0));
+override(\Hyperf\Tappable\tap(0), type(0));

CHANGELOG-3.0.md

@@ -11,6 +11,7 @@
 - [#5666](https://github.com/hyperf/hyperf/pull/5666) Split `Packers` to `hyperf/codec`.
 - [#5668](https://github.com/hyperf/hyperf/pull/5668) Split `hyperf/support` from `hyperf/utils`.
 - [#5670](https://github.com/hyperf/hyperf/pull/5670) Split `hyperf/code-parser` from `hyperf/utils`.
+- [#5671](https://github.com/hyperf/hyperf/pull/5671) Use `Hyperf\Coroutine\Channel\Pool` instead of `Hyperf\Utils\ChannelPool`.
 
 # v3.0.17 - 2023-04-19
 

src/amqp/composer.json

@@ -19,6 +19,7 @@
         "doctrine/instantiator": "^1.2.0",
         "hyperf/codec": "~3.0.0",
         "hyperf/contract": "~3.0.0",
+        "hyperf/coroutine": "~3.0.0",
         "hyperf/utils": "~3.0.0",
         "hyperf/process": "~3.0.0",
         "hyperf/pool": "~3.0.0",

src/amqp/src/AMQPConnection.php

@@ -16,10 +16,10 @@
 use Hyperf\Amqp\Exception\SendChannelTimeoutException;
 use Hyperf\Coordinator\Constants;
 use Hyperf\Coordinator\CoordinatorManager;
+use Hyperf\Coroutine\Channel\Manager as ChannelManager;
 use Hyperf\Coroutine\Coroutine;
+use Hyperf\Coroutine\Exception\ChannelClosedException;
 use Hyperf\Engine\Channel;
-use Hyperf\Utils\Channel\ChannelManager;
-use Hyperf\Utils\Exception\ChannelClosedException;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Channel\Frame;
 use PhpAmqpLib\Connection\AbstractConnection;

src/amqp/tests/ConsumerTest.php

@@ -14,7 +14,7 @@
 use Hyperf\Amqp\ConnectionFactory;
 use Hyperf\Amqp\Consumer;
 use Hyperf\Coroutine\Concurrent;
-use Hyperf\Utils\Exception\ChannelClosedException;
+use Hyperf\Coroutine\Exception\ChannelClosedException;
 use Hyperf\Utils\Reflection\ClassInvoker;
 use HyperfTest\Amqp\Stub\AMQPConnectionStub;
 use HyperfTest\Amqp\Stub\ContainerStub;

src/amqp/tests/Stub/AMQPConnectionStub.php

@@ -12,7 +12,7 @@
 namespace HyperfTest\Amqp\Stub;
 
 use Hyperf\Amqp\AMQPConnection;
-use Hyperf\Utils\Channel\ChannelManager;
+use Hyperf\Coroutine\Channel\Manager as ChannelManager;
 
 class AMQPConnectionStub extends AMQPConnection
 {

src/async-queue/composer.json

@@ -19,6 +19,7 @@
         "psr/container": "^1.0|^2.0",
         "psr/event-dispatcher": "^1.0",
         "hyperf/codec": "~3.0.0",
+        "hyperf/collection": "~3.0.0",
         "hyperf/contract": "~3.0.0",
         "hyperf/command": "~3.0.0",
         "hyperf/utils": "~3.0.0"

src/async-queue/src/Driver/Driver.php

@@ -27,6 +27,8 @@
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Throwable;
 
+use function Hyperf\Coroutine\parallel;
+
 abstract class Driver implements DriverInterface
 {
     protected PackerInterface $packer;

src/cache/composer.json

@@ -19,6 +19,7 @@
         "psr/container": "^1.0|^2.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",
         "hyperf/codec": "~3.0.0",
+        "hyperf/collection": "~3.0.0",
         "hyperf/contract": "~3.0.0",
         "hyperf/utils": "~3.0.0"
     },

src/cache/src/Helper/StringHelper.php

@@ -13,6 +13,8 @@
 
 use Hyperf\Stringable\Str;
 
+use function Hyperf\Collection\data_get;
+
 class StringHelper
 {
     /**

src/collection/tests/FunctionsTest.php

@@ -20,6 +20,8 @@
 use function Hyperf\Collection\data_fill;
 use function Hyperf\Collection\data_get;
 use function Hyperf\Collection\data_set;
+use function Hyperf\Collection\head;
+use function Hyperf\Collection\last;
 use function Hyperf\Collection\value;
 
 /**

src/command/composer.json

@@ -20,6 +20,7 @@
     },
     "require": {
         "php": ">=8.0",
+        "hyperf/tappable": "~3.0.0",
         "hyperf/utils": "~3.0.0",
         "psr/event-dispatcher": "^1.0",
         "symfony/console": "^5.0|^6.0"

src/command/src/Command.php

@@ -30,6 +30,7 @@
 
 use function Hyperf\Collection\collect;
 use function Hyperf\Coroutine\run;
+use function Hyperf\Tappable\tap;
 
 abstract class Command extends SymfonyCommand
 {

src/config/composer.json

@@ -18,6 +18,7 @@
     },
     "require": {
         "php": ">=8.0",
+        "hyperf/collection": "~3.0.0",
         "hyperf/contract": "~3.0.0",
         "hyperf/support": "~3.0.0",
         "hyperf/utils": "~3.0.0",

src/config/src/Config.php

@@ -14,6 +14,9 @@
 use Hyperf\Collection\Arr;
 use Hyperf\Contract\ConfigInterface;
 
+use function Hyperf\Collection\data_get;
+use function Hyperf\Collection\data_set;
+
 class Config implements ConfigInterface
 {
     public function __construct(private array $configs)

src/crontab/tests/CrontabManagerTest.php

@@ -16,6 +16,8 @@
 use Hyperf\Crontab\Parser;
 use PHPUnit\Framework\TestCase;
 
+use function Hyperf\Tappable\tap;
+
 /**
  * @internal
  * @coversNothing

src/database-pgsql/composer.json

@@ -19,6 +19,8 @@
     },
     "require": {
         "php": ">=8.0",
+        "hyperf/collection": "~3.0.0",
+        "hyperf/tappable": "~3.0.0",
         "ext-swoole": ">=5.0",
         "hyperf/database": "~3.0.0"
     },

src/database-pgsql/src/Concerns/PostgreSqlSwooleExtManagesTransactions.php

@@ -15,6 +15,8 @@
 use Exception;
 use Throwable;
 
+use function Hyperf\Tappable\tap;
+
 trait PostgreSqlSwooleExtManagesTransactions
 {
     /**

src/database-pgsql/src/Query/Grammars/PostgresGrammar.php

@@ -17,6 +17,7 @@
 use Hyperf\Stringable\Str;
 
 use function Hyperf\Collection\collect;
+use function Hyperf\Collection\last;
 
 class PostgresGrammar extends Grammar
 {

src/database-pgsql/src/Schema/PostgresBuilder.php

@@ -14,6 +14,8 @@
 use Hyperf\Database\PgSQL\Query\Processors\PostgresProcessor;
 use Hyperf\Database\Schema\Builder;
 
+use function Hyperf\Collection\head;
+
 class PostgresBuilder extends Builder
 {
     /**

src/database/composer.json

@@ -16,8 +16,10 @@
     },
     "require": {
         "php": ">=8.0",
+        "hyperf/collection": "~3.0.0",
         "hyperf/code-parser": "~3.0.0",
         "hyperf/macroable": "~3.0.0",
+        "hyperf/tappable": "~3.0.0",
         "hyperf/utils": "~3.0.0",
         "nesbot/carbon": "^2.0",
         "psr/container": "^1.0|^2.0",

src/database/src/Concerns/ManagesTransactions.php

@@ -15,6 +15,8 @@
 use Exception;
 use Throwable;
 
+use function Hyperf\Tappable\tap;
+
 trait ManagesTransactions
 {
     /**

src/database/src/Model/Builder.php

@@ -28,6 +28,7 @@
 use ReflectionMethod;
 
 use function Hyperf\Collection\collect;
+use function Hyperf\Tappable\tap;
 
 /**
  * @mixin \Hyperf\Database\Query\Builder

src/database/src/Model/Concerns/HasAttributes.php

@@ -27,6 +27,7 @@
 use LogicException;
 
 use function Hyperf\Collection\collect;
+use function Hyperf\Tappable\tap;
 
 trait HasAttributes
 {

src/database/src/Model/Concerns/HasRelationships.php

@@ -28,6 +28,8 @@
 use Hyperf\Database\Model\Relations\Relation;
 use Hyperf\Stringable\Str;
 
+use function Hyperf\Tappable\tap;
+
 trait HasRelationships
 {
     /**

src/database/src/Model/FactoryBuilder.php

@@ -17,6 +17,7 @@
 use InvalidArgumentException;
 
 use function Hyperf\Collection\collect;
+use function Hyperf\Tappable\tap;
 
 class FactoryBuilder
 {

src/database/src/Model/Model.php

@@ -29,6 +29,8 @@
 use Throwable;
 
 use function Hyperf\Collection\collect;
+use function Hyperf\Collection\last;
+use function Hyperf\Tappable\tap;
 
 /**
  * @mixin ModelIDE

src/database/src/Model/Relations/BelongsToMany.php

@@ -20,6 +20,7 @@
 use InvalidArgumentException;
 
 use function Hyperf\Collection\collect;
+use function Hyperf\Tappable\tap;
 
 class BelongsToMany extends Relation
 {

src/database/src/Model/Relations/HasOneOrMany.php

@@ -16,6 +16,8 @@
 use Hyperf\Database\Model\Model;
 use Traversable;
 
+use function Hyperf\Tappable\tap;
+
 abstract class HasOneOrMany extends Relation
 {
     /**

src/database/src/Model/Relations/MorphOneOrMany.php

@@ -14,6 +14,8 @@
 use Hyperf\Database\Model\Builder;
 use Hyperf\Database\Model\Model;
 
+use function Hyperf\Collection\last;
+
 abstract class MorphOneOrMany extends HasOneOrMany
 {
     /**

src/database/src/Model/Relations/MorphTo.php

@@ -17,6 +17,7 @@
 use Hyperf\Database\Model\Model;
 
 use function Hyperf\Collection\collect;
+use function Hyperf\Collection\head;
 
 class MorphTo extends BelongsTo
 {

src/database/src/Model/Relations/Relation.php

@@ -21,6 +21,7 @@
 use Hyperf\Utils\Traits\ForwardsCalls;
 
 use function Hyperf\Collection\collect;
+use function Hyperf\Collection\last;
 
 /**
  * @mixin \Hyperf\Database\Model\Builder

src/database/src/Model/SoftDeletes.php

@@ -13,6 +13,8 @@
 
 use Psr\EventDispatcher\StoppableEventInterface;
 
+use function Hyperf\Tappable\tap;
+
 /**
  * @method static static|\Hyperf\Database\Model\Builder|\Hyperf\Database\Query\Builder restoreOrCreate(array $attributes = [], array $values = [])
  * @method static static|\Hyperf\Database\Model\Builder|\Hyperf\Database\Query\Builder withTrashed(bool $withTrashed = true)

src/database/src/Model/SoftDeletingScope.php

@@ -11,6 +11,8 @@
  */
 namespace Hyperf\Database\Model;
 
+use function Hyperf\Tappable\tap;
+
 class SoftDeletingScope implements Scope
 {
     /**

src/database/src/Query/Builder.php

@@ -35,6 +35,8 @@
 use RuntimeException;
 
 use function Hyperf\Collection\collect;
+use function Hyperf\Collection\last;
+use function Hyperf\Tappable\tap;
 
 class Builder
 {

src/database/src/Query/Grammars/Grammar.php

@@ -20,6 +20,8 @@
 use RuntimeException;
 
 use function Hyperf\Collection\collect;
+use function Hyperf\Collection\head;
+use function Hyperf\Collection\last;
 
 class Grammar extends BaseGrammar
 {

src/database/src/Schema/Builder.php

@@ -17,6 +17,8 @@
 use Hyperf\Database\Schema\Grammars\Grammar as SchemaGrammar;
 use LogicException;
 
+use function Hyperf\Tappable\tap;
+
 class Builder
 {
     /**

src/database/src/Schema/Grammars/Grammar.php

@@ -20,6 +20,8 @@
 use Hyperf\Utils\Fluent;
 use RuntimeException;
 
+use function Hyperf\Tappable\tap;
+
 abstract class Grammar extends BaseGrammar
 {
     /**

src/exception-handler/tests/ExceptionHandlerTest.php

@@ -22,6 +22,8 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 
+use function Hyperf\Coroutine\parallel;
+
 /**
  * @internal
  * @coversNothing

src/grpc-client/composer.json

@@ -19,8 +19,8 @@
     "require": {
         "php": ">=8.0",
         "hyperf/code-parser": "~3.0.0",
+        "hyperf/coroutine": "~3.0.0",
         "hyperf/grpc": "~3.0.0",
-        "hyperf/utils": "~3.0.0",
         "jean85/pretty-package-versions": "^1.2|^2.0"
     },
     "autoload": {

src/grpc-client/src/BaseClient.php

@@ -13,10 +13,10 @@
 
 use Google\Protobuf\Internal\Message;
 use Hyperf\Context\ApplicationContext;
+use Hyperf\Coroutine\Channel\Pool as ChannelPool;
 use Hyperf\Grpc\Parser;
 use Hyperf\Grpc\StatusCode;
 use Hyperf\GrpcClient\Exception\GrpcClientException;
-use Hyperf\Utils\ChannelPool;
 use InvalidArgumentException;
 use Swoole\Http2\Response;
 

src/grpc-client/src/GrpcClient.php

@@ -11,11 +11,11 @@
  */
 namespace Hyperf\GrpcClient;
 
+use Hyperf\Coroutine\Channel\Pool as ChannelPool;
 use Hyperf\Coroutine\Coroutine;
 use Hyperf\Engine\Channel;
 use Hyperf\Grpc\StatusCode;
 use Hyperf\GrpcClient\Exception\GrpcClientException;
-use Hyperf\Utils\ChannelPool;
 use InvalidArgumentException;
 use RuntimeException;
 use Swoole\Coroutine\Http2\Client as SwooleHttp2Client;