Skip to content

Commit 2020748

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 052fdb8 + 9d5d564 commit 2020748

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Collator/Collator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function __construct($locale)
8888
*
8989
* @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
9090
*
91-
* @return Collator
91+
* @return self
9292
*
9393
* @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed
9494
*/

DateFormatter/IntlDateFormatter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public function __construct($locale, $datetype, $timetype, $timezone = null, $ca
173173
* One of the calendar constants.
174174
* @param string $pattern Optional pattern to use when formatting
175175
*
176-
* @return IntlDateFormatter
176+
* @return self
177177
*
178178
* @see http://www.php.net/manual/en/intldateformatter.create.php
179179
* @see http://userguide.icu-project.org/formatparse/datetime

NumberFormatter/NumberFormatter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public function __construct($locale = 'en', $style = null, $pattern = null)
304304
* NumberFormat::PATTERN_RULEBASED. It must conform to the syntax
305305
* described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
306306
*
307-
* @return NumberFormatter
307+
* @return self
308308
*
309309
* @see http://www.php.net/manual/en/numberformatter.create.php
310310
* @see http://www.icu-project.org/apiref/icu4c/classDecimalFormat.html#_details

Util/SvnRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class SvnRepository
4242
* @param string $url The URL to download from
4343
* @param string $targetDir The directory in which to store the repository
4444
*
45-
* @return SvnRepository The directory where the data is stored
45+
* @return static
4646
*
4747
* @throws RuntimeException If an error occurs during the download.
4848
*/

0 commit comments

Comments
 (0)