Prepared version 2.0.0

.travis.yml

@@ -1,22 +1,27 @@
-sudo: false
 language: php
 
 php:
-  - 5.5
-  - 5.6
   - 7.0
-  - hhvm
+  - 7.1
+  - 7.2
+  - 7.3
 
 env:
-  - SYMFONY_VERSION=2.6.*
-  - SYMFONY_VERSION=2.7.*
   - SYMFONY_VERSION=2.8.*
-  - SYMFONY_VERSION=3.*
+  - SYMFONY_VERSION=3.4.*
+  - SYMFONY_VERSION=4.0.*
+  - SYMFONY_VERSION=4.1.*
+  - SYMFONY_VERSION=4.2.*
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - php: hhvm
+  exclude:
+    - php: 7.0
+      env: SYMFONY_VERSION=4.0.*
+    - php: 7.0
+      env: SYMFONY_VERSION=4.1.*
+    - php: 7.0
+      env: SYMFONY_VERSION=4.2.*
 
 cache:
   directories:

CHANGELOG.md

@@ -1,6 +1,19 @@
 CHANGELOG
 =========
 
+## 2.0.0
+
+### Changes
+
+* Added Symfony 4 support
+* #16 catch throwables instead of just exceptions
+
+### Breaking changes
+
+* Dropped support for PHP 5.5 and 5.6
+* Dropped support for unmaintained Symfony versions. Supported versions are 2.8, 3.4, 4.1 and up,
+  as per the [Symfony Roadmap](https://symfony.com/roadmap).
+
 ## 1.2.1
 
 * #9  Ensure that a job retains its priority when it is rescheduled

README.md

@@ -19,7 +19,7 @@ For this process, we assume you have a Beanstalk server up and running.
 Install via [Composer][composer]:
 
 ```bash
-$ composer require treehouselabs/worker-bundle:~1.0
+$ composer require treehouselabs/worker-bundle
 ```
 
 [composer]: https://getcomposer.org

composer.json

@@ -15,13 +15,13 @@
     }
   ],
   "require": {
-    "php": ">=5.5",
-    "symfony/symfony": "^2.6|^3.0",
+    "php": ">=7.0",
+    "symfony/symfony": "^2.8|^3.0|^4.0",
     "pda/pheanstalk": "^3.0"
   },
   "require-dev": {
     "doctrine/orm": "^2.3",
-    "phpunit/phpunit": "^4.5",
+    "phpunit/phpunit": "^6.0",
     "monolog/monolog": "^1.10.0"
   },
   "autoload": {

src/TreeHouse/WorkerBundle/Resources/config/services.yml

@@ -1,5 +1,6 @@
 services:
   tree_house.worker.queue_manager:
+    public: true
     class: TreeHouse\WorkerBundle\QueueManager
     arguments:
       - ~ # injected in extension

tests/TreeHouse/WorkerBundle/QueueManagerTest.php

@@ -6,6 +6,7 @@
 use Pheanstalk\Job;
 use Pheanstalk\PheanstalkInterface;
 use Pheanstalk\Response;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use TreeHouse\WorkerBundle\Event\ExecutionEvent;
 use TreeHouse\WorkerBundle\Event\JobEvent;
@@ -18,7 +19,7 @@
 use TreeHouse\WorkerBundle\Tests\Mock\EventDispatcherMock;
 use TreeHouse\WorkerBundle\WorkerEvents;
 
-class QueueManagerTest extends \PHPUnit_Framework_TestCase
+class QueueManagerTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|PheanstalkInterface

tests/TreeHouse/WorkerBundle/Tests/DependencyInjection/TreeHouseWorkerExtensionTest.php

@@ -3,14 +3,15 @@
 namespace TreeHouse\WorkerBundle\Tests\DependencyInjection;
 
 use Pheanstalk\Pheanstalk;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpKernel\Tests\Logger;
 use TreeHouse\WorkerBundle\DependencyInjection\TreeHouseWorkerExtension;
 use TreeHouse\WorkerBundle\TreeHouseWorkerBundle;
 
-class TreeHouseWorkerExtensionTest extends \PHPUnit_Framework_TestCase
+class TreeHouseWorkerExtensionTest extends TestCase
 {
     /**
      * @var ContainerBuilder
@@ -58,7 +59,13 @@ public function testExistingPheanstalkService()
         $this->assertTrue($this->container->hasDefinition('tree_house.worker.queue_manager'));
 
         $definition = $this->container->getDefinition('tree_house.worker.queue_manager');
-        $this->assertEquals($id, (string) $definition->getArgument(0));
+        $injected = $definition->getArgument(0);
+
+        if ($injected instanceof Definition) {
+            $this->assertEquals(Pheanstalk::class, $injected->getClass());
+        } else {
+            $this->assertEquals($id, (string) $injected);
+        }
     }
 
     public function testNewPheanstalkService()

tests/TreeHouse/WorkerBundle/Tests/Event/ExecutionEventTest.php

@@ -2,10 +2,11 @@
 
 namespace TreeHouse\WorkerBundle\Tests\Event;
 
+use PHPUnit\Framework\TestCase;
 use TreeHouse\WorkerBundle\Event\ExecutionEvent;
 use TreeHouse\WorkerBundle\Executor\ExecutorInterface;
 
-class ExecutionEventTest extends \PHPUnit_Framework_TestCase
+class ExecutionEventTest extends TestCase
 {
     public function testEvent()
     {

tests/TreeHouse/WorkerBundle/Tests/Event/JobEventTest.php

@@ -3,9 +3,10 @@
 namespace TreeHouse\WorkerBundle\Tests\Event;
 
 use Pheanstalk\Job;
+use PHPUnit\Framework\TestCase;
 use TreeHouse\WorkerBundle\Event\JobEvent;
 
-class JobEventTest extends \PHPUnit_Framework_TestCase
+class JobEventTest extends TestCase
 {
     public function testEvent()
     {