Merge pull request #17 from pr0head/master

Changed the required version of PHP to >=7.0, changed the tests for the PHPUnit of version 6

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - 5.6
+  - 7.0
 
 services:
   - rabbitmq

composer.json

@@ -22,10 +22,10 @@
         "ext-amqp": ">=1.4.0"
     },
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=7.0.0",
         "misterion/ko-process": "~0.4",
         "symfony/yaml": "^3.0",
-        "ulrichsg/getopt-php": "~2.3.0"
+        "ulrichsg/getopt-php": "~3.1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.0",

src/Ko/Worker/Application.php

@@ -35,8 +35,8 @@
 use Ko\Process;
 use Ko\ProcessManager;
 use Symfony\Component\Yaml\Yaml;
-use Ulrichsg\Getopt\Getopt;
-use Ulrichsg\Getopt\Option;
+use GetOpt\GetOpt;
+use GetOpt\Option;
 
 /**
  * Class Application
@@ -55,7 +55,7 @@ class Application
     const FAILED_EXIT = 0;
 
     /**
-     * @var Getopt
+     * @var GetOpt
      */
     protected $opts;
 
@@ -126,18 +126,18 @@ public function setName($name)
 
     protected function buildCommandLineOptions()
     {
-        $this->opts = new Getopt(
+        $this->opts = new GetOpt(
             [
-                (new Option('w', 'workers', Getopt::REQUIRED_ARGUMENT))
+                (new Option('w', 'workers', GetOpt::REQUIRED_ARGUMENT))
                     ->setDefaultValue(1)
                     ->setDescription('Worker process count'),
-                (new Option('c', 'config', Getopt::REQUIRED_ARGUMENT))
+                (new Option('c', 'config', GetOpt::REQUIRED_ARGUMENT))
                     ->setDescription('Worker configuration file'),
-                (new Option('q', 'queue', Getopt::REQUIRED_ARGUMENT))
+                (new Option('q', 'queue', GetOpt::REQUIRED_ARGUMENT))
                     ->setDescription('Consumer queue name'),
-                (new Option('d', 'demonize', Getopt::NO_ARGUMENT))
+                (new Option('d', 'demonize', GetOpt::NO_ARGUMENT))
                     ->setDescription('Run application as daemon'),
-                (new Option('f', 'fork', Getopt::NO_ARGUMENT))
+                (new Option('f', 'fork', GetOpt::NO_ARGUMENT))
                     ->setDescription('Use fork instead of spawn child process'),
             ]
         );

tests/Ko/AmqpBrokerTest.php

@@ -30,6 +30,7 @@
  * @license MIT http://opensource.org/licenses/MIT
  */
 use Ko\AmqpBroker;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class AmqpBrokerTest
@@ -38,7 +39,7 @@
  * @author Vadim Sabirov <pr0head@gmail.com>
  * @version 1.0.0
  */
-class AmqpBrokerTest extends PHPUnit_Framework_TestCase
+class AmqpBrokerTest extends TestCase
 {
     /**
      * @expectedException \InvalidArgumentException

tests/Ko/RabbitMq/ConnectionFactoryTest.php

@@ -30,8 +30,9 @@
  * @license MIT http://opensource.org/licenses/MIT
  */
 use Ko\RabbitMq\ConnectionFactory;
+use PHPUnit\Framework\TestCase;
 
-class ConnectionFactoryTest extends PHPUnit_Framework_TestCase
+class ConnectionFactoryTest extends TestCase
 {
     /**
      * @expectedException \InvalidArgumentException

tests/Ko/RabbitMq/ConsumerTest.php

@@ -30,8 +30,9 @@
  * @license MIT http://opensource.org/licenses/MIT
  */
 use Ko\RabbitMq\Consumer;
+use PHPUnit\Framework\TestCase;
 
-class ConsumerTest extends PHPUnit_Framework_TestCase
+class ConsumerTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject

tests/Ko/RabbitMq/ProducerTest.php

@@ -30,8 +30,9 @@
  * @license MIT http://opensource.org/licenses/MIT
  */
 use Ko\RabbitMq\Producer;
+use PHPUnit\Framework\TestCase;
 
-class ProducerTest extends PHPUnit_Framework_TestCase
+class ProducerTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject