Merge pull request #79 from genhoi/pcntl_async_signals

Use pcntl_async_signals for php >=7.1

.travis.yml

@@ -3,7 +3,6 @@ sudo: required
 language: php
 
 php:
-  - 7.0
   - 7.1
   - 7.2
   - 7.3
@@ -30,7 +29,6 @@ cache:
 
 before_script:
   - mkdir -p "$HOME/.php-cs-fixer"
-  - if [ $TRAVIS_PHP_VERSION = "7.0" ]; then phpenv config-rm xdebug.ini; fi
   - sudo cp $TRAVIS_BUILD_DIR/provision/rabbitmq.config /etc/rabbitmq/
   - sudo service rabbitmq-server restart
   - git clone https://github.com/alanxz/rabbitmq-c.git

composer.json

@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "~7.0",
+        "php": "^7.1",
         "beberlei/assert": "^2.4 || ^3.0",
         "marc-mabe/php-enum": "^2.2 || ^3.0",
         "psr/log": "^1.0"

src/AbstractConsumer.php

@@ -119,11 +119,6 @@ abstract class AbstractConsumer implements Consumer
      */
     protected $errorCallback;
 
-    /**
-     * @var bool
-     */
-    protected $usePcntlSignalDispatch = false;
-
     /**
      * Start consumer
      *
@@ -165,11 +160,6 @@ public function consume(int $msgAmount = 0)
                 $this->ackOrNackBlock();
             }
 
-            if ($this->usePcntlSignalDispatch) {
-                // Check for signals
-                pcntl_signal_dispatch();
-            }
-
             if (! $this->keepAlive || (0 !== $this->target && $this->countMessagesConsumed >= $this->target)) {
                 $this->ackOrNackBlock();
                 $this->shutdown();

src/CallbackConsumer.php

@@ -66,9 +66,7 @@ public function __construct(
         }
 
         if (extension_loaded('pcntl')) {
-            declare(ticks=1);
-
-            $this->usePcntlSignalDispatch = true;
+            pcntl_async_signals(true);
 
             pcntl_signal(SIGTERM, [$this, 'shutdown']);
             pcntl_signal(SIGINT, [$this, 'shutdown']);

src/JsonRpc/JsonRpcServer.php

@@ -77,9 +77,7 @@ public function __construct(
         }
 
         if (extension_loaded('pcntl')) {
-            declare(ticks=1);
-
-            $this->usePcntlSignalDispatch = true;
+            pcntl_async_signals(true);
 
             pcntl_signal(SIGTERM, [$this, 'shutdown']);
             pcntl_signal(SIGINT, [$this, 'shutdown']);