Merge branch 'master' into develop

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints 2020-04-15 13:47:54 +02:00
commit 8be1fd4001
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76
2 changed files with 13 additions and 2 deletions

View File

@ -1,6 +1,15 @@
# Release Notes
## [Unreleased](https://github.com/laravel/laravel/compare/v7.3.0...develop)
## [Unreleased](https://github.com/laravel/laravel/compare/v7.6.0...develop)
## [v7.6.0 (2020-04-15)](https://github.com/laravel/laravel/compare/v7.3.0...v7.6.0)
### Changed
- Disable Telescope in PHPUnit ([#5277](https://github.com/laravel/laravel/pull/5277))
### Fixed
- Add both endpoint and url env variables ([#5276](https://github.com/laravel/laravel/pull/5276))
## [v7.3.0 (2020-03-24)](https://github.com/laravel/laravel/compare/v7.0.0...v7.3.0)

View File

@ -2,7 +2,8 @@
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true">
colors="true"
>
<testsuites>
<testsuite name="Unit">
<directory suffix="Test.php">./tests/Unit</directory>
@ -25,5 +26,6 @@
<server name="MAIL_MAILER" value="array"/>
<server name="QUEUE_CONNECTION" value="sync"/>
<server name="SESSION_DRIVER" value="array"/>
<server name="TELESCOPE_ENABLED" value="false"/>
</php>
</phpunit>