Skip to content

Commit 9107ea6

Browse files
TBlindarukTBlindaruk
committed
Merge remote-tracking branch 'upstream/6.x' into 6.x
2 parents 29b6d5f + 5e55aa4 commit 9107ea6

27 files changed

+71
-83
lines changed

‎src/Illuminate/Cache/Repository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ protected function event($event)
550550
/**
551551
* Get the event dispatcher instance.
552552
*
553-
* @return \Illuminate\Contracts\Events\Dispatcher
553+
* @return \Illuminate\Contracts\Events\Dispatcher
554554
*/
555555
public function getEventDispatcher()
556556
{

‎src/Illuminate/Container/Container.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,6 @@ protected function fireAfterResolvingCallbacks($abstract, $object)
10731073
* @param string $abstract
10741074
* @param object $object
10751075
* @param array $callbacksPerType
1076-
*
10771076
* @return array
10781077
*/
10791078
protected function getCallbacksForType($abstract, $object, array $callbacksPerType)

‎src/Illuminate/Contracts/Foundation/Application.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ public function basePath($path = '');
2525
/**
2626
* Get the path to the bootstrap directory.
2727
*
28-
* @param string $path Optionally, a path to append to the bootstrap path
28+
* @param string $path
2929
* @return string
3030
*/
3131
public function bootstrapPath($path = '');
3232

3333
/**
3434
* Get the path to the application configuration files.
3535
*
36-
* @param string $path Optionally, a path to append to the config path
36+
* @param string $path
3737
* @return string
3838
*/
3939
public function configPath($path = '');
4040

4141
/**
4242
* Get the path to the database directory.
4343
*
44-
* @param string $path Optionally, a path to append to the database path
44+
* @param string $path
4545
* @return string
4646
*/
4747
public function databasePath($path = '');

‎src/Illuminate/Database/DetectsLostConnections.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ protected function causedByLostConnection(Throwable $e)
5454
'SQLSTATE[08S01]: Communication link failure',
5555
'SQLSTATE[08006] [7] could not connect to server: Connection refused Is the server running on host',
5656
'SQLSTATE[HY000]: General error: 7 SSL SYSCALL error: No route to host',
57+
'The client was disconnected by the server because of inactivity. See wait_timeout and interactive_timeout for configuring this behavior.',
5758
]);
5859
}
5960
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ public function keys()
463463
/**
464464
* Zip the collection together with one or more arrays.
465465
*
466-
* @param mixed ...$items
466+
* @param mixed ...$items
467467
* @return \Illuminate\Support\Collection
468468
*/
469469
public function zip($items)

‎src/Illuminate/Database/Eloquent/Relations/BelongsTo.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class BelongsTo extends Relation
5252
* @param string $foreignKey
5353
* @param string $ownerKey
5454
* @param string $relationName
55-
*
5655
* @return void
5756
*/
5857
public function __construct(Builder $query, Model $child, $foreignKey, $ownerKey, $relationName)

‎src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ protected function typeDateTime(Fluent $column)
625625
* Create the column definition for a date-time (with time zone) type.
626626
*
627627
* Note: "SQLite does not have a storage class set aside for storing dates and/or times."
628+
*
628629
* @link https://www.sqlite.org/datatype3.html
629630
*
630631
* @param \Illuminate\Support\Fluent $column

‎src/Illuminate/Foundation/Application.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
3131
*
3232
* @var string
3333
*/
34-
const VERSION = '6.20.34';
34+
const VERSION = '6.20.35';
3535

3636
/**
3737
* The base path for the Laravel installation.
@@ -333,7 +333,7 @@ public function useAppPath($path)
333333
/**
334334
* Get the base path of the Laravel installation.
335335
*
336-
* @param string $path Optionally, a path to append to the base path
336+
* @param string $path
337337
* @return string
338338
*/
339339
public function basePath($path = '')
@@ -344,7 +344,7 @@ public function basePath($path = '')
344344
/**
345345
* Get the path to the bootstrap directory.
346346
*
347-
* @param string $path Optionally, a path to append to the bootstrap path
347+
* @param string $path
348348
* @return string
349349
*/
350350
public function bootstrapPath($path = '')
@@ -355,7 +355,7 @@ public function bootstrapPath($path = '')
355355
/**
356356
* Get the path to the application configuration files.
357357
*
358-
* @param string $path Optionally, a path to append to the config path
358+
* @param string $path
359359
* @return string
360360
*/
361361
public function configPath($path = '')
@@ -366,7 +366,7 @@ public function configPath($path = '')
366366
/**
367367
* Get the path to the database directory.
368368
*
369-
* @param string $path Optionally, a path to append to the database path
369+
* @param string $path
370370
* @return string
371371
*/
372372
public function databasePath($path = '')

‎src/Illuminate/Foundation/Testing/Constraints/ArraySubset.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ final class ArraySubset extends Constraint
2727
/**
2828
* Create a new array subset constraint instance.
2929
*
30-
* @param iterable $subset
31-
* @param bool $strict
30+
* @param iterable $subset
31+
* @param bool $strict
3232
* @return void
3333
*/
3434
public function __construct(iterable $subset, bool $strict = false)
@@ -91,9 +91,9 @@ public function evaluate($other, string $description = '', bool $returnResult =
9191
/**
9292
* Returns a string representation of the constraint.
9393
*
94-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
95-
*
9694
* @return string
95+
*
96+
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
9797
*/
9898
public function toString(): string
9999
{
@@ -162,8 +162,8 @@ final class ArraySubset extends Constraint
162162
/**
163163
* Create a new array subset constraint instance.
164164
*
165-
* @param iterable $subset
166-
* @param bool $strict
165+
* @param iterable $subset
166+
* @param bool $strict
167167
* @return void
168168
*/
169169
public function __construct(iterable $subset, bool $strict = false)
@@ -224,9 +224,9 @@ public function evaluate($other, string $description = '', bool $returnResult =
224224
/**
225225
* Returns a string representation of the constraint.
226226
*
227-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
228-
*
229227
* @return string
228+
*
229+
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
230230
*/
231231
public function toString(): string
232232
{

‎src/Illuminate/Log/LogManager.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,6 @@ public function forgetChannel($driver = null)
494494
*
495495
* @param string $message
496496
* @param array $context
497-
*
498497
* @return void
499498
*/
500499
public function emergency($message, array $context = [])
@@ -510,7 +509,6 @@ public function emergency($message, array $context = [])
510509
*
511510
* @param string $message
512511
* @param array $context
513-
*
514512
* @return void
515513
*/
516514
public function alert($message, array $context = [])
@@ -525,7 +523,6 @@ public function alert($message, array $context = [])
525523
*
526524
* @param string $message
527525
* @param array $context
528-
*
529526
* @return void
530527
*/
531528
public function critical($message, array $context = [])
@@ -539,7 +536,6 @@ public function critical($message, array $context = [])
539536
*
540537
* @param string $message
541538
* @param array $context
542-
*
543539
* @return void
544540
*/
545541
public function error($message, array $context = [])
@@ -555,7 +551,6 @@ public function error($message, array $context = [])
555551
*
556552
* @param string $message
557553
* @param array $context
558-
*
559554
* @return void
560555
*/
561556
public function warning($message, array $context = [])
@@ -568,7 +563,6 @@ public function warning($message, array $context = [])
568563
*
569564
* @param string $message
570565
* @param array $context
571-
*
572566
* @return void
573567
*/
574568
public function notice($message, array $context = [])
@@ -583,7 +577,6 @@ public function notice($message, array $context = [])
583577
*
584578
* @param string $message
585579
* @param array $context
586-
*
587580
* @return void
588581
*/
589582
public function info($message, array $context = [])
@@ -596,7 +589,6 @@ public function info($message, array $context = [])
596589
*
597590
* @param string $message
598591
* @param array $context
599-
*
600592
* @return void
601593
*/
602594
public function debug($message, array $context = [])
@@ -610,7 +602,6 @@ public function debug($message, array $context = [])
610602
* @param mixed $level
611603
* @param string $message
612604
* @param array $context
613-
*
614605
* @return void
615606
*/
616607
public function log($level, $message, array $context = [])

0 commit comments

Comments
 (0)