Merge pull request #5 from trylika/master

Upgrade SLM Version to support PHP 8

Author: rnd-cosoft

composer.json

@@ -15,20 +15,20 @@
         "bin-dir": "bin/"
     },
     "require": {
-        "php": "^7.2",
-        "laminas/laminas-console": "^2.7",
+        "php": "^7.4 || ~8.0",
+        "laminas/laminas-cli": "^1.1",
         "laminas/laminas-modulemanager": "^2.8",
         "laminas/laminas-stdlib": "^3.2",
         "laminas/laminas-eventmanager": "^3.2",
         "laminas/laminas-servicemanager": "^3.3",
         "laminas/laminas-mvc": "^3.1",
         "container-interop/container-interop": "^1.2",
-        "php-amqplib/php-amqplib": "^2.7",
-        "slm/queue": "^2.0",
-        "psr/log": "^1.0"
+        "php-amqplib/php-amqplib": "^3.1",
+        "slm/queue": "^3.0",
+        "psr/log": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.3"
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "psr-4": {

config/module.config.php

@@ -1,7 +1,6 @@
 <?php
 
-use SlmQueueRabbitMq\Controller\RabbitMqWorkerController;
-use SlmQueueRabbitMq\Factory\RabbitMqWorkerControllerFactory;
+use SlmQueueRabbitMq\ConfigFactory;
 use SlmQueueRabbitMq\Strategy\IdleNapStrategy;
 use SlmQueueRabbitMq\Worker\RabbitMqWorker;
 use SlmQueueRabbitMq\Factory\RabbitMqWorkerFactory;
@@ -21,32 +20,15 @@
                 IdleNapStrategy::class => InvokableFactory::class,
             ],
         ],
-    ],
-    'service_manager' => [
-        'factories' => [
-            RabbitMqWorker::class => RabbitMqWorkerFactory::class,
-            'SlmQueueRabbitMq\Config' => \SlmQueueRabbitMq\ConfigFactory::class,
+        'worker_manager' => [
+            'factories' => [
+                RabbitMqWorker::class => RabbitMqWorkerFactory::class,
+            ],
         ],
     ],
-    'controllers' => [
+    'service_manager' => [
         'factories' => [
-            RabbitMqWorkerController::class => RabbitMqWorkerControllerFactory::class,
-        ],
-    ],
-    'console' => [
-        'router' => [
-            'routes' => [
-                'slm-queue-rabbit_mq-worker' => [
-                    'type' => 'Simple',
-                    'options' => [
-                        'route' => 'queue rabbitmq <queue> --start',
-                        'defaults' => [
-                            'controller' => RabbitMqWorkerController::class,
-                            'action' => 'process'
-                        ],
-                    ],
-                ],
-            ],
+            'SlmQueueRabbitMq\Config' => ConfigFactory::class,
         ],
     ],
     'slm-queue-rabbitmq' => [

src/ConfigFactory.php

@@ -9,7 +9,6 @@ class ConfigFactory implements FactoryInterface
 {
     /**
      * @inheritdoc
-     * @return array
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {

src/Controller/RabbitMqWorkerController.php

@@ -5,15 +5,15 @@
 use Interop\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use SlmQueue\Factory\WorkerFactory;
+use SlmQueue\Factory\WorkerAbstractFactory;
 use SlmQueue\Strategy\StrategyPluginManager;
 use SlmQueue\Worker\WorkerInterface;
 use SlmQueueRabbitMq\Job\MessageRetryCounter;
 use SlmQueueRabbitMq\Worker\RabbitMqWorker;
 use Laminas\EventManager\EventManager;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 
-class RabbitMqWorkerFactory extends WorkerFactory implements FactoryInterface
+class RabbitMqWorkerFactory extends WorkerAbstractFactory implements FactoryInterface
 {
     /**
      * @inheritdoc

src/Factory/RabbitMqWorkerControllerFactory.php

@@ -3,35 +3,21 @@
 namespace SlmQueueRabbitMq;
 
 use Laminas\Console\Adapter\AdapterInterface;
-use Laminas\ModuleManager\Feature;
+use Laminas\ModuleManager\Feature\ConfigProviderInterface;
+use Laminas\ModuleManager\Feature\DependencyIndicatorInterface;
 
-class Module implements
-    Feature\ConfigProviderInterface,
-    Feature\ConsoleUsageProviderInterface,
-    Feature\DependencyIndicatorInterface
+class Module implements ConfigProviderInterface, DependencyIndicatorInterface
 {
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function getConfig()
     {
         return include __DIR__ . '/../config/module.config.php';
     }
 
     /**
-     * {@inheritDoc}
-     */
-    public function getConsoleUsage(AdapterInterface $console)
-    {
-        return [
-            'queue rabbitmq <queueName> --start' => 'Process the jobs',
-
-            ['<queueName>', 'Queue\'s name to process'],
-        ];
-    }
-
-    /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function getModuleDependencies()
     {

src/Factory/RabbitMqWorkerFactory.php

@@ -9,6 +9,7 @@
 use SlmQueue\Job\JobInterface;
 use SlmQueue\Job\JobPluginManager;
 use SlmQueue\Queue\AbstractQueue;
+use SlmQueueRabbitMq\Worker\RabbitMqWorker;
 
 class RabbitMqQueue extends AbstractQueue implements RabbitMqQueueInterface
 {
@@ -21,6 +22,8 @@ class RabbitMqQueue extends AbstractQueue implements RabbitMqQueueInterface
     /** @var array */
     private $defaultMessageOptions;
 
+    protected static $defaultWorkerName = RabbitMqWorker::class;
+
     /**
      * @param Connection $connection
      * @param string $name

src/Module.php

@@ -13,7 +13,7 @@ class MessageRetryCounterTest extends TestCase
     /** @var MessageRetryCounter */
     private $messageRetryCounter;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->messageRetryCounter = new MessageRetryCounter([
             'some_queue_name' => [

src/Queue/RabbitMqQueue.php

@@ -1,10 +1,11 @@
-<phpunit cacheResult="false">
-    <testsuite name="SlmQueueRabbitMq Test Suite">
-        <directory>./</directory>
-    </testsuite>
-    <filter>
-        <whitelist>
-            <directory>../src/*/</directory>
-        </whitelist>
-    </filter>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" cacheResult="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>../src/*/</directory>
+    </include>
+  </coverage>
+  <testsuite name="SlmQueueRabbitMq Test Suite">
+    <directory>./</directory>
+  </testsuite>
 </phpunit>