Skip to content

Commit 09721a1

Browse files
Instead of classes and functions of Hyperf\Utils (#5674)
Co-authored-by: 李铭昕 <715557344@qq.com>
1 parent d6ef1b6 commit 09721a1

File tree

8 files changed

+13
-5
lines changed

8 files changed

+13
-5
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"hyperf/rpc-client": "~3.0.0",
1818
"hyperf/rpc-server": "~3.0.0",
1919
"hyperf/server": "~3.0.0",
20+
"hyperf/support": "~3.0.0",
2021
"hyperf/utils": "~3.0.0",
2122
"multiplex/socket": "^1.0"
2223
},

src/SocketFactory.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
use Hyperf\RpcMultiplex\Exception\NoAvailableNodesException;
1919
use Psr\Container\ContainerInterface;
2020

21+
use function Hyperf\Support\make;
22+
2123
class SocketFactory
2224
{
2325
protected ?LoadBalancerInterface $loadBalancer = null;

src/TcpServer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
use Swoole\Coroutine\Server\Connection;
3838
use Swoole\Server as SwooleServer;
3939

40+
use function Hyperf\Support\make;
41+
4042
class TcpServer extends Server
4143
{
4244
protected ProtocolManager $protocolManager;

src/Transporter.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
use Hyperf\LoadBalancer\LoadBalancerInterface;
1515
use Hyperf\Rpc\Contract\TransporterInterface;
1616
use Hyperf\RpcMultiplex\Exception\NotSupportException;
17-
use Hyperf\Utils\Exception\ExceptionThrower;
17+
use Hyperf\Support\Exception\ExceptionThrower;
1818
use Multiplex\Exception\ChannelClosedException;
1919
use Multiplex\Exception\ClientConnectFailedException;
2020
use Psr\Container\ContainerInterface;
2121
use Throwable;
2222

23+
use function Hyperf\Support\make;
24+
use function Hyperf\Support\retry;
25+
2326
class Transporter implements TransporterInterface
2427
{
2528
protected SocketFactory $factory;

tests/Cases/HttpMessageBuilderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Hyperf\RpcMultiplex\HttpMessageBuilder;
1515
use Hyperf\RpcMultiplex\Packer\JsonPacker;
16-
use Hyperf\Utils\Reflection\ClassInvoker;
16+
use Hyperf\Support\Reflection\ClassInvoker;
1717
use Psr\Http\Message\UriInterface;
1818

1919
/**

tests/Cases/SocketFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Hyperf\LoadBalancer\Random;
1919
use Hyperf\RpcMultiplex\Socket;
2020
use Hyperf\RpcMultiplex\SocketFactory;
21-
use Hyperf\Utils\Reflection\ClassInvoker;
21+
use Hyperf\Support\Reflection\ClassInvoker;
2222
use HyperfTest\RpcMultiplex\Stub\ContainerStub;
2323
use Mockery;
2424

tests/Cases/TcpServerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use Hyperf\Server\Event;
2222
use Hyperf\Server\Exception\InvalidArgumentException;
2323
use Hyperf\Server\Server;
24-
use Hyperf\Utils\Reflection\ClassInvoker;
24+
use Hyperf\Support\Reflection\ClassInvoker;
2525
use HyperfTest\RpcMultiplex\Stub\ContainerStub;
2626
use Mockery;
2727

tests/Cases/TransporterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Hyperf\LoadBalancer\LoadBalancerInterface;
1515
use Hyperf\RpcMultiplex\Transporter;
16-
use Hyperf\Utils\Reflection\ClassInvoker;
16+
use Hyperf\Support\Reflection\ClassInvoker;
1717
use HyperfTest\RpcMultiplex\Stub\ContainerStub;
1818
use Mockery;
1919

0 commit comments

Comments
 (0)