Skip to content

Commit a0ac214

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fixed @return when returning this or static override property constraints in child class [Console] improved code coverage of Command class Only count on arrays or countables to avoid warnings in PHP 7.2
2 parents adb9f19 + 5a1f568 commit a0ac214

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
@@ -320,7 +320,7 @@ public function serialize()
320320
*
321321
* @param int $position The position
322322
*
323-
* @return Crawler A new instance of the Crawler with the selected node, or an empty Crawler if it does not exist
323+
* @return self
324324
*/
325325
public function eq($position)
326326
{
@@ -365,7 +365,7 @@ public function each(\Closure $closure)
365365
* @param int $offset
366366
* @param int $length
367367
*
368-
* @return Crawler A Crawler instance with the sliced nodes
368+
* @return self
369369
*/
370370
public function slice($offset = 0, $length = -1)
371371
{
@@ -379,7 +379,7 @@ public function slice($offset = 0, $length = -1)
379379
*
380380
* @param \Closure $closure An anonymous function
381381
*
382-
* @return Crawler A Crawler instance with the selected nodes
382+
* @return self
383383
*/
384384
public function reduce(\Closure $closure)
385385
{
@@ -396,7 +396,7 @@ public function reduce(\Closure $closure)
396396
/**
397397
* Returns the first node of the current selection.
398398
*
399-
* @return Crawler A Crawler instance with the first selected node
399+
* @return self
400400
*/
401401
public function first()
402402
{
@@ -406,7 +406,7 @@ public function first()
406406
/**
407407
* Returns the last node of the current selection.
408408
*
409-
* @return Crawler A Crawler instance with the last selected node
409+
* @return self
410410
*/
411411
public function last()
412412
{
@@ -416,7 +416,7 @@ public function last()
416416
/**
417417
* Returns the siblings nodes of the current selection.
418418
*
419-
* @return Crawler A Crawler instance with the sibling nodes
419+
* @return self
420420
*
421421
* @throws \InvalidArgumentException When current node is empty
422422
*/
@@ -432,7 +432,7 @@ public function siblings()
432432
/**
433433
* Returns the next siblings nodes of the current selection.
434434
*
435-
* @return Crawler A Crawler instance with the next sibling nodes
435+
* @return self
436436
*
437437
* @throws \InvalidArgumentException When current node is empty
438438
*/
@@ -448,7 +448,7 @@ public function nextAll()
448448
/**
449449
* Returns the previous sibling nodes of the current selection.
450450
*
451-
* @return Crawler A Crawler instance with the previous sibling nodes
451+
* @return self
452452
*
453453
* @throws \InvalidArgumentException
454454
*/
@@ -464,7 +464,7 @@ public function previousAll()
464464
/**
465465
* Returns the parents nodes of the current selection.
466466
*
467-
* @return Crawler A Crawler instance with the parents nodes of the current selection
467+
* @return self
468468
*
469469
* @throws \InvalidArgumentException When current node is empty
470470
*/
@@ -489,7 +489,7 @@ public function parents()
489489
/**
490490
* Returns the children nodes of the current selection.
491491
*
492-
* @return Crawler A Crawler instance with the children nodes
492+
* @return self
493493
*
494494
* @throws \InvalidArgumentException When current node is empty
495495
*/
@@ -622,7 +622,7 @@ public function extract($attributes)
622622
*
623623
* @param string $xpath An XPath expression
624624
*
625-
* @return Crawler A new instance of Crawler with the filtered list of nodes
625+
* @return self
626626
*/
627627
public function filterXPath($xpath)
628628
{
@@ -643,7 +643,7 @@ public function filterXPath($xpath)
643643
*
644644
* @param string $selector A CSS selector
645645
*
646-
* @return Crawler A new instance of Crawler with the filtered list of nodes
646+
* @return self
647647
*
648648
* @throws \RuntimeException if the CssSelector Component is not available
649649
*/
@@ -664,7 +664,7 @@ public function filter($selector)
664664
*
665665
* @param string $value The link text
666666
*
667-
* @return Crawler A new instance of Crawler with the filtered list of nodes
667+
* @return self
668668
*/
669669
public function selectLink($value)
670670
{
@@ -679,7 +679,7 @@ public function selectLink($value)
679679
*
680680
* @param string $value The button text
681681
*
682-
* @return Crawler A new instance of Crawler with the filtered list of nodes
682+
* @return self
683683
*/
684684
public function selectButton($value)
685685
{
@@ -960,7 +960,7 @@ public function offsetGet($object)
960960
*
961961
* @param string $xpath
962962
*
963-
* @return Crawler
963+
* @return self
964964
*/
965965
private function filterRelativeXPath($xpath)
966966
{

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
{
@@ -279,7 +279,7 @@ public function set(FormField $field)
279279
/**
280280
* Gets all fields.
281281
*
282-
* @return FormField[] An array of fields
282+
* @return FormField[]
283283
*/
284284
public function all()
285285
{

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)