Merge pull request #102 from jpirkey/fix-default-class-prefix

Fix default class prefix
brianlmoon · Sep 5, 2014 · 0e77571 · 0e77571
2 parents 73f59de + ee415e5
commit 0e77571
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/GearmanManager.php b/GearmanManager.php
@@ -451,12 +451,10 @@ protected function getopt($config = array()) {
 
         if (isset($opts['p'])) {
             $this->prefix = $opts['p'];
-        } elseif(!empty($this->config['prefix'])) {
+        } elseif(isset($this->config['prefix'])) {
             $this->prefix = $this->config['prefix'];
         } elseif(defined('NET_GEARMAN_JOB_CLASS_PREFIX')) {
             $this->prefix = NET_GEARMAN_JOB_CLASS_PREFIX;
-        } else {
-            $this->prefix = 'Net_Gearman_Job_';
         }
 
         if(isset($opts['u'])){
@@ -1219,5 +1217,3 @@ protected function show_help($msg = "") {
     }
 
 }
-
-?>
diff --git a/GearmanPearManager.php b/GearmanPearManager.php
@@ -13,6 +13,12 @@ class GearmanPearManager extends GearmanManager {
 
     private $start_time;
 
+    /**
+     * Job Class prefix to use.
+     * @var string
+     */
+    protected $prefix = 'Net_Gearman_Job_';
+
     /**
      * Starts a worker for the PEAR library
      *

diff --git a/composer.json b/composer.json
@@ -24,4 +24,4 @@
     "autoload": {
         "classmap": [ "GearmanManager.php", "GearmanPearManager.php", "GearmanPeclManager.php" ]
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,4 +24,4 @@ @@
         "autoload": {
             "classmap": [ "GearmanManager.php", "GearmanPearManager.php", "GearmanPeclManager.php" ]
         }
-    }
+    }