More patches for cakePHP 3

.gitignore

@@ -2,4 +2,6 @@
 /composer.phar
 /node_modules/
 /build/
-/.idea/
+/.idea/
+src/tmp/*
+!src/tmp/empty

src/CakeResqueBootstrap.php

@@ -18,10 +18,30 @@
  * @since         0.5
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+include getenv('APP') . '../config/bootstrap.php';
 use Cake\Console\ShellDispatcher;
-use Cake\Console\Shell;
-use CakeResque\Resque_Job_Creator;
 
-define('APP', getenv('APP'));
+class Resque_Job_Creator
+{
 
-new ShellDispatcher($argv);
+    /**
+     * Create and return a job instance
+     *
+     * @param string $className className of the job to instanciate
+     * @param array $args Array of method name and arguments used to build the job
+     * @return object $args a job instance
+     * @throws Resque_Exception when the class is not found, or does not follow the job file convention
+     */
+    public static function createJob($className, $args)
+    {
+        if (!class_exists('Cake\Console\ShellDispatcher')) {
+            throw new Resque_Exception('Resque_Job_Creator could not find Cake\Console\ShellDispatcher.');
+        }
+
+        array_unshift($args, 'void', $className);
+        $args[] = '-q';
+
+        return [new Cake\Console\ShellDispatcher($args),'dispatch'];
+
+    }
+}

src/Shell/CakeResqueShell.php

@@ -316,6 +316,9 @@ public function getOptionParser()
             ])
             ->addSubcommand('load', [
                 'help' => __d('cake_resque', 'Load a set of predefined workers.'),
+            ])
+            ->addSubcommand('enqueue', [
+                'help' => __d('cake_resque', 'Enqueue a job.'),
             ]);
     }
 
@@ -1270,7 +1273,7 @@ public function stats()
                 $this->out("\t   - " . __d('cake_resque', 'Delayed Jobs') . "   : " . $delayedJobCount);
 
                 if ($delayedJobCount > 0) {
-                    $this->out("\t   - " . __d('cake_resque', 'Next Job on') . "    : " . strftime('%a %b %d %H:%M:%S %Z %Y', $schedulerWorker->nextDelayedTimestamp()));
+                    $this->out("\t   - " . __d('cake_resque', 'Next Job on') . "    : " . strftime('%a %b %d %H:%M:%S %Z %Y', $schedulerWorker->nextDelayedTimestamp(null,true)));
                 }
             }
             $this->out("\n");