Skip to content

Commit 1ac281b

Browse files
GrahamCampbellGrahamCampbell
committed
Merge branch '8.x' into 9.x
2 parents 9138ffd + d3ff07d commit 1ac281b

19 files changed

+100
-83
lines changed

‎src/Illuminate/Auth/EloquentUserProvider.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ public function retrieveByToken($identifier, $token)
8080

8181
$rememberToken = $retrievedModel->getRememberToken();
8282

83-
return $rememberToken && hash_equals($rememberToken, $token)
84-
? $retrievedModel : null;
83+
return $rememberToken && hash_equals($rememberToken, $token) ? $retrievedModel : null;
8584
}
8685

8786
/**

‎src/Illuminate/Database/Eloquent/Builder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,8 +1910,8 @@ public static function __callStatic($method, $parameters)
19101910
protected static function registerMixin($mixin, $replace)
19111911
{
19121912
$methods = (new ReflectionClass($mixin))->getMethods(
1913-
ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED
1914-
);
1913+
ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED
1914+
);
19151915

19161916
foreach ($methods as $method) {
19171917
if ($replace || ! static::hasGlobalMacro($method->name)) {

‎src/Illuminate/Foundation/Auth/EmailVerificationRequest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@ class EmailVerificationRequest extends FormRequest
1414
*/
1515
public function authorize()
1616
{
17-
if (! hash_equals((string) $this->user()->getKey(),
18-
(string) $this->route('id'))) {
17+
if (! hash_equals((string) $this->user()->getKey(), (string) $this->route('id'))) {
1918
return false;
2019
}
2120

22-
if (! hash_equals(sha1($this->user()->getEmailForVerification()),
23-
(string) $this->route('hash'))) {
21+
if (! hash_equals(sha1($this->user()->getEmailForVerification()), (string) $this->route('hash'))) {
2422
return false;
2523
}
2624

‎src/Illuminate/Queue/Console/ClearCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function handle()
5959
// connection being run for the queue operation currently being executed.
6060
$queueName = $this->getQueue($connection);
6161

62-
$queue = ($this->laravel['queue'])->connection($connection);
62+
$queue = $this->laravel['queue']->connection($connection);
6363

6464
if ($queue instanceof ClearableQueue) {
6565
$count = $queue->clear($queueName);

‎src/Illuminate/Queue/Console/WorkCommand.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,12 @@ public function handle()
140140
*/
141141
protected function runWorker($connection, $queue)
142142
{
143-
return $this->worker->setName($this->option('name'))
144-
->setCache($this->cache)
145-
->{$this->option('once') ? 'runNextJob' : 'daemon'}(
146-
$connection, $queue, $this->gatherWorkerOptions()
147-
);
143+
return $this->worker
144+
->setName($this->option('name'))
145+
->setCache($this->cache)
146+
->{$this->option('once') ? 'runNextJob' : 'daemon'}(
147+
$connection, $queue, $this->gatherWorkerOptions()
148+
);
148149
}
149150

150151
/**

‎src/Illuminate/Redis/Connectors/PhpRedisConnector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ protected function establishConnection($client, array $config)
158158
$parameters[] = $context;
159159
}
160160

161-
$client->{($persistent ? 'pconnect' : 'connect')}(...$parameters);
161+
$client->{$persistent ? 'pconnect' : 'connect'}(...$parameters);
162162
}
163163

164164
/**

‎src/Illuminate/Testing/PendingCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ protected function verifyExpectations()
368368
protected function mockConsoleOutput()
369369
{
370370
$mock = Mockery::mock(OutputStyle::class.'[askQuestion]', [
371-
(new ArrayInput($this->parameters)), $this->createABufferedOutputMock(),
371+
new ArrayInput($this->parameters), $this->createABufferedOutputMock(),
372372
]);
373373

374374
foreach ($this->test->expectedQuestions as $i => $question) {

‎src/Illuminate/Testing/TestComponent.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function assertSee($value, $escape = true)
6060
*/
6161
public function assertSeeInOrder(array $values, $escape = true)
6262
{
63-
$values = $escape ? array_map('e', ($values)) : $values;
63+
$values = $escape ? array_map('e', $values) : $values;
6464

6565
PHPUnit::assertThat($values, new SeeInOrder($this->rendered));
6666

@@ -92,7 +92,7 @@ public function assertSeeText($value, $escape = true)
9292
*/
9393
public function assertSeeTextInOrder(array $values, $escape = true)
9494
{
95-
$values = $escape ? array_map('e', ($values)) : $values;
95+
$values = $escape ? array_map('e', $values) : $values;
9696

9797
PHPUnit::assertThat($values, new SeeInOrder(strip_tags($this->rendered)));
9898

‎src/Illuminate/Testing/TestResponse.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ public function assertSee($value, $escape = true)
596596
{
597597
$value = Arr::wrap($value);
598598

599-
$values = $escape ? array_map('e', ($value)) : $value;
599+
$values = $escape ? array_map('e', $value) : $value;
600600

601601
foreach ($values as $value) {
602602
PHPUnit::assertStringContainsString((string) $value, $this->getContent());
@@ -614,7 +614,7 @@ public function assertSee($value, $escape = true)
614614
*/
615615
public function assertSeeInOrder(array $values, $escape = true)
616616
{
617-
$values = $escape ? array_map('e', ($values)) : $values;
617+
$values = $escape ? array_map('e', $values) : $values;
618618

619619
PHPUnit::assertThat($values, new SeeInOrder($this->getContent()));
620620

@@ -632,7 +632,7 @@ public function assertSeeText($value, $escape = true)
632632
{
633633
$value = Arr::wrap($value);
634634

635-
$values = $escape ? array_map('e', ($value)) : $value;
635+
$values = $escape ? array_map('e', $value) : $value;
636636

637637
$content = strip_tags($this->getContent());
638638

@@ -652,7 +652,7 @@ public function assertSeeText($value, $escape = true)
652652
*/
653653
public function assertSeeTextInOrder(array $values, $escape = true)
654654
{
655-
$values = $escape ? array_map('e', ($values)) : $values;
655+
$values = $escape ? array_map('e', $values) : $values;
656656

657657
PHPUnit::assertThat($values, new SeeInOrder(strip_tags($this->getContent())));
658658

@@ -670,7 +670,7 @@ public function assertDontSee($value, $escape = true)
670670
{
671671
$value = Arr::wrap($value);
672672

673-
$values = $escape ? array_map('e', ($value)) : $value;
673+
$values = $escape ? array_map('e', $value) : $value;
674674

675675
foreach ($values as $value) {
676676
PHPUnit::assertStringNotContainsString((string) $value, $this->getContent());
@@ -690,7 +690,7 @@ public function assertDontSeeText($value, $escape = true)
690690
{
691691
$value = Arr::wrap($value);
692692

693-
$values = $escape ? array_map('e', ($value)) : $value;
693+
$values = $escape ? array_map('e', $value) : $value;
694694

695695
$content = strip_tags($this->getContent());
696696

‎src/Illuminate/Testing/TestView.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function assertSee($value, $escape = true)
131131
*/
132132
public function assertSeeInOrder(array $values, $escape = true)
133133
{
134-
$values = $escape ? array_map('e', ($values)) : $values;
134+
$values = $escape ? array_map('e', $values) : $values;
135135

136136
PHPUnit::assertThat($values, new SeeInOrder($this->rendered));
137137

@@ -163,7 +163,7 @@ public function assertSeeText($value, $escape = true)
163163
*/
164164
public function assertSeeTextInOrder(array $values, $escape = true)
165165
{
166-
$values = $escape ? array_map('e', ($values)) : $values;
166+
$values = $escape ? array_map('e', $values) : $values;
167167

168168
PHPUnit::assertThat($values, new SeeInOrder(strip_tags($this->rendered)));
169169

0 commit comments

Comments
 (0)