formatting

src/Illuminate/Contracts/Database/ModelIdentifier.php

@@ -11,13 +11,6 @@ class ModelIdentifier
      */
     public $class;
 
-    /**
-     * The connection name of the model.
-     *
-     * @var string|null
-     */
-    public $connection;
-
     /**
      * The unique identifier of the model.
      *
@@ -27,18 +20,25 @@ class ModelIdentifier
      */
     public $id;
 
+    /**
+     * The connection name of the model.
+     *
+     * @var string|null
+     */
+    public $connection;
+
     /**
      * Create a new model identifier.
      *
      * @param  string  $class
-     * @param  mixed  $connection
      * @param  mixed  $id
+     * @param  mixed  $connection
      * @return void
      */
-    public function __construct($class, $connection, $id)
+    public function __construct($class, $id, $connection)
     {
         $this->id = $id;
-        $this->connection = $connection;
         $this->class = $class;
+        $this->connection = $connection;
     }
 }

src/Illuminate/Contracts/Queue/QueueableCollection.php

@@ -12,16 +12,16 @@ interface QueueableCollection
     public function getQueueableClass();
 
     /**
-     * Get the connection of the entities being queued.
+     * Get the identifiers for all of the entities.
      *
-     * @return string|null
+     * @return array
      */
-    public function getQueueableConnection();
+    public function getQueueableIds();
 
     /**
-     * Get the identifiers for all of the entities.
+     * Get the connection of the entities being queued.
      *
-     * @return array
+     * @return string|null
      */
-    public function getQueueableIds();
+    public function getQueueableConnection();
 }

src/Illuminate/Database/Eloquent/Collection.php

@@ -357,6 +357,16 @@ public function getQueueableClass()
         return $class;
     }
 
+    /**
+     * Get the identifiers for all of the entities.
+     *
+     * @return array
+     */
+    public function getQueueableIds()
+    {
+        return $this->modelKeys();
+    }
+
     /**
      * Get the connection of the entities being queued.
      *
@@ -378,14 +388,4 @@ public function getQueueableConnection()
 
         return $connection;
     }
-
-    /**
-     * Get the identifiers for all of the entities.
-     *
-     * @return array
-     */
-    public function getQueueableIds()
-    {
-        return $this->modelKeys();
-    }
 }

src/Illuminate/Database/Eloquent/Model.php

@@ -1200,7 +1200,7 @@ public function getQueueableId()
     }
 
     /**
-     * Get the queueable identity for the entity.
+     * Get the queueable connection for the entity.
      *
      * @return mixed
      */

src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php

@@ -18,11 +18,19 @@ trait SerializesAndRestoresModelIdentifiers
     protected function getSerializedPropertyValue($value)
     {
         if ($value instanceof QueueableCollection) {
-            return new ModelIdentifier($value->getQueueableClass(), $value->getQueueableConnection(), $value->getQueueableIds());
+            return new ModelIdentifier(
+                $value->getQueueableClass(),
+                $value->getQueueableIds(),
+                $value->getQueueableConnection()
+            );
         }
 
         if ($value instanceof QueueableEntity) {
-            return new ModelIdentifier(get_class($value), $value->getQueueableConnection(), $value->getQueueableId());
+            return new ModelIdentifier(
+                get_class($value),
+                $value->getQueueableId(),
+                $value->getQueueableConnection()
+            );
         }
 
         return $value;