Skip to content

Commit 133106b

Browse files
Merge branch '7.x'
2 parents 5a86e18 + edfb09c commit 133106b

File tree

10 files changed

+30
-14
lines changed

10 files changed

+30
-14
lines changed

CHANGELOG-7.x.md

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

3-
## [Unreleased](https://github.com/laravel/framework/compare/v7.13.0...7.x)
3+
## [Unreleased](https://github.com/laravel/framework/compare/v7.14.0...7.x)
4+
5+
### Added
6+
- Added missing `symfony/mime` suggest ([#33067](https://github.com/laravel/framework/pull/33067))
7+
8+
9+
## [v7.14.0 (2020-06-02)](https://github.com/laravel/framework/compare/v7.13.0...v7.14.0)
410

511
### Added
612
- Views: make attributes available within render method ([#32978](https://github.com/laravel/framework/pull/32978))
@@ -9,6 +15,7 @@
915
- Added `Illuminate\Http\Client\Request::toPsrRequest()` ([#33016](https://github.com/laravel/framework/pull/33016))
1016
- Added `Illuminate\Support\MessageBag::addIf()` method ([50efe09](https://github.com/laravel/framework/commit/50efe099b59e75563298deb992017b4cabfb021d))
1117
- Provide `psr/container-implementation` ([#33020](https://github.com/laravel/framework/pull/33020))
18+
- Support PHP 8's reflection API ([#33039](https://github.com/laravel/framework/pull/33039), [6018c1d](https://github.com/laravel/framework/commit/6018c1d18e7b764c17307c1f98d64482a00a668d))
1219

1320
### Fixed
1421
- Restore `app()->getCached*Path()` absolute '/' behavior in Windows ([#32969](https://github.com/laravel/framework/pull/32969))
@@ -20,6 +27,7 @@
2027

2128
### Changed
2229
- Use new line for `route:list` middleware ([#32993](https://github.com/laravel/framework/pull/32993))
30+
- Disallow generation commands with reserved names ([#33037](https://github.com/laravel/framework/pull/33037))
2331

2432

2533
## [v7.13.0 (2020-05-26)](https://github.com/laravel/framework/compare/v7.12.0...v7.13.0)

src/Illuminate/Bus/Queueable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ protected function serializeJob($job)
164164
if ($job instanceof Closure) {
165165
if (! class_exists(CallQueuedClosure::class)) {
166166
throw new RuntimeException(
167-
'To enable support for closure jobs, please install illuminate/queue.'
167+
'To enable support for closure jobs, please install the illuminate/queue package.'
168168
);
169169
}
170170

src/Illuminate/Console/Scheduling/Schedule.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function __construct($timezone = null)
6666

6767
if (! class_exists(Container::class)) {
6868
throw new RuntimeException(
69-
'A container implementation is required to use the scheduler. Please install illuminate/container.'
69+
'A container implementation is required to use the scheduler. Please install the illuminate/container package.'
7070
);
7171
}
7272

@@ -149,7 +149,7 @@ protected function dispatchToQueue($job, $queue, $connection)
149149
if ($job instanceof Closure) {
150150
if (! class_exists(CallQueuedClosure::class)) {
151151
throw new RuntimeException(
152-
'To enable support for closure jobs, please install illuminate/queue.'
152+
'To enable support for closure jobs, please install the illuminate/queue package.'
153153
);
154154
}
155155

@@ -301,7 +301,7 @@ protected function getDispatcher()
301301
$this->dispatcher = Container::getInstance()->make(Dispatcher::class);
302302
} catch (BindingResolutionException $e) {
303303
throw new RuntimeException(
304-
'Unable to resolve the dispatcher from the service container. Please bind it or install illuminate/bus.',
304+
'Unable to resolve the dispatcher from the service container. Please bind it or install the illuminate/bus package.',
305305
$e->getCode(), $e
306306
);
307307
}

src/Illuminate/Database/Schema/Grammars/ChangeColumn.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static function compile($grammar, Blueprint $blueprint, Fluent $command,
2828
{
2929
if (! $connection->isDoctrineAvailable()) {
3030
throw new RuntimeException(sprintf(
31-
'Changing columns for table "%s" requires Doctrine DBAL; install "doctrine/dbal".',
31+
'Changing columns for table "%s" requires Doctrine DBAL. Please install the doctrine/dbal package.',
3232
$blueprint->getTable()
3333
));
3434
}

src/Illuminate/Filesystem/Filesystem.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use FilesystemIterator;
77
use Illuminate\Contracts\Filesystem\FileNotFoundException;
88
use Illuminate\Macroable\Macroable;
9+
use RuntimeException;
910
use Symfony\Component\Finder\Finder;
1011
use Symfony\Component\Mime\MimeTypes;
1112

@@ -341,6 +342,12 @@ public function extension($path)
341342
*/
342343
public function guessExtension($path)
343344
{
345+
if (! class_exists(MimeTypes::class)) {
346+
throw new RuntimeException(
347+
'To enable support for guessing extensions, please install the symfony/mime package.'
348+
);
349+
}
350+
344351
return (new MimeTypes)->getExtensions($this->mimeType($path))[0] ?? null;
345352
}
346353

src/Illuminate/Filesystem/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
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).",
41+
"symfony/mime": "Required to enable support for guessing extensions (^5.0)."
4142
},
4243
"config": {
4344
"sort-packages": true

src/Illuminate/Foundation/Console/StorageLinkCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected function links()
6767
protected function getRelativeTarget($link, $target)
6868
{
6969
if (! class_exists(SymfonyFilesystem::class)) {
70-
throw new RuntimeException('To enable support for relative links, please install symfony/filesystem.');
70+
throw new RuntimeException('To enable support for relative links, please install the symfony/filesystem package.');
7171
}
7272

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

src/Illuminate/Routing/RoutingServiceProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ protected function registerPsrRequest()
137137
->createRequest($app->make('request'));
138138
}
139139

140-
throw new BindingResolutionException('Unable to resolve PSR request. Please install symfony/psr-http-message-bridge and nyholm/psr7.');
140+
throw new BindingResolutionException('Unable to resolve PSR request. Please install the symfony/psr-http-message-bridge and nyholm/psr7 packages.');
141141
});
142142
}
143143

@@ -153,7 +153,7 @@ protected function registerPsrResponse()
153153
return new PsrResponse;
154154
}
155155

156-
throw new BindingResolutionException('Unable to resolve PSR response. Please install nyholm/psr7.');
156+
throw new BindingResolutionException('Unable to resolve PSR response. Please install the nyholm/psr7 package.');
157157
});
158158
}
159159

src/Illuminate/Support/Facades/Auth.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Illuminate\Support\Facades;
44

55
use Laravel\Ui\UiServiceProvider;
6-
use LogicException;
6+
use RuntimeException;
77

88
/**
99
* @method static \Illuminate\Auth\AuthManager extend(string $driver, \Closure $callback)
@@ -53,7 +53,7 @@ protected static function getFacadeAccessor()
5353
public static function routes(array $options = [])
5454
{
5555
if (! array_key_exists(UiServiceProvider::class, static::$app->getLoadedProviders())) {
56-
throw new LogicException('Please install the laravel/ui package in order to use the Auth::routes() method.');
56+
throw new RuntimeException('In order to use the Auth::routes() method, please install the laravel/ui package ');
5757
}
5858

5959
static::$app->make('router')->auth($options);

tests/Integration/Support/AuthFacadeTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
namespace Illuminate\Tests\Integration\Support;
44

55
use Illuminate\Support\Facades\Auth;
6-
use LogicException;
6+
use RuntimeException;
77
use Orchestra\Testbench\TestCase;
88

99
class AuthFacadeTest extends TestCase
1010
{
1111
public function testItFailsIfTheUiPackageIsMissing()
1212
{
13-
$this->expectExceptionObject(new LogicException(
13+
$this->expectExceptionObject(new RuntimeException(
1414
'Please install the laravel/ui package in order to use the Auth::routes() method.'
1515
));
1616

0 commit comments

Comments
 (0)