Skip to content

Commit e9f842d

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 6399a44 + 1f028ad commit e9f842d

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

Crawler.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ public function addNode(\DOMNode $node)
337337
*
338338
* @param int $position The position
339339
*
340-
* @return Crawler A new instance of the Crawler with the selected node, or an empty Crawler if it does not exist
340+
* @return self
341341
*/
342342
public function eq($position)
343343
{
@@ -380,7 +380,7 @@ public function each(\Closure $closure)
380380
* @param int $offset
381381
* @param int $length
382382
*
383-
* @return Crawler A Crawler instance with the sliced nodes
383+
* @return self
384384
*/
385385
public function slice($offset = 0, $length = null)
386386
{
@@ -394,7 +394,7 @@ public function slice($offset = 0, $length = null)
394394
*
395395
* @param \Closure $closure An anonymous function
396396
*
397-
* @return Crawler A Crawler instance with the selected nodes
397+
* @return self
398398
*/
399399
public function reduce(\Closure $closure)
400400
{
@@ -411,7 +411,7 @@ public function reduce(\Closure $closure)
411411
/**
412412
* Returns the first node of the current selection.
413413
*
414-
* @return Crawler A Crawler instance with the first selected node
414+
* @return self
415415
*/
416416
public function first()
417417
{
@@ -421,7 +421,7 @@ public function first()
421421
/**
422422
* Returns the last node of the current selection.
423423
*
424-
* @return Crawler A Crawler instance with the last selected node
424+
* @return self
425425
*/
426426
public function last()
427427
{
@@ -431,7 +431,7 @@ public function last()
431431
/**
432432
* Returns the siblings nodes of the current selection.
433433
*
434-
* @return Crawler A Crawler instance with the sibling nodes
434+
* @return self
435435
*
436436
* @throws \InvalidArgumentException When current node is empty
437437
*/
@@ -447,7 +447,7 @@ public function siblings()
447447
/**
448448
* Returns the next siblings nodes of the current selection.
449449
*
450-
* @return Crawler A Crawler instance with the next sibling nodes
450+
* @return self
451451
*
452452
* @throws \InvalidArgumentException When current node is empty
453453
*/
@@ -463,7 +463,7 @@ public function nextAll()
463463
/**
464464
* Returns the previous sibling nodes of the current selection.
465465
*
466-
* @return Crawler A Crawler instance with the previous sibling nodes
466+
* @return self
467467
*
468468
* @throws \InvalidArgumentException
469469
*/
@@ -479,7 +479,7 @@ public function previousAll()
479479
/**
480480
* Returns the parents nodes of the current selection.
481481
*
482-
* @return Crawler A Crawler instance with the parents nodes of the current selection
482+
* @return self
483483
*
484484
* @throws \InvalidArgumentException When current node is empty
485485
*/
@@ -504,7 +504,7 @@ public function parents()
504504
/**
505505
* Returns the children nodes of the current selection.
506506
*
507-
* @return Crawler A Crawler instance with the children nodes
507+
* @return self
508508
*
509509
* @throws \InvalidArgumentException When current node is empty
510510
*/
@@ -667,7 +667,7 @@ public function extract($attributes)
667667
*
668668
* @param string $xpath An XPath expression
669669
*
670-
* @return Crawler A new instance of Crawler with the filtered list of nodes
670+
* @return self
671671
*/
672672
public function filterXPath($xpath)
673673
{
@@ -688,7 +688,7 @@ public function filterXPath($xpath)
688688
*
689689
* @param string $selector A CSS selector
690690
*
691-
* @return Crawler A new instance of Crawler with the filtered list of nodes
691+
* @return self
692692
*
693693
* @throws \RuntimeException if the CssSelector Component is not available
694694
*/
@@ -709,7 +709,7 @@ public function filter($selector)
709709
*
710710
* @param string $value The link text
711711
*
712-
* @return Crawler A new instance of Crawler with the filtered list of nodes
712+
* @return self
713713
*/
714714
public function selectLink($value)
715715
{
@@ -738,7 +738,7 @@ public function selectImage($value)
738738
*
739739
* @param string $value The button text
740740
*
741-
* @return Crawler A new instance of Crawler with the filtered list of nodes
741+
* @return self
742742
*/
743743
public function selectButton($value)
744744
{
@@ -940,7 +940,7 @@ public static function xpathLiteral($s)
940940
*
941941
* @param string $xpath
942942
*
943-
* @return Crawler
943+
* @return self
944944
*/
945945
private function filterRelativeXPath($xpath)
946946
{

Form.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function getFormNode()
6969
*
7070
* @param array $values An array of field values
7171
*
72-
* @return Form
72+
* @return $this
7373
*/
7474
public function setValues(array $values)
7575
{
@@ -289,7 +289,7 @@ public function set(FormField $field)
289289
/**
290290
* Gets all fields.
291291
*
292-
* @return FormField[] An array of fields
292+
* @return FormField[]
293293
*/
294294
public function all()
295295
{

FormFieldRegistry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public function all()
151151
* @param string $base The fully qualified name of the base field
152152
* @param array $values The values of the fields
153153
*
154-
* @return FormFieldRegistry
154+
* @return static
155155
*/
156156
private static function create($base, array $values)
157157
{

0 commit comments

Comments
 (0)