formatting

laravel · Apr 21, 2017 · 8510bf9 · 8510bf9
1 parent 465805d
commit 8510bf9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/src/Illuminate/Queue/Console/ListenCommand.php b/src/Illuminate/Queue/Console/ListenCommand.php
@@ -83,7 +83,7 @@ protected function getQueue($connection)
             "queue.connections.{$connection}.queue", 'default'
         );
 
-        return $this->laravel['config']->get('queue.prefix', null).$queue;
+        return $this->laravel['config']->get('queue.prefix').$queue;
     }
 
     /**

diff --git a/src/Illuminate/Queue/Console/WorkCommand.php b/src/Illuminate/Queue/Console/WorkCommand.php
@@ -200,7 +200,7 @@ protected function getQueue($connection)
             "queue.connections.{$connection}.queue", 'default'
         );
 
-        return $this->laravel['config']->get('queue.prefix', null).$queue;
+        return $this->laravel['config']->get('queue.prefix').$queue;
     }
 
     /**

diff --git a/src/Illuminate/Queue/Queue.php b/src/Illuminate/Queue/Queue.php
@@ -186,18 +186,7 @@ public function setConnectionName($name)
     }
 
     /**
-     * Set the IoC container instance.
-     *
-     * @param  \Illuminate\Container\Container  $container
-     * @return void
-     */
-    public function setContainer(Container $container)
-    {
-        $this->container = $container;
-    }
-
-    /**
-     * Set the queue prefix.
+     * Set the queue name prefix.
      *
      * @param  string  $prefix
      * @return $this
@@ -210,12 +199,23 @@ public function setQueuePrefix($prefix = null)
     }
 
     /**
-     * Get the queue prefix.
+     * Get the queue name prefix.
      *
      * @return string
      */
     public function getQueuePrefix()
     {
         return $this->queuePrefix;
     }
+
+    /**
+     * Set the IoC container instance.
+     *
+     * @param  \Illuminate\Container\Container  $container
+     * @return void
+     */
+    public function setContainer(Container $container)
+    {
+        $this->container = $container;
+    }
 }
diff --git a/src/Illuminate/Queue/QueueManager.php b/src/Illuminate/Queue/QueueManager.php
@@ -234,24 +234,24 @@ public function setDefaultDriver($name)
     }
 
     /**
-     * Get the name of the queue prefix.
+     * Get the full name for the given connection.
      *
+     * @param  string  $connection
      * @return string
      */
-    public function getQueuePrefix()
+    public function getName($connection = null)
     {
-        return $this->app['config']->get('queue.prefix');
+        return $connection ?: $this->getDefaultDriver();
     }
 
     /**
-     * Get the full name for the given connection.
+     * Get the queue name prefix.
      *
-     * @param  string  $connection
      * @return string
      */
-    public function getName($connection = null)
+    public function getQueuePrefix()
     {
-        return $connection ?: $this->getDefaultDriver();
+        return $this->app['config']->get('queue.prefix');
     }
 
     /**