Merge pull request #7 from LinioIT/feat/7.4

fix: migrate to 7.4

Author: klaussilveira

.php_cs

@@ -13,6 +13,7 @@ return PhpCsFixer\Config::create()
         'array_syntax' => ['syntax' => 'short'],
         'blank_line_after_opening_tag' => true,
         'concat_space' => ['spacing' => 'one'],
+        'class_attributes_separation' => ['elements' => ['method']],
         'declare_strict_types' => true,
         'increment_style' => ['style' => 'post'],
         'is_null' => ['use_yoda_style' => false],
@@ -22,7 +23,7 @@ return PhpCsFixer\Config::create()
         'modernize_types_casting' => true,
         'no_multiline_whitespace_before_semicolons' => true,
         'no_superfluous_elseif' => true,
-        'no_superfluous_phpdoc_tags' => true,
+        'no_superfluous_phpdoc_tags' => false,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_imports' => true,
@@ -31,6 +32,7 @@ return PhpCsFixer\Config::create()
         'php_unit_construct' => true,
         'php_unit_dedicate_assert' => true,
         'return_assignment' => true,
+        'single_blank_line_at_eof' => true,
         'single_line_comment_style' => true,
         'ternary_to_null_coalescing' => true,
         'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],

.travis.yml

@@ -1,18 +1,13 @@
 language: php
 
 php:
-  - 7.0
-  
-cache:
-  directories:
-    - vendor
+  - 7.4
 
 install:
   - travis_retry composer install --no-interaction --prefer-source
 
 script:
-  - vendor/bin/php-cs-fixer fix --dry-run -v
-  - vendor/bin/phpunit --verbose
+  - composer test
 
 matrix:
   fast_finish: true

README.md

@@ -12,7 +12,7 @@ The recommended way to install Linio Queue is [through composer](http://getcompo
 ```JSON
 {
     "require": {
-        "linio/queue": "~1.0"
+        "linio/queue": "~3.0"
     }
 }
 ```
@@ -35,21 +35,19 @@ Silex, a service provider is included. Just register it:
 ```php
 <?php
 
-$app->register(new \Linio\Component\Queue\Provider\QueueServiceProvider(), [
-    'queue.adapter_name' => 'rabbit',
-    'queue.adapter_options' => [
-        'host' => 'localhost',
-        'port' => 5672,
-        'username' => 'guest',
-        'password' => 'guest',
-        'vhost' => '/'
-    ],
-]);
+use Linio\Component\Queue\QueueService;
+use Linio\Component\Queue\Adapter;
 
-```
+$queue = new QueueService();
+$queue->setAdapter(new Adapter\RabbitAdapter([
+    'host' => 'localhost',
+    'port' => 5672,
+    'username' => 'guest',
+    'password' => 'guest',
+    'vhost' => '/'
+]));
 
-Note that must provide an adapter name and an array of options. Each adapter
-has different configuration options that are injected by the `AdapterFactory`.
+```
 
 In order to create a work queue, you must extend the abstract class `Job`:
 

composer.json

@@ -1,27 +1,39 @@
 {
-    "name": "linio/queue",
-    "description": "Abstracts work queues, used to distribute time-consuming tasks among multiple workers.",
-    "keywords": ["linio", "queue", "rabbit", "rabbitmq", "distributed"],
-    "type": "library",
-    "license": "BSD-3-Clause",
-    "require": {
-        "php": ">=7.1",
-        "psr/log": "^1.0",
-        "linio/util": "^2.0",
-        "php-amqplib/php-amqplib": "^2.6"
-    },
-    "require-dev": {
-        "phpunit/phpunit": ">=5.0",
-        "friendsofphp/php-cs-fixer": "^2.4"
-    },
-    "autoload": {
-        "psr-4": {
-            "Linio\\Component\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Linio\\Component\\": "tests/"
-        }
+  "name": "linio/queue",
+  "description": "Abstracts work queues, used to distribute time-consuming tasks among multiple workers.",
+  "keywords": ["linio", "queue", "rabbit", "rabbitmq", "distributed"],
+  "type": "library",
+  "license": "BSD-3-Clause",
+  "require": {
+    "php": "^7.4",
+    "psr/log": "^1.0",
+    "linio/util": "^3.0",
+    "php-amqplib/php-amqplib": "^2.11"
+  },
+  "require-dev": {
+    "friendsofphp/php-cs-fixer": "^2.16",
+    "phpstan/phpstan": "^0.12",
+    "phpunit/phpunit": "^8.5"
+  },
+  "autoload": {
+    "psr-4": {
+      "Linio\\Component\\": "src/"
     }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Linio\\Component\\": "tests/"
+    }
+  },
+  "scripts": {
+    "lint": "php-cs-fixer fix --verbose --show-progress=estimating",
+    "lint:check": "php-cs-fixer fix --dry-run --verbose --show-progress=estimating",
+    "phpunit": "phpunit",
+    "phpstan": "phpstan analyze",
+    "test": [
+      "@lint:check",
+      "@phpunit",
+      "@phpstan"
+    ]
+  }
 }

phpstan.neon

@@ -0,0 +1,5 @@
+parameters:
+    level: max
+    checkMissingIterableValueType: false
+    paths:
+        - src

phpunit.xml.ci

@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         stopOnFailure="false"
-         bootstrap="./vendor/autoload.php">
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         executionOrder="depends,defects"
+         forceCoversAnnotation="true"
+         beStrictAboutCoversAnnotation="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         verbose="true">
     <testsuites>
-        <testsuite name="Linio Framework Test Suite">
-            <directory>./tests</directory>
+        <testsuite name="default">
+            <directory suffix="Test.php">tests</directory>
         </testsuite>
     </testsuites>
+
     <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-            <exclude>
-                <directory suffix="Interface.php">./src</directory>
-                <directory suffix="Aware.php">./src</directory>
-                <directory suffix="Trait.php">./src</directory>
-            </exclude>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
 </phpunit>

phpunit.xml.dist

@@ -9,8 +9,11 @@
 
 class NullAdapter implements AdapterInterface
 {
+    protected array $config;
+
     public function __construct(array $config = [])
     {
+        $this->config = $config;
     }
 
     public function add(Job $job): void

src/Queue/Adapter/NullAdapter.php

@@ -12,15 +12,8 @@
 
 class RabbitAdapter implements AdapterInterface
 {
-    /**
-     * @var AMQPChannel
-     */
-    protected $channel;
-
-    /**
-     * @var array
-     */
-    protected $config = [];
+    protected ?AMQPChannel $channel = null;
+    protected array $config = [];
 
     public function __construct(array $config = [])
     {
@@ -37,15 +30,15 @@ public function add(Job $job): void
     public function perform(Job $job): void
     {
         $this->getChannel()->queue_declare($job->getQueue(), true, $job->isPersistent(), false, false);
-        $this->getChannel()->basic_qos(null, 1, null);
+        $this->getChannel()->basic_qos(0, 1, false);
         $this->getChannel()->basic_consume($job->getQueue(), '', false, false, false, false, function ($message) use ($job): void {
             $job->setPayload($message->body);
             $job->perform();
 
             if ($job->isFinished()) {
                 $message->delivery_info['channel']->basic_ack($message->delivery_info['delivery_tag']);
             } else {
-                $this->channel->basic_nack($message->delivery_info['delivery_tag'], false, true);
+                $this->getChannel()->basic_nack($message->delivery_info['delivery_tag'], false, true);
             }
         });
 

src/Queue/Adapter/RabbitAdapter.php

@@ -8,7 +8,7 @@ interface AdapterInterface
 {
     public function __construct(array $config);
 
-    public function add(Job $job);
+    public function add(Job $job): void;
 
-    public function perform(Job $job);
+    public function perform(Job $job): void;
 }