Skip to content

Commit be287c6

Browse files
Merge branch '5.4' into 6.0
* 5.4: [Serializer] cs fix Cleanup more `@return` annotations [Form] Fix phpdoc on FormBuilderInterface
2 parents 431f3d8 + a8e3e66 commit be287c6

File tree

5 files changed

+1
-43
lines changed

5 files changed

+1
-43
lines changed

AbstractBrowser.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,8 +600,6 @@ public function restart()
600600

601601
/**
602602
* Takes a URI and converts it to absolute if it is not already absolute.
603-
*
604-
* @return string An absolute URI
605603
*/
606604
protected function getAbsoluteUri(string $uri): string
607605
{

Cookie.php

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,6 @@ private static function parseDate(string $dateValue): ?string
217217

218218
/**
219219
* Gets the name of the cookie.
220-
*
221-
* @return string The cookie name
222220
*/
223221
public function getName(): string
224222
{
@@ -227,8 +225,6 @@ public function getName(): string
227225

228226
/**
229227
* Gets the value of the cookie.
230-
*
231-
* @return string The cookie value
232228
*/
233229
public function getValue(): string
234230
{
@@ -237,8 +233,6 @@ public function getValue(): string
237233

238234
/**
239235
* Gets the raw value of the cookie.
240-
*
241-
* @return string The cookie value
242236
*/
243237
public function getRawValue(): string
244238
{
@@ -247,8 +241,6 @@ public function getRawValue(): string
247241

248242
/**
249243
* Gets the expires time of the cookie.
250-
*
251-
* @return string|null The cookie expires time
252244
*/
253245
public function getExpiresTime(): ?string
254246
{
@@ -257,8 +249,6 @@ public function getExpiresTime(): ?string
257249

258250
/**
259251
* Gets the path of the cookie.
260-
*
261-
* @return string The cookie path
262252
*/
263253
public function getPath(): string
264254
{
@@ -267,8 +257,6 @@ public function getPath(): string
267257

268258
/**
269259
* Gets the domain of the cookie.
270-
*
271-
* @return string The cookie domain
272260
*/
273261
public function getDomain(): string
274262
{
@@ -277,8 +265,6 @@ public function getDomain(): string
277265

278266
/**
279267
* Returns the secure flag of the cookie.
280-
*
281-
* @return bool The cookie secure flag
282268
*/
283269
public function isSecure(): bool
284270
{
@@ -287,8 +273,6 @@ public function isSecure(): bool
287273

288274
/**
289275
* Returns the httponly flag of the cookie.
290-
*
291-
* @return bool The cookie httponly flag
292276
*/
293277
public function isHttpOnly(): bool
294278
{
@@ -297,8 +281,6 @@ public function isHttpOnly(): bool
297281

298282
/**
299283
* Returns true if the cookie has expired.
300-
*
301-
* @return bool true if the cookie has expired, false otherwise
302284
*/
303285
public function isExpired(): bool
304286
{
@@ -307,8 +289,6 @@ public function isExpired(): bool
307289

308290
/**
309291
* Gets the samesite attribute of the cookie.
310-
*
311-
* @return string|null The cookie samesite attribute
312292
*/
313293
public function getSameSite(): ?string
314294
{

CookieJar.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function updateFromResponse(Response $response, string $uri = null)
139139
/**
140140
* Returns not yet expired cookies.
141141
*
142-
* @return Cookie[] An array of cookies
142+
* @return Cookie[]
143143
*/
144144
public function all(): array
145145
{
@@ -159,8 +159,6 @@ public function all(): array
159159

160160
/**
161161
* Returns not yet expired cookie values for the given URI.
162-
*
163-
* @return array An array of cookie values
164162
*/
165163
public function allValues(string $uri, bool $returnsRawValue = false): array
166164
{
@@ -196,8 +194,6 @@ public function allValues(string $uri, bool $returnsRawValue = false): array
196194

197195
/**
198196
* Returns not yet expired raw cookie values for the given URI.
199-
*
200-
* @return array An array of cookie values
201197
*/
202198
public function allRawValues(string $uri): array
203199
{

History.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ public function add(Request $request)
4242

4343
/**
4444
* Returns true if the history is empty.
45-
*
46-
* @return bool true if the history is empty, false otherwise
4745
*/
4846
public function isEmpty(): bool
4947
{

Request.php

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ public function __construct(string $uri, string $method, array $parameters = [],
5151

5252
/**
5353
* Gets the request URI.
54-
*
55-
* @return string The request URI
5654
*/
5755
public function getUri(): string
5856
{
@@ -61,8 +59,6 @@ public function getUri(): string
6159

6260
/**
6361
* Gets the request HTTP method.
64-
*
65-
* @return string The request HTTP method
6662
*/
6763
public function getMethod(): string
6864
{
@@ -71,8 +67,6 @@ public function getMethod(): string
7167

7268
/**
7369
* Gets the request parameters.
74-
*
75-
* @return array The request parameters
7670
*/
7771
public function getParameters(): array
7872
{
@@ -81,8 +75,6 @@ public function getParameters(): array
8175

8276
/**
8377
* Gets the request server files.
84-
*
85-
* @return array The request files
8678
*/
8779
public function getFiles(): array
8880
{
@@ -91,8 +83,6 @@ public function getFiles(): array
9183

9284
/**
9385
* Gets the request cookies.
94-
*
95-
* @return array The request cookies
9686
*/
9787
public function getCookies(): array
9888
{
@@ -101,8 +91,6 @@ public function getCookies(): array
10191

10292
/**
10393
* Gets the request server parameters.
104-
*
105-
* @return array The request server parameters
10694
*/
10795
public function getServer(): array
10896
{
@@ -111,8 +99,6 @@ public function getServer(): array
11199

112100
/**
113101
* Gets the request raw body data.
114-
*
115-
* @return string|null The request raw body data
116102
*/
117103
public function getContent(): ?string
118104
{

0 commit comments

Comments
 (0)