Merge 2478415 into 97ea007

.travis.yml

@@ -3,18 +3,6 @@ language: php
 matrix:
   fast_finish: true
   include:
-    - php: 5.5
-      env:
-        - DEPENDENCIES=""
-        - DBAL_PROVIDER="container-interop-doctrine"
-    - php: 5.5
-      env:
-        - DEPENDENCIES=""
-        - DBAL_PROVIDER="doctrine-orm-module"
-    - php: 5.5
-      env:
-        - DEPENDENCIES="--prefer-lowest --prefer-stable"
-        - DBAL_PROVIDER="doctrine-orm-module"
     - php: 5.6
       env:
         - DEPENDENCIES=""
@@ -89,6 +77,14 @@ matrix:
 #      env:
 #        - DEPENDENCIES="--prefer-lowest --prefer-stable"
 #        - DBAL_PROVIDER="container-interop-doctrine"
+    - php: 7.4
+      env:
+        - DEPENDENCIES=""
+        - DBAL_PROVIDER="container-interop-doctrine"
+    - php: 7.4
+      env:
+        - DEPENDENCIES=""
+        - DBAL_PROVIDER="doctrine-orm-module"
 
 cache:
   directories:

README.md

@@ -25,9 +25,9 @@ Add the following line into your `composer.json` file:
 }
 ```
 
-If you have the [zendframework/zend-component-installer](https://github.com/zendframework/zend-component-installer) package installed, it will ask you to enable the module (and `SlmQueue`), both in ZF and Expressive. Otherwise, add the module to the list:
-* in Zend MVC, enable the module by adding `SlmQueueDoctrine` in your application.config.php file.
-* in Zend Expressive, enable the module by adding `SlmQueueDoctrine\ConfigProvider::class,` in your config.php file.
+If you have the [laminas/laminas-component-installer](https://github.com/laminas/laminas-component-installer) package installed, it will ask you to enable the module (and `SlmQueue`), both in Laminas and Mezzio. Otherwise, add the module to the list:
+* in Laminas MVC, enable the module by adding `SlmQueueDoctrine` in your application.config.php file.
+* in Mezzio, enable the module by adding `SlmQueueDoctrine\ConfigProvider::class,` in your config.php file.
 
 Note: Don't forget install [SlmQueue](https://github.com/juriansluiman/SlmQueue) in you config file, which is required.
 
@@ -218,7 +218,7 @@ Examples:
 
 ### Worker actions
 
-Interact with workers from the command line from within the public folder of your Zend Framework 2 application
+Interact with workers from the command line from within the public folder of your Laminas Framework 2 application
 
 #### Starting a worker
 Start a worker that will keep monitoring a specific queue for jobs scheduled to be processed. This worker will continue until it has reached certain criteria (exceeds a memory limit or has processed a specified number of jobs).

composer.json

@@ -1,12 +1,11 @@
 {
     "name": "slm/queue-doctrine",
-    "description": "Zend Framework module that integrates Doctrine as queuing system",
+    "description": "Laminas Framework module that integrates Doctrine as queuing system",
     "license": "BSD-3-Clause",
     "type": "library",
     "keywords": [
-        "zf2",
-        "zf3",
-        "expressive",
+        "laminas",
+        "mezzio",
         "queue",
         "job",
         "doctrine",
@@ -23,20 +22,20 @@
     ],
     "require": {
         "php": "^5.5 || ^7.0",
-        "zendframework/zend-eventmanager": "^2.6 || ^3.0",
-        "zendframework/zend-servicemanager": "^2.7 || ^3.0",
-        "zendframework/zend-stdlib": "^2.2 || ^3.0",
+        "laminas/laminas-eventmanager": "^2.6 || ^3.0",
+        "laminas/laminas-servicemanager": "^2.7 || ^3.0",
+        "laminas/laminas-stdlib": "^2.2 || ^3.0",
         "slm/queue": "^1.0",
         "doctrine/dbal": "^2.5"
     },
     "require-dev": {
-        "zendframework/zend-config": "^2.2",
-        "zendframework/zend-modulemanager": "^2.5",
-        "zendframework/zend-view": "^2.5",
-        "zendframework/zend-log": "^2.5",
-        "zendframework/zend-i18n": "^2.5",
-        "zendframework/zend-serializer": "^2.5",
-        "zendframework/zend-mvc": "^2.5",
+        "laminas/laminas-config": "^2.2",
+        "laminas/laminas-modulemanager": "^2.5",
+        "laminas/laminas-view": "^2.5",
+        "laminas/laminas-log": "^2.5",
+        "laminas/laminas-i18n": "^2.5",
+        "laminas/laminas-serializer": "^2.5",
+        "laminas/laminas-mvc": "^2.5",
         "phpunit/phpunit": "^4.8",
         "squizlabs/php_codesniffer": "^2.7",
         "php-coveralls/php-coveralls": "^2.0"
@@ -49,9 +48,12 @@
         "branch-alias": {
             "dev-master": "2.1.x-dev"
         },
-        "zf": {
+        "laminas": {
             "module": "SlmQueueDoctrine\\Module",
-            "config-provider": "SlmQueueDoctrine\\ConfigProvider"
+            "config-provider": "SlmQueueDoctrine\\ConfigProvider",
+            "component-whitelist": [
+                "slm/queue"
+            ]
         }
     },
     "autoload": {

config/module.config.php

@@ -61,8 +61,8 @@
          */
         'strategy_manager'  => [
             'factories' => [
-                IdleNapStrategy::class            => \Zend\ServiceManager\Factory\InvokableFactory::class,
-                ClearObjectManagerStrategy::class => \Zend\ServiceManager\Factory\InvokableFactory::class,
+                IdleNapStrategy::class            => \Laminas\ServiceManager\Factory\InvokableFactory::class,
+                ClearObjectManagerStrategy::class => \Laminas\ServiceManager\Factory\InvokableFactory::class,
             ],
         ],
     ],

src/Factory/DoctrineQueueFactory.php

@@ -5,8 +5,8 @@
 use SlmQueue\Job\JobPluginManager;
 use SlmQueueDoctrine\Options\DoctrineOptions;
 use SlmQueueDoctrine\Queue\DoctrineQueue;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 use Interop\Container\ContainerInterface;
 
 /**

src/Factory/DoctrineWorkerControllerFactory.php

@@ -5,8 +5,8 @@
 use SlmQueue\Queue\QueuePluginManager;
 use SlmQueueDoctrine\Controller\DoctrineWorkerController;
 use SlmQueueDoctrine\Worker\DoctrineWorker;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 use Interop\Container\ContainerInterface;
 
 /**

src/Options/DoctrineOptions.php

@@ -3,7 +3,7 @@
 namespace SlmQueueDoctrine\Options;
 
 use SlmQueueDoctrine\Queue\DoctrineQueue;
-use Zend\Stdlib\AbstractOptions;
+use Laminas\Stdlib\AbstractOptions;
 
 /**
  * DoctrineOptions

src/Strategy/ClearObjectManagerStrategy.php

@@ -7,7 +7,7 @@
 use SlmQueue\Strategy\AbstractStrategy;
 use SlmQueue\Worker\Event\AbstractWorkerEvent;
 use SlmQueue\Worker\Event\ProcessJobEvent;
-use Zend\EventManager\EventManagerInterface;
+use Laminas\EventManager\EventManagerInterface;
 
 class ClearObjectManagerStrategy extends AbstractStrategy
 {

src/Strategy/IdleNapStrategy.php

@@ -6,7 +6,7 @@
 use SlmQueue\Worker\Event\AbstractWorkerEvent;
 use SlmQueue\Worker\Event\ProcessIdleEvent;
 use SlmQueueDoctrine\Queue\DoctrineQueueInterface;
-use Zend\EventManager\EventManagerInterface;
+use Laminas\EventManager\EventManagerInterface;
 
 class IdleNapStrategy extends AbstractStrategy
 {

tests/Controller/DoctrineWorkerControllerTest.php

@@ -5,9 +5,9 @@
 use PHPUnit_Framework_TestCase as TestCase;
 use SlmQueueDoctrine\Controller\DoctrineWorkerController;
 use SlmQueueDoctrineTest\Util\ServiceManagerFactory;
-use Zend\Mvc\Router\RouteMatch;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\Mvc\Router\RouteMatch;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\ServiceManager\ServiceManager;
 
 class DoctrineWorkerControllerTest extends TestCase
 {

tests/Framework/TestCase.php

@@ -22,7 +22,7 @@
 use PHPUnit_Framework_TestCase;
 use Doctrine\ORM\EntityManager;
 use SlmQueueDoctrineTest\Util\ServiceManagerFactory;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\ServiceManager;
 
 class TestCase extends PHPUnit_Framework_TestCase
 {

tests/Queue/DoctrineQueueTest.php

@@ -13,7 +13,7 @@
 use SlmQueueDoctrineTest\Asset\SimpleJob;
 use SlmQueueDoctrineTest\Framework\TestCase;
 use SlmQueueDoctrineTest\Util\ServiceManagerFactory;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\ServiceManager;
 
 class DoctrineQueueTest extends TestCase
 {

tests/Strategy/ClearObjectManagerStrategyTest.php

@@ -10,7 +10,7 @@
 use SlmQueueDoctrine\Worker\DoctrineWorker;
 use SlmQueueDoctrineTest\Asset\OMJob;
 use SlmQueueTest\Asset\SimpleWorker;
-use Zend\EventManager\EventManagerInterface;
+use Laminas\EventManager\EventManagerInterface;
 
 class ClearObjectManagerStrategyTest extends PHPUnit_Framework_TestCase
 {

tests/Strategy/IdleNapStrategyTest.php

@@ -8,7 +8,7 @@
 use SlmQueueDoctrine\Queue\DoctrineQueueInterface;
 use SlmQueueDoctrine\Strategy\IdleNapStrategy;
 use SlmQueueDoctrine\Worker\DoctrineWorker;
-use Zend\EventManager\EventManagerInterface;
+use Laminas\EventManager\EventManagerInterface;
 
 class IdleNapStrategyTest extends PHPUnit_Framework_TestCase
 {

tests/Util/ServiceManagerFactory.php

@@ -19,9 +19,9 @@
 
 namespace SlmQueueDoctrineTest\Util;
 
-use Zend\Mvc\Service\ServiceListenerFactory;
-use Zend\ServiceManager\ServiceManager;
-use Zend\Mvc\Service\ServiceManagerConfig;
+use Laminas\Mvc\Service\ServiceListenerFactory;
+use Laminas\ServiceManager\ServiceManager;
+use Laminas\Mvc\Service\ServiceManagerConfig;
 
 /**
  * Utility used to retrieve a freshly bootstrapped application's service manager
@@ -66,7 +66,7 @@ public static function getServiceManager()
         $serviceManager->setFactory('ServiceListener', ServiceListenerFactory::class);
         $serviceManager->setAllowOverride(false);
 
-        /** @var $moduleManager \Zend\ModuleManager\ModuleManager */
+        /** @var $moduleManager \Laminas\ModuleManager\ModuleManager */
         $moduleManager = $serviceManager->get('ModuleManager');
         $moduleManager->loadModules();
         //$serviceManager->setAllowOverride(true);

tests/Worker/DoctrineWorkerTest.php

@@ -8,8 +8,8 @@
 use SlmQueueDoctrineTest\Asset;
 use SlmQueueDoctrine\Worker\DoctrineWorker;
 use SlmQueueDoctrineTest\Util\ServiceManagerFactory;
-use Zend\EventManager\EventManager;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\EventManager\EventManager;
+use Laminas\ServiceManager\ServiceManager;
 
 class DoctrineWorkerTest extends TestCase
 {