Merge branch '4.3' into 4.4
* 4.3: fix Debug component dependencies [travis] not all components have a master branch [HttpKernel] Add @method PHPDoc for getRequest and getResponse back to Client
This commit is contained in:
commit
61d180e7de
2
.github/build-packages.php
vendored
2
.github/build-packages.php
vendored
@ -57,7 +57,7 @@ foreach ($dirs as $k => $dir) {
|
|||||||
$versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"dev-master":%s}}}', $package->name, file_get_contents($dir.'/composer.json'));
|
$versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"dev-master":%s}}}', $package->name, file_get_contents($dir.'/composer.json'));
|
||||||
$versions = json_decode($versions)->packages->{$package->name};
|
$versions = json_decode($versions)->packages->{$package->name};
|
||||||
|
|
||||||
if ($package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
|
if (isset($versions->{'dev-master'}) && $package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
|
||||||
unset($versions->{'dev-master'});
|
unset($versions->{'dev-master'});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
"ext-xml": "*",
|
"ext-xml": "*",
|
||||||
"symfony/cache": "^4.3|^5.0",
|
"symfony/cache": "^4.3|^5.0",
|
||||||
"symfony/config": "^4.2|^5.0",
|
"symfony/config": "^4.2|^5.0",
|
||||||
|
"symfony/debug": "~4.0|^5.0",
|
||||||
"symfony/dependency-injection": "^4.4|^5.0",
|
"symfony/dependency-injection": "^4.4|^5.0",
|
||||||
"symfony/http-foundation": "^4.3|^5.0",
|
"symfony/http-foundation": "^4.3|^5.0",
|
||||||
"symfony/http-kernel": "^4.4|^5.0",
|
"symfony/http-kernel": "^4.4|^5.0",
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.1.3",
|
"php": "^7.1.3",
|
||||||
|
"symfony/debug": "~4.0|^5.0",
|
||||||
"symfony/error-catcher": "^4.4|^5.0",
|
"symfony/error-catcher": "^4.4|^5.0",
|
||||||
"symfony/twig-bridge": "^4.4|^5.0",
|
"symfony/twig-bridge": "^4.4|^5.0",
|
||||||
"symfony/http-foundation": "^4.3|^5.0",
|
"symfony/http-foundation": "^4.3|^5.0",
|
||||||
|
@ -23,6 +23,9 @@ use Symfony\Component\HttpFoundation\Response;
|
|||||||
/**
|
/**
|
||||||
* Client simulates a browser and makes requests to an HttpKernel instance.
|
* Client simulates a browser and makes requests to an HttpKernel instance.
|
||||||
*
|
*
|
||||||
|
* @method Request getRequest() A Request instance
|
||||||
|
* @method Response getResponse() A Response instance
|
||||||
|
*
|
||||||
* @deprecated since Symfony 4.3, use HttpKernelBrowser instead.
|
* @deprecated since Symfony 4.3, use HttpKernelBrowser instead.
|
||||||
*/
|
*/
|
||||||
class Client extends AbstractBrowser
|
class Client extends AbstractBrowser
|
||||||
|
Reference in New Issue
Block a user