Skip to content

Commit 88b0a54

Browse files
Merge branch '4.3' into 4.4
* 4.3: (23 commits) fix merge [SecurityBundle] fix return type declarations [BrowserKit] fix return type declarations [PropertyInfo] fix return type declarations [Bridge/Doctrine] fix return type declarations [Form] fix return type declarations [Console] fix return type declarations [Intl] fix return type declarations [Templating] fix return type declarations [DomCrawler] fix return type declarations [Validator] fix return type declarations [Process] fix return type declarations [Workflow] fix return type declarations [Cache] fix return type declarations [Serializer] fix return type declarations [Translation] fix return type declarations [DI] fix return type declarations [Config] fix return type declarations [HttpKernel] Fix return type declarations [Security] Fix return type declarations ...
2 parents d5c1ea2 + 9e5dddb commit 88b0a54

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Client.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ public function setServerParameter($key, $value)
151151
* Gets single server parameter for specified key.
152152
*
153153
* @param string $key A key of the parameter to get
154-
* @param string $default A default value when key is undefined
154+
* @param mixed $default A default value when key is undefined
155155
*
156-
* @return string A value of the parameter
156+
* @return mixed A value of the parameter
157157
*/
158158
public function getServerParameter($key, $default = '')
159159
{

Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function getServer()
107107
/**
108108
* Gets the request raw body data.
109109
*
110-
* @return string The request raw body data
110+
* @return string|null The request raw body data
111111
*/
112112
public function getContent()
113113
{

0 commit comments

Comments
 (0)