Skip to content

Commit

Permalink
styleCI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
browner12 committed Sep 14, 2017
1 parent 85c1081 commit 3c3c877
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 18 deletions.
31 changes: 14 additions & 17 deletions src/Illuminate/Database/Eloquent/Model.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

namespace Illuminate\Database\Eloquent;

use Exception;
use ArrayAccess;
use JsonSerializable;
use BadMethodCallException;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Illuminate\Contracts\Support\Jsonable;
use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Contracts\Routing\UrlRoutable;
use Exception;
use Illuminate\Contracts\Queue\QueueableCollection;
use Illuminate\Contracts\Queue\QueueableEntity;
use Illuminate\Contracts\Routing\UrlRoutable;
use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Contracts\Support\Jsonable;
use Illuminate\Database\ConnectionResolverInterface as Resolver;
use Illuminate\Database\Eloquent\Relations\Pivot;
use Illuminate\Contracts\Queue\QueueableCollection;
use Illuminate\Database\Query\Builder as QueryBuilder;
use Illuminate\Database\ConnectionResolverInterface as Resolver;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use JsonSerializable;

/**
* @mixin \Illuminate\Database\Eloquent\Builder
Expand Down Expand Up @@ -1260,20 +1260,17 @@ public function getQueueableRelations()
{
$relations = [];

foreach ($this->getRelations() as $key => $relation){

foreach ($this->getRelations() as $key => $relation) {
$relations[] = $key;

if ($relation instanceof QueueableCollection)
{
foreach($relation->getQueueableRelations() as $collectionKey => $collectionValue){
if ($relation instanceof QueueableCollection) {
foreach ($relation->getQueueableRelations() as $collectionKey => $collectionValue) {
$relations[] = $key . '.' . $collectionKey;
}
}

if ($relation instanceof QueueableEntity)
{
foreach($relation->getQueueableRelations() as $entityKey => $entityValue){
if ($relation instanceof QueueableEntity) {
foreach ($relation->getQueueableRelations() as $entityKey => $entityValue) {
$relations[] = $key . '.' . $entityValue;
}
}
Expand Down
1 change: 0 additions & 1 deletion tests/Integration/Queue/ModelSerializationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ public function setUp()

Schema::create('products', function ($table) {
$table->increments('id');

});
}

Expand Down

0 comments on commit 3c3c877

Please sign in to comment.