Skip to content

Commit 2aef6a3

Browse files
committed
Merge branch '3.2'
* 3.2: [FrameworkBundle] Ignore AnnotationException exceptions in the AnnotationsCacheWarmer fixed @return when returning this or static override property constraints in child class removed unneeded comment [Console] improved code coverage of Command class [FrameworkBundle] Make TemplateController working without the Templating component [FrameworkBundle] Allow multiple transactions with the same name Only count on arrays or countables to avoid warnings in PHP 7.2
2 parents e7db723 + 2c8a1e1 commit 2aef6a3

11 files changed

+48
-48
lines changed

AcceptHeader.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __construct(array $items)
4848
*
4949
* @param string $headerValue
5050
*
51-
* @return AcceptHeader
51+
* @return self
5252
*/
5353
public static function fromString($headerValue)
5454
{
@@ -101,7 +101,7 @@ public function get($value)
101101
*
102102
* @param AcceptHeaderItem $item
103103
*
104-
* @return AcceptHeader
104+
* @return $this
105105
*/
106106
public function add(AcceptHeaderItem $item)
107107
{
@@ -128,7 +128,7 @@ public function all()
128128
*
129129
* @param string $pattern
130130
*
131-
* @return AcceptHeader
131+
* @return self
132132
*/
133133
public function filter($pattern)
134134
{

AcceptHeaderItem.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function __construct($value, array $attributes = array())
5757
*
5858
* @param string $itemValue
5959
*
60-
* @return AcceptHeaderItem
60+
* @return self
6161
*/
6262
public static function fromString($itemValue)
6363
{
@@ -103,7 +103,7 @@ public function __toString()
103103
*
104104
* @param string $value
105105
*
106-
* @return AcceptHeaderItem
106+
* @return $this
107107
*/
108108
public function setValue($value)
109109
{
@@ -127,7 +127,7 @@ public function getValue()
127127
*
128128
* @param float $quality
129129
*
130-
* @return AcceptHeaderItem
130+
* @return $this
131131
*/
132132
public function setQuality($quality)
133133
{
@@ -151,7 +151,7 @@ public function getQuality()
151151
*
152152
* @param int $index
153153
*
154-
* @return AcceptHeaderItem
154+
* @return $this
155155
*/
156156
public function setIndex($index)
157157
{
@@ -211,7 +211,7 @@ public function getAttributes()
211211
* @param string $name
212212
* @param string $value
213213
*
214-
* @return AcceptHeaderItem
214+
* @return $this
215215
*/
216216
public function setAttribute($name, $value)
217217
{

BinaryFileResponse.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function __construct($file, $status = 200, $headers = array(), $public =
6666
* @param bool $autoEtag Whether the ETag header should be automatically set
6767
* @param bool $autoLastModified Whether the Last-Modified header should be automatically set
6868
*
69-
* @return BinaryFileResponse The created response
69+
* @return static
7070
*/
7171
public static function create($file = null, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
7272
{
@@ -81,7 +81,7 @@ public static function create($file = null, $status = 200, $headers = array(), $
8181
* @param bool $autoEtag
8282
* @param bool $autoLastModified
8383
*
84-
* @return BinaryFileResponse
84+
* @return $this
8585
*
8686
* @throws FileException
8787
*/
@@ -153,7 +153,7 @@ public function setAutoEtag()
153153
* @param string $filename Optionally use this filename instead of the real name of the file
154154
* @param string $filenameFallback A fallback filename, containing only ASCII characters. Defaults to an automatically encoded filename
155155
*
156-
* @return BinaryFileResponse
156+
* @return $this
157157
*/
158158
public function setContentDisposition($disposition, $filename = '', $filenameFallback = '')
159159
{
@@ -348,7 +348,7 @@ public static function trustXSendfileTypeHeader()
348348
*
349349
* @param bool $shouldDelete
350350
*
351-
* @return BinaryFileResponse
351+
* @return $this
352352
*/
353353
public function deleteFileAfterSend($shouldDelete)
354354
{

File/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function getMimeType()
8585
* @param string $directory The destination folder
8686
* @param string $name The new file name
8787
*
88-
* @return File A File object representing the new file
88+
* @return self A File object representing the new file
8989
*
9090
* @throws FileException if the target file could not be created
9191
*/

File/MimeType/ExtensionGuesser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ExtensionGuesser implements ExtensionGuesserInterface
4242
/**
4343
* Returns the singleton instance.
4444
*
45-
* @return ExtensionGuesser
45+
* @return self
4646
*/
4747
public static function getInstance()
4848
{

File/MimeType/MimeTypeGuesser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface
5656
/**
5757
* Returns the singleton instance.
5858
*
59-
* @return MimeTypeGuesser
59+
* @return self
6060
*/
6161
public static function getInstance()
6262
{

JsonResponse.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function __construct($data = null, $status = 200, $headers = array(), $js
6262
* @param int $status The response status code
6363
* @param array $headers An array of response headers
6464
*
65-
* @return JsonResponse
65+
* @return static
6666
*/
6767
public static function create($data = null, $status = 200, $headers = array())
6868
{
@@ -82,7 +82,7 @@ public static function fromJsonString($data = null, $status = 200, $headers = ar
8282
*
8383
* @param string|null $callback The JSONP callback or null to use none
8484
*
85-
* @return JsonResponse
85+
* @return $this
8686
*
8787
* @throws \InvalidArgumentException When the callback name is not valid
8888
*/
@@ -133,7 +133,7 @@ public function setJson($json)
133133
*
134134
* @param mixed $data
135135
*
136-
* @return JsonResponse
136+
* @return $this
137137
*
138138
* @throws \InvalidArgumentException
139139
*/
@@ -180,7 +180,7 @@ public function getEncodingOptions()
180180
*
181181
* @param int $encodingOptions
182182
*
183-
* @return JsonResponse
183+
* @return $this
184184
*/
185185
public function setEncodingOptions($encodingOptions)
186186
{
@@ -192,7 +192,7 @@ public function setEncodingOptions($encodingOptions)
192192
/**
193193
* Updates the content and headers according to the JSON data and callback.
194194
*
195-
* @return JsonResponse
195+
* @return $this
196196
*/
197197
protected function update()
198198
{

RedirectResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function getTargetUrl()
7070
*
7171
* @param string $url The URL to redirect to
7272
*
73-
* @return RedirectResponse The current response
73+
* @return $this
7474
*
7575
* @throws \InvalidArgumentException
7676
*/

Request.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ public function initialize(array $query = array(), array $request = array(), arr
265265
/**
266266
* Creates a new request with values from PHP's super globals.
267267
*
268-
* @return Request A new request
268+
* @return static
269269
*/
270270
public static function createFromGlobals()
271271
{
@@ -308,7 +308,7 @@ public static function createFromGlobals()
308308
* @param array $server The server parameters ($_SERVER)
309309
* @param string $content The raw body data
310310
*
311-
* @return Request A Request instance
311+
* @return static
312312
*/
313313
public static function create($uri, $method = 'GET', $parameters = array(), $cookies = array(), $files = array(), $server = array(), $content = null)
314314
{
@@ -426,7 +426,7 @@ public static function setFactory($callable)
426426
* @param array $files The FILES parameters
427427
* @param array $server The SERVER parameters
428428
*
429-
* @return Request The duplicated request
429+
* @return static
430430
*/
431431
public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
432432
{

0 commit comments

Comments
 (0)