优化代码

Author: Yurunsoft

.travis.yml

@@ -1,20 +1,27 @@
 language: php
 os: linux
+dist: bionic
 
 jobs:
   include:
+  - php: '7.1'
+    env: SWOOLE_VERSION="v4.5.2"
   - php: '7.2'
     env: SWOOLE_VERSION="v4.5.2"
   - php: '7.3'
     env: SWOOLE_VERSION="v4.5.2"
   - php: '7.4'
     env: SWOOLE_VERSION="v4.5.2"
+  - php: '7.1'
+    env: SWOOLE_VERSION="v4.4.19"
   - php: '7.2'
     env: SWOOLE_VERSION="v4.4.19"
   - php: '7.3'
     env: SWOOLE_VERSION="v4.4.19"
   - php: '7.4'
     env: SWOOLE_VERSION="v4.4.19"
+  - php: '7.1'
+    env: SWOOLE_VERSION="master"
   - php: '7.2'
     env: SWOOLE_VERSION="master"
   - php: '7.3'

README.md

@@ -1,7 +1,7 @@
 # imi-queue
 
 [![Latest Version](https://img.shields.io/packagist/v/imiphp/imi-queue.svg)](https://packagist.org/packages/imiphp/imi-queue)
-[![Php Version](https://img.shields.io/badge/php-%3E=7.2-brightgreen.svg)](https://secure.php.net/)
+[![Php Version](https://img.shields.io/badge/php-%3E=7.1-brightgreen.svg)](https://secure.php.net/)
 [![Swoole Version](https://img.shields.io/badge/swoole-%3E=4.4.0-brightgreen.svg)](https://github.com/swoole/swoole-src)
 [![IMI License](https://img.shields.io/github/license/imiphp/imi-queue.svg)](https://github.com/imiphp/imi-queue/blob/master/LICENSE)
 

example/config/beans.php

@@ -68,7 +68,7 @@
             // 队列名称
             'test1' =>  [
                 // 使用的队列驱动
-                'driver'        =>  \Imi\Queue\Driver\RedisQueueDriver::class,
+                'driver'        =>  'RedisQueueDriver',
                 // 消费协程数量
                 'co'            =>  1,
                 // 消费进程数量；可能会受进程分组影响，以同一组中配置的最多进程数量为准
@@ -88,7 +88,7 @@
                 ]
             ],
             'test2' =>  [
-                'driver'        =>  \Imi\Queue\Driver\RedisQueueDriver::class,
+                'driver'        =>  'RedisQueueDriver',
                 'co'            =>  1,
                 'process'       =>  1,
                 'timespan'      =>  0.1,

src/Driver/RedisQueueDriver.php

@@ -2,15 +2,18 @@
 namespace Imi\Queue\Driver;
 
 use Imi\Redis\RedisManager;
+use Imi\Queue\Model\Message;
+use Imi\Bean\Annotation\Bean;
 use Imi\Queue\Enum\QueueType;
 use Imi\Queue\Contract\IMessage;
 use Imi\Queue\Model\QueueStatus;
 use Imi\Util\Traits\TDataToProperty;
 use Imi\Queue\Exception\QueueException;
-use Imi\Queue\Model\Message;
 
 /**
  * Redis 队列驱动
+ * 
+ * @Bean("RedisQueueDriver")
  */
 class RedisQueueDriver implements IQueueDriver
 {

src/Model/QueueConfig.php

@@ -1,8 +1,6 @@
 <?php
 namespace Imi\Queue\Model;
 
-use Imi\Queue\Driver\RedisQueueDriver;
-
 class QueueConfig
 {
     /**
@@ -17,7 +15,7 @@ class QueueConfig
      *
      * @var string
      */
-    private $driver = RedisQueueDriver::class;
+    private $driver = 'RedisQueueDriver';
 
     /**
      * 消费协程数量

src/Service/QueueService.php

@@ -5,7 +5,6 @@
 use Imi\Bean\Annotation\Bean;
 use Imi\Queue\Model\QueueConfig;
 use Imi\Queue\Driver\IQueueDriver;
-use Imi\Queue\Driver\RedisQueueDriver;
 use Imi\Queue\Exception\QueueException;
 
 /**

src/config/config.php

@@ -1,6 +1,7 @@
 <?php
 return [
     'beanScan'  =>  [
+        'Imi\Queue\Driver',
         'Imi\Queue\Enum',
         'Imi\Queue\Service',
         'Imi\Queue\Annotation',

tests/Queue/RedisQueueTest.php

@@ -3,12 +3,11 @@
 
 use Imi\App;
 use Imi\Queue\Driver\IQueueDriver;
-use Imi\Queue\Driver\RedisQueueDriver;
 
 class RedisQueueTest extends BaseQueueTest
 {
     protected function getDriver(): IQueueDriver
     {
-        return App::getBean(RedisQueueDriver::class, 'imi-queue-test');
+        return App::getBean('RedisQueueDriver', 'imi-queue-test');
     }
 }

tests/phpunit

@@ -28,7 +28,7 @@ go(function() use(&$statusCode){
             {
                 require $phpunitPath;
             }
-            PHPUnit\TextUI\Command::main();
+            PHPUnit\TextUI\Command::main(false);
         } catch (\Swoole\ExitException $e) {
             $statusCode = $e->getStatus();
         }