Skip to content

Commit 046fef3

Browse files
Merge branch '7.x'
2 parents 728474f + d559409 commit 046fef3

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

CHANGELOG-6.x.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Release Notes for 6.x
22

3-
## [Unreleased](https://github.com/laravel/framework/compare/v6.18.16...6.x)
3+
## [Unreleased](https://github.com/laravel/framework/compare/v6.18.17...6.x)
4+
5+
6+
## [v6.18.17 (2020-06-02)](https://github.com/laravel/framework/compare/v6.18.16...v6.18.17)
7+
8+
### Added
9+
- Support PHP 8's reflection API ([#33039](https://github.com/laravel/framework/pull/33039))
410

511
### Fixed
612
- Fixed `Illuminate\Database\Eloquent\Collection::getQueueableRelations()` ([00e9ed7](https://github.com/laravel/framework/commit/00e9ed76483ea6ad1264676e7b1095b23e16a433))

src/Illuminate/Bus/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
}
3232
},
3333
"suggest": {
34-
"illuminate/queue": "Required to use closures when chaining jobs (^7.0)"
34+
"illuminate/queue": "Required to use closures when chaining jobs (^7.0)."
3535
},
3636
"config": {
3737
"sort-packages": true

src/Illuminate/Console/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
"suggest": {
3636
"dragonmantank/cron-expression": "Required to use scheduler (^3.0).",
3737
"guzzlehttp/guzzle": "Required to use the ping methods on schedules (^6.3.1|^7.0).",
38-
"illuminate/bus": "Required to use the scheduled job dispatcher (^8.0)",
39-
"illuminate/container": "Required to use the scheduler (^8.0)",
40-
"illuminate/filesystem": "Required to use the generator command (^8.0)",
41-
"illuminate/queue": "Required to use closures for scheduled jobs (^8.0)"
38+
"illuminate/bus": "Required to use the scheduled job dispatcher (^8.0).",
39+
"illuminate/container": "Required to use the scheduler (^8.0).",
40+
"illuminate/filesystem": "Required to use the generator command (^8.0).",
41+
"illuminate/queue": "Required to use closures for scheduled jobs (^8.0)."
4242
},
4343
"config": {
4444
"sort-packages": true

src/Illuminate/Filesystem/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
}
3333
},
3434
"suggest": {
35-
"illuminate/http": "Required for handling uploaded files (^7.0)",
35+
"illuminate/http": "Required for handling uploaded files (^7.0).",
3636
"league/flysystem": "Required to use the Flysystem local and FTP drivers (^1.0.34).",
3737
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
3838
"league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
3939
"league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
40-
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0)"
40+
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0)."
4141
},
4242
"config": {
4343
"sort-packages": true

src/Illuminate/Foundation/Console/StorageLinkCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Illuminate\Foundation\Console;
44

5-
use Exception;
65
use Illuminate\Console\Command;
6+
use RuntimeException;
77
use Symfony\Component\Filesystem\Filesystem as SymfonyFilesystem;
88

99
class StorageLinkCommand extends Command
@@ -67,7 +67,7 @@ protected function links()
6767
protected function getRelativeTarget($link, $target)
6868
{
6969
if (! class_exists(SymfonyFilesystem::class)) {
70-
throw new Exception('Please install the symfony/filesystem Composer package to create relative links.');
70+
throw new RuntimeException('To enable support for relative links, please install symfony/filesystem.');
7171
}
7272

7373
return (new SymfonyFilesystem)->makePathRelative($target, dirname($link));

0 commit comments

Comments
 (0)