Merge branch 'master' into develop
# Conflicts: # CHANGELOG.md
This commit is contained in:
commit
8be1fd4001
11
CHANGELOG.md
11
CHANGELOG.md
|
@ -1,6 +1,15 @@
|
||||||
# Release Notes
|
# 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)
|
## [v7.3.0 (2020-03-24)](https://github.com/laravel/laravel/compare/v7.0.0...v7.3.0)
|
||||||
|
|
|
@ -2,7 +2,8 @@
|
||||||
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
|
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
|
||||||
bootstrap="vendor/autoload.php"
|
bootstrap="vendor/autoload.php"
|
||||||
colors="true">
|
colors="true"
|
||||||
|
>
|
||||||
<testsuites>
|
<testsuites>
|
||||||
<testsuite name="Unit">
|
<testsuite name="Unit">
|
||||||
<directory suffix="Test.php">./tests/Unit</directory>
|
<directory suffix="Test.php">./tests/Unit</directory>
|
||||||
|
@ -25,5 +26,6 @@
|
||||||
<server name="MAIL_MAILER" value="array"/>
|
<server name="MAIL_MAILER" value="array"/>
|
||||||
<server name="QUEUE_CONNECTION" value="sync"/>
|
<server name="QUEUE_CONNECTION" value="sync"/>
|
||||||
<server name="SESSION_DRIVER" value="array"/>
|
<server name="SESSION_DRIVER" value="array"/>
|
||||||
|
<server name="TELESCOPE_ENABLED" value="false"/>
|
||||||
</php>
|
</php>
|
||||||
</phpunit>
|
</phpunit>
|
||||||
|
|
Loading…
Reference in New Issue