Merge branch 'master' of https://github.com/brianlmoon/net_gearman into timeout_close_refactor

Author: brianlmoon

.gitignore

@@ -1,3 +1,8 @@
+# Test files
 tests/tests-config.php
 tests/report*
-tests/run-tests.log
+tests/run-tests.log
+
+# Dependencies
+vendor
+composer.lock

Net/Gearman/Manager.php

@@ -60,28 +60,30 @@ class Net_Gearman_Manager
     /**
      * Constructor
      *
-     * @param string  $server  Host and port (e.g. 'localhost:7003')
+     * @param string  $server  Host and port (e.g. 'localhost:4730')
      * @param integer $timeout Connection timeout
      *
      * @throws Net_Gearman_Exception
      * @see Net_Gearman_Manager::$conn
      */
-    public function __construct($server, $timeout = 5)
+    public function __construct($server = null, $timeout = 5)
     {
-        if (strpos($server, ':')) {
-            list($host, $port) = explode(':', $server);
-        } else {
-            $host = $server;
-            $port = 4730;
-        }
+        if (func_num_args() > 0) {
+            if (strpos($server, ':')) {
+                list($host, $port) = explode(':', $server);
+            } else {
+                $host = $server;
+                $port = 4730;
+            }
 
-        $errCode    = 0;
-        $errMsg     = '';
-        $this->conn = @fsockopen($host, $port, $errCode, $errMsg, $timeout);
-        if ($this->conn === false) {
-            throw new Net_Gearman_Exception(
-                'Could not connect to ' . $host . ':' . $port
-            );
+            $errCode    = 0;
+            $errMsg     = '';
+            $this->conn = @fsockopen($host, $port, $errCode, $errMsg, $timeout);
+            if ($this->conn === false) {
+                throw new Net_Gearman_Exception(
+                    'Could not connect to ' . $host . ':' . $port
+                );
+            }
         }
     }
 
@@ -133,25 +135,35 @@ public function shutdown($graceful = false)
     public function workers()
     {
         $this->sendCommand('workers');
-        $res     = $this->recvCommand();
+        $res = $this->recvCommand();
+        return $this->parseWorkersResponse($res);
+    }
+
+    /**
+     * Parses a 'workers' response payload
+     * @param  string $res Response payload from a `workers` command
+     * @return array
+     */
+    public function parseWorkersResponse($res)
+    {
         $workers = array();
         $tmp     = explode("\n", $res);
         foreach ($tmp as $t) {
             if (!Net_Gearman_Connection::stringLength($t)) {
                 continue;
             }
 
-            list($info, $abilities) = explode(':', $t);
-            list($fd, $ip, $id)     = explode(' ', trim($info));
+            $t = trim($t);
 
-            $abilities = trim($abilities);
-
-            $workers[] = array(
-                'fd' => $fd,
-                'ip' => $ip,
-                'id' => $id,
-                'abilities' => empty($abilities) ? array() : explode(' ', $abilities)
-            );
+            if (preg_match("/^(.+?) (.+?) (.+?) :(.*)$/", $t, $matches)) {
+                $abilities = trim($matches[4]);
+                $workers[] = array(
+                    'fd' => $matches[1],
+                    'ip' => $matches[2],
+                    'id' => $matches[3],
+                    'abilities' => empty($abilities) ? [] : explode(' ', $abilities)
+                );
+            }
         }
 
         return $workers;

Net/Gearman/Worker.php

@@ -751,7 +751,7 @@ protected function doWork($conn)
             $this->complete($handle, $name, $res);
         } catch (Net_Gearman_Job_Exception $e) {
             // If the factory method call fails, we won't have a job.
-            if (isset($job) && $job instanceof Net_Gearman_Job) {
+            if (isset($job) && $job instanceof Net_Gearman_Job_Common) {
                 $job->fail();
             }
 

build.xml

@@ -15,12 +15,20 @@
         "issues": "https://github.com/brianlmoon/net_gearman/issues"
     },
     "require": {
-        "php": ">=5.6.0"
+        "php": "^7.0.0"
     },
     "autoload": {
         "classmap": [ "Net/Gearman" ]
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Net\\Gearman\\Tests\\": "tests/"
+        }
+    },
     "include-path": [
         "."
-    ]
+    ],
+    "require-dev": {
+        "phpunit/phpunit": "^7.3"
+    }
 }