fix #103

Author: yunwuxin

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "topthink/think-queue",
-    "description": "The ThinkPHP5 Queue Package",
+    "description": "The ThinkPHP6 Queue Package",
     "authors": [
         {
             "name": "yunwuxin",
@@ -25,8 +25,7 @@
     "require": {
         "ext-json": "*",
         "topthink/think-helper": "^3.0.4",
-        "topthink/framework": "^6.0.0",
-        "topthink/think-factory": "^1.0.0",
+        "topthink/framework": "^6.0",
         "symfony/process": "^4.2",
         "nesbot/carbon": "^2.16"
     },

src/Queue.php

@@ -11,50 +11,38 @@
 
 namespace think;
 
-use InvalidArgumentException;
-use think\cache\driver\Redis;
-use think\helper\Str;
 use think\queue\Connector;
 use think\queue\connector\Database;
+use think\queue\connector\Redis;
 
 /**
  * Class Queue
  * @package think\queue
  *
- * @method Connector driver($driver = null)
  * @mixin Database
  * @mixin Redis
  */
-class Queue extends Factory
+class Queue extends Manager
 {
     protected $namespace = '\\think\\queue\\connector\\';
 
-    /**
-     * Get the queue connector configuration.
-     *
-     * @param string $name
-     * @return array
-     */
-    protected function getConfig($name)
+    protected function resolveType(string $name)
     {
-        return $this->app->config->get("queue.connections.{$name}", ['type' => 'sync']);
+        return $this->app->config->get("queue.connections.{$name}.type", 'sync');
     }
 
-    protected function createDriver($name)
+    protected function resolveConfig(string $name)
     {
-        $driver = $this->getConfig($name)['type'];
-
-        $class = false !== strpos($driver, '\\') ? $driver : $this->namespace . Str::studly($driver);
+        return $this->app->config->get("queue.connections.{$name}");
+    }
 
+    protected function createDriver(string $name)
+    {
         /** @var Connector $driver */
-        if (class_exists($class)) {
-            $driver = $this->app->invokeClass($class, [$this->getConfig($driver)]);
-
-            return $driver->setApp($this->app)
-                ->setConnection($name);
-        }
+        $driver = parent::createDriver($name);
 
-        throw new InvalidArgumentException("Driver [$driver] not supported.");
+        return $driver->setApp($this->app)
+            ->setConnection($name);
     }
 
     /**