Skip to content

Commit ba68f5b

Browse files
committed
formatting
2 parents 6438ea0 + f4eac8e commit ba68f5b

File tree

8 files changed

+24
-10
lines changed

8 files changed

+24
-10
lines changed

.github/workflows/tests.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ jobs:
7979
name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows
8080

8181
steps:
82+
- name: Set git to use LF
83+
run: |
84+
git config --global core.autocrlf false
85+
git config --global core.eol lf
86+
8287
- name: Checkout code
8388
uses: actions/checkout@v2
8489

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/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/Eloquent/Relations/MorphToMany.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Illuminate\Database\Eloquent\Builder;
66
use Illuminate\Database\Eloquent\Model;
7+
use Illuminate\Database\Eloquent\Relations\MorphPivot;
78
use Illuminate\Support\Arr;
89

910
class MorphToMany extends BelongsToMany
@@ -123,8 +124,10 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
123124
protected function getCurrentlyAttachedPivots()
124125
{
125126
return parent::getCurrentlyAttachedPivots()->map(function ($record) {
126-
return $record->setMorphType($this->morphType)
127-
->setMorphClass($this->morphClass);
127+
return $record instanceof MorphPivot
128+
? $record->setMorphType($this->morphType)
129+
->setMorphClass($this->morphClass)
130+
: $record;
128131
});
129132
}
130133

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/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
3636
"league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
3737
"league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
38-
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0)"
38+
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0)."
3939
},
4040
"config": {
4141
"sort-packages": true

src/Illuminate/Foundation/Application.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
3333
*
3434
* @var string
3535
*/
36-
const VERSION = '7.14.0';
36+
const VERSION = '7.14.1';
3737

3838
/**
3939
* The base path for the Laravel installation.

src/Illuminate/Routing/RoutingServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

0 commit comments

Comments
 (0)