Merge pull request #129 from jobbyphp/closure

replace: jeremeamia/superclosure with opis/closure

Author: darkalchemy

composer.json

@@ -17,11 +17,12 @@
   "require": {
     "php": ">=5.6",
     "dragonmantank/cron-expression": "^3.0",
-    "jeremeamia/superclosure": "^2.2",
+    "opis/closure": "^3.5",
     "swiftmailer/swiftmailer": "^5.4|^6.0",
     "symfony/process": "^2.7|^3.0|^4.0|^5.0"
   },
   "require-dev": {
+    "mp091689/dump-die": "^1.0",
     "phpunit/phpunit": "^4.6",
     "symfony/filesystem": "^2.7|^3.0|^4.0|^5.0"
   },

src/BackgroundJob.php

@@ -2,10 +2,10 @@
 
 namespace Jobby;
 
+use Opis\Closure\SerializableClosure;
+
 class BackgroundJob
 {
-    use SerializerTrait;
-
     /**
      * @var Helper
      */
@@ -233,7 +233,7 @@ protected function log($message, $output = 'stdout')
 
     protected function runFunction()
     {
-        $command = $this->getSerializer()->unserialize($this->config['closure']);
+        $command = unserialize($this->config['closure']);
 
         ob_start();
         try {

src/Jobby.php

@@ -4,13 +4,11 @@
 
 use Closure;
 use DateTimeImmutable;
-use SuperClosure\SerializableClosure;
+use Opis\Closure\SerializableClosure;
 use Symfony\Component\Process\PhpExecutableFinder;
 
 class Jobby
 {
-    use SerializerTrait;
-
     /**
      * @var array
      */
@@ -207,7 +205,8 @@ protected function runWindows($job, array $config)
     protected function getExecutableCommand($job, array $config)
     {
         if (isset($config['closure'])) {
-            $config['closure'] = $this->getSerializer()->serialize($config['closure']);
+            $wrapper = new SerializableClosure($config['closure']);
+            $config['closure'] = serialize($wrapper);
         }
 
         if (strpos(__DIR__, 'phar://') === 0) {

src/SerializerTrait.php

@@ -4,16 +4,14 @@
 
 use Jobby\BackgroundJob;
 use Jobby\Helper;
-use Jobby\SerializerTrait;
+use Opis\Closure\SerializableClosure;
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * @coversDefaultClass Jobby\BackgroundJob
  */
 class BackgroundJobTest extends \PHPUnit_Framework_TestCase
 {
-    use SerializerTrait;
-
     const JOB_NAME = 'name';
 
     /**
@@ -370,7 +368,8 @@ private function getJobConfig(array $config)
         $helper = new Helper();
 
         if (isset($config['closure'])) {
-            $config['closure'] = $this->getSerializer()->serialize($config['closure']);
+            $wrapper = new SerializableClosure($config['closure']);
+            $config['closure'] = serialize($wrapper);
         }
 
         return array_merge(

tests/BackgroundJobTest.php

@@ -4,7 +4,7 @@
 
 use Jobby\Helper;
 use Jobby\Jobby;
-use SuperClosure\SerializableClosure;
+use Opis\Closure\SerializableClosure;
 
 /**
  * @coversDefaultClass Jobby\Jobby
@@ -97,7 +97,7 @@ public function testBackgroundProcessIsNotSpawnedIfJobIsNotDueToBeRun()
      * @covers ::add
      * @covers ::run
      */
-    public function testSuperClosure()
+    public function testOpisClosure()
     {
         $fn = static function () {
             echo 'Another function!';
@@ -106,10 +106,15 @@ public function testSuperClosure()
         };
 
         $jobby = new Jobby();
+        $wrapper = new SerializableClosure($fn);
+        $serialized = serialize($wrapper);
+        $wrapper = unserialize($serialized);
+        $closure = $wrapper->getClosure();
+
         $jobby->add(
             'HelloWorldClosure',
             [
-                'command'  => new SerializableClosure($fn),
+                'command'  => $closure,
                 'schedule' => '* * * * *',
                 'output'   => $this->logFile,
             ]