Apply fixes from StyleCI

driesvints · StyleCIBot · commit de04af8e9be8 · 2019-04-22T19:10:46.000Z
[ci skip] [skip ci]
diff --git a/src/Illuminate/Auth/EloquentUserProvider.php b/src/Illuminate/Auth/EloquentUserProvider.php
@@ -66,7 +66,7 @@ public function retrieveByToken($identifier, $token)
         $model = $model->where($model->getAuthIdentifierName(), $identifier)->first();
 
         if (! $model) {
-            return null;
+            return;
         }
 
         $rememberToken = $model->getRememberToken();
diff --git a/src/Illuminate/Database/Eloquent/Collection.php b/src/Illuminate/Database/Eloquent/Collection.php
@@ -105,7 +105,7 @@ public function loadMissing($relations)
      * @param  array  $path
      * @return void
      */
-    protected function loadMissingRelation(Collection $models, array $path)
+    protected function loadMissingRelation(self $models, array $path)
     {
         $relation = array_splice($path, 0, 1);
 
diff --git a/src/Illuminate/Http/Resources/ConditionallyLoadsAttributes.php b/src/Illuminate/Http/Resources/ConditionallyLoadsAttributes.php
@@ -160,7 +160,7 @@ protected function whenLoaded($relationship, $value = null, $default = null)
         }
 
         if ($this->resource->{$relationship} === null) {
-            return null;
+            return;
         }
 
         return value($value);
diff --git a/src/Illuminate/Queue/DatabaseQueue.php b/src/Illuminate/Queue/DatabaseQueue.php
@@ -194,8 +194,6 @@ public function pop($queue = null)
             if ($job = $this->getNextAvailableJob($queue)) {
                 return $this->marshalJob($queue, $job);
             }
-
-            return null;
         });
     }
 
diff --git a/tests/Integration/Database/EloquentCollectionLoadMissingTest.php b/tests/Integration/Database/EloquentCollectionLoadMissingTest.php
@@ -84,7 +84,7 @@ class Comment extends Model
 
     public function parent()
     {
-        return $this->belongsTo(Comment::class);
+        return $this->belongsTo(self::class);
     }
 
     public function revisions()
diff --git a/tests/Integration/Database/EloquentModelLoadMissingTest.php b/tests/Integration/Database/EloquentModelLoadMissingTest.php
@@ -53,7 +53,7 @@ class Comment extends Model
 
     public function parent()
     {
-        return $this->belongsTo(Comment::class);
+        return $this->belongsTo(self::class);
     }
 }
 
diff --git a/tests/Integration/Support/Fixtures/NullableManager.php b/tests/Integration/Support/Fixtures/NullableManager.php
@@ -13,6 +13,5 @@ class NullableManager extends Manager
      */
     public function getDefaultDriver()
     {
-        return null;
     }
 }
diff --git a/tests/View/fixtures/section-exception-layout.php b/tests/View/fixtures/section-exception-layout.php
@@ -1 +1 @@
-<?php echo $__env->yieldContent('content'); ?>
+<?php echo $__env->yieldContent('content');

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function retrieveByToken($identifier, $token)`
`66`	`66`	`$model = $model->where($model->getAuthIdentifierName(), $identifier)->first();`
`67`	`67`
`68`	`68`	`if (! $model) {`
`69`		`- return null;`
	`69`	`+ return;`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`$rememberToken = $model->getRememberToken();`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function loadMissing($relations)`
`105`	`105`	`* @param array $path`
`106`	`106`	`* @return void`
`107`	`107`	`*/`
`108`		`- protected function loadMissingRelation(Collection $models, array $path)`
	`108`	`+ protected function loadMissingRelation(self $models, array $path)`
`109`	`109`	`{`
`110`	`110`	`$relation = array_splice($path, 0, 1);`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ protected function whenLoaded($relationship, $value = null, $default = null)`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`if ($this->resource->{$relationship} === null) {`
`163`		`- return null;`
	`163`	`+ return;`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`return value($value);`
Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,6 @@ public function pop($queue = null)`
`194`	`194`	`if ($job = $this->getNextAvailableJob($queue)) {`
`195`	`195`	`return $this->marshalJob($queue, $job);`
`196`	`196`	`}`
`197`		`-`
`198`		`- return null;`
`199`	`197`	`});`
`200`	`198`	`}`
`201`	`199`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ class Comment extends Model`
`84`	`84`
`85`	`85`	`public function parent()`
`86`	`86`	`{`
`87`		`- return $this->belongsTo(Comment::class);`
	`87`	`+ return $this->belongsTo(self::class);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public function revisions()`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class Comment extends Model`
`53`	`53`
`54`	`54`	`public function parent()`
`55`	`55`	`{`
`56`		`- return $this->belongsTo(Comment::class);`
	`56`	`+ return $this->belongsTo(self::class);`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,5 @@ class NullableManager extends Manager`
`13`	`13`	`*/`
`14`	`14`	`public function getDefaultDriver()`
`15`	`15`	`{`
`16`		`- return null;`
`17`	`16`	`}`
`18`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<?php echo $__env->yieldContent('content'); ?>`
	`1`	`+<?php echo $__env->yieldContent('content');`