Imports functions (#11)

* Imports functions * 🛠️refactor(scope) restructure file imports in ConfigProvider.php --------- Co-authored-by: Deeka Wong <[email protected]>
friendsofhyperf · May 9, 2023 · d701dc2 · d701dc2
1 parent 7ce27b7
commit d701dc2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/src/Command/ConsumeCommand.php b/src/Command/ConsumeCommand.php
@@ -19,6 +19,8 @@
 use Hyperf\Coroutine\Coroutine;
 use Psr\Container\ContainerInterface;
 
+use function Hyperf\Support\make;
+
 #[Command()]
 class ConsumeCommand extends HyperfCommand
 {

diff --git a/src/Command/SubscribersCommand.php b/src/Command/SubscribersCommand.php
@@ -17,6 +17,8 @@
 use Hyperf\Di\Annotation\AnnotationCollector;
 use Psr\Container\ContainerInterface;
 
+use function Hyperf\Collection\collect;
+
 class SubscribersCommand extends HyperfCommand
 {
     protected ?string $signature = 'describe:subscribers {--C|connection= : connection}';

diff --git a/src/Command/TriggersCommand.php b/src/Command/TriggersCommand.php
@@ -15,6 +15,8 @@
 use Hyperf\Di\Annotation\AnnotationCollector;
 use Psr\Container\ContainerInterface;
 
+use function Hyperf\Collection\collect;
+
 class TriggersCommand extends HyperfCommand
 {
     protected ?string $signature = 'describe:triggers {--C|connection= : connection} {--T|table= : Table}';

diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -10,14 +10,6 @@
  */
 namespace FriendsOfHyperf\Trigger;
 
-use FriendsOfHyperf\Trigger\Command\SubscribersCommand;
-use FriendsOfHyperf\Trigger\Command\TriggersCommand;
-use FriendsOfHyperf\Trigger\Listener\OnBootApplicationListener;
-use FriendsOfHyperf\Trigger\Mutex\RedisServerMutex;
-use FriendsOfHyperf\Trigger\Mutex\ServerMutexInterface;
-use FriendsOfHyperf\Trigger\Snapshot\BinLogCurrentSnapshotInterface;
-use FriendsOfHyperf\Trigger\Snapshot\RedisBinLogCurrentSnapshot;
-
 class ConfigProvider
 {
     public function __invoke(): array
@@ -29,15 +21,16 @@ public function __invoke(): array
                 Aspect\BinaryDataReaderAspect::class, // Fix MySQLReplication bug
             ],
             'dependencies' => [
-                ServerMutexInterface::class => RedisServerMutex::class,
-                BinLogCurrentSnapshotInterface::class => RedisBinLogCurrentSnapshot::class,
+                Mutex\ServerMutexInterface::class => Mutex\RedisServerMutex::class,
+                Snapshot\BinLogCurrentSnapshotInterface::class => Snapshot\RedisBinLogCurrentSnapshot::class,
             ],
             'commands' => [
-                SubscribersCommand::class,
-                TriggersCommand::class,
+                Command\ConsumeCommand::class,
+                Command\SubscribersCommand::class,
+                Command\TriggersCommand::class,
             ],
             'listeners' => [
-                OnBootApplicationListener::class,
+                Listener\OnBootApplicationListener::class,
             ],
             'publish' => [
                 [

diff --git a/src/Snapshot/RedisBinLogCurrentSnapshot.php b/src/Snapshot/RedisBinLogCurrentSnapshot.php
@@ -14,6 +14,8 @@
 use Hyperf\Redis\Redis;
 use MySQLReplication\BinLog\BinLogCurrent;
 
+use function Hyperf\Support\with;
+
 class RedisBinLogCurrentSnapshot implements BinLogCurrentSnapshotInterface
 {
     public function __construct(

diff --git a/src/Subscriber/TriggerSubscriber.php b/src/Subscriber/TriggerSubscriber.php
@@ -21,6 +21,8 @@
 use Psr\Container\ContainerInterface;
 use Throwable;
 
+use function Hyperf\Support\call;
+
 class TriggerSubscriber extends AbstractSubscriber
 {
     use Logger;