PLT-299 Remove Resque event listeners from JobBase constructor (#147)

* PLT-299 Remove Resque event listeners from JobBase constructor
* Improve how tests run in CI
* Define job property, self-injected by Resque_Job
* Update requirements in README

.circleci/config.yml

@@ -16,8 +16,11 @@ jobs:
     steps:
       - checkout
       - run: composer install
-      - run: ./vendor/bin/phpunit test/unit
-      - run: ./vendor/bin/phpunit test/performance
+      - run: composer test -- --log-junit test-results/junit.xml
+      - store_test_results:
+          path: test-results/junit.xml
+      - store_artifacts:
+          path: test-results/junit.xml
 
 workflows:
   build_and_test:

.gitignore

@@ -8,6 +8,7 @@ tags
 atlassian-ide-plugin.xml
 
 composer.lock
+test-results
 
 test/performance/rest-interface/.vagrant/
 test/performance/rest-interface/config/tripod-config-*.json

README.md

@@ -30,6 +30,10 @@ Quickstart
 ```php
 require_once("tripod.inc.php");
 
+// Queue worker must register these event listeners
+Resque_Event::listen('beforePerform', [\Tripod\Mongo\Jobs\JobBase::class, 'beforePerform']);
+Resque_Event::listen('onFailure', [\Tripod\Mongo\Jobs\JobBase::class, 'onFailure']);
+
 \Tripod\Config::setConfig($conf); // set the config, usually read in as JSON from a file
 
 $tripod = new Driver(
@@ -79,9 +83,9 @@ $tripod->saveChanges(
 Requirements
 ----
 
-PHP >= 5.4.x
+PHP >= 5.5
 
-Mongo 2.6.x and up.
+Mongo 3.2.x and up.
 
 MongoDB PHP driver version. http://mongodb.github.io/mongo-php-driver/#installation
 

composer.json

@@ -34,5 +34,8 @@
     },
     "autoload": {
         "classmap": ["src/"]
+    },
+    "scripts": {
+        "test": "phpunit"
     }
 }

phpunit.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="./test/bootstrap.php">
+    <php>
+        <ini name="memory_limit" value="512M" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Tripod_Performance_Tests">
+            <directory>test/performance</directory>
+        </testsuite>
+        <testsuite name="Tripod_Unit_Tests">
+            <directory>test/unit</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

src/mongo/base/JobBase.class.php

@@ -15,6 +15,24 @@
  */
 abstract class JobBase extends \Tripod\Mongo\DriverBase
 {
+    /**
+     * Resque Job arguments, set by Resque_Job_Factory
+     * @var array
+     */
+    public $args;
+
+    /**
+     * Resque Job queue, set by Resque_Job_Factory
+     * @var string
+     */
+    public $queue;
+
+    /**
+     * Resque Job
+     * @var \Resque_Job
+     */
+    public $job;
+
     private $tripod;
     const TRIPOD_CONFIG_KEY = 'tripodConfig';
     const TRIPOD_CONFIG_GENERATOR = 'tripodConfigGenerator';
@@ -29,12 +47,6 @@ abstract class JobBase extends \Tripod\Mongo\DriverBase
     /** @var \Tripod\Timer */
     protected $timer;
 
-    public function __construct()
-    {
-        \Resque_Event::listen('beforePerform', [self::class, 'beforePerform']);
-        \Resque_Event::listen('onFailure', [self::class, 'onFailure']);
-    }
-
     /**
      * The main method of the job
      *

test/bootstrap.php

@@ -0,0 +1,7 @@
+<?php
+
+require_once __DIR__ . '/../vendor/autoload.php';
+
+// Queue worker must register these event listeners
+Resque_Event::listen('beforePerform', [\Tripod\Mongo\Jobs\JobBase::class, 'beforePerform']);
+Resque_Event::listen('onFailure', [\Tripod\Mongo\Jobs\JobBase::class, 'onFailure']);

test/unit/mongo/MongoTripodConfigTest.php → test/unit/mongo/MongoTripodConfigUnitTest.php

@@ -6,7 +6,7 @@
 use \MongoDB\Client;
 use \MongoDB\Driver\Exception\ConnectionTimeoutException;
 
-class MongoTripodConfigTest extends MongoTripodTestBase
+class MongoTripodConfigUnitTest extends MongoTripodTestBase
 {
     /**
      * @var \Tripod\Mongo\Config