Merge remote-tracking branch 'github/2.0'

Author: JanHuang

helpers.php

@@ -152,3 +152,15 @@ function process_is_running($keyword)
     return empty($output) ? false : true;
 }
 
+/**
+ * @param $port
+ * @return bool
+ */
+function port_is_running($port)
+{
+    $command = "lsof -i:{$port}";
+
+    exec($command, $output);
+
+    return empty($output) ? false : true;
+}

src/Server.php

@@ -544,11 +544,15 @@ public function watch(array $directories = ['.'])
      */
     public function isRunning()
     {
-        if (file_exists($this->pidFile)) {
-            return process_kill((int) file_get_contents($this->pidFile), 0);
+        if (file_exists($this->config['pid_file'])) {
+            return posix_kill(file_get_contents($this->config['pid_file']), 0);
+        }
+
+        if ($is_running = process_is_running("{$this->name} master")) {
+            $is_running = port_is_running($this->port);
         }
 
-        return process_is_running("{$this->name} master");
+        return $is_running;
     }
 
     /**