Merge branch '2.7' into 2.8
* 2.7: Docblock fixes
This commit is contained in:
commit
96dcb10a80
@ -69,7 +69,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
|
||||
* only do anything if the parameter is present. (But regardless of the
|
||||
* value of that parameter.
|
||||
*
|
||||
* @var string
|
||||
* @var string|false
|
||||
*/
|
||||
protected $enabledParameter;
|
||||
|
||||
|
@ -193,7 +193,7 @@ class CodeExtension extends AbstractExtension
|
||||
* @param string $file An absolute file path
|
||||
* @param int $line The line number
|
||||
*
|
||||
* @return string A link of false
|
||||
* @return string|false A link or false
|
||||
*/
|
||||
public function getFileLink($file, $line)
|
||||
{
|
||||
|
@ -62,7 +62,7 @@ class Client extends BaseClient
|
||||
/**
|
||||
* Gets the profile associated with the current Response.
|
||||
*
|
||||
* @return HttpProfile A Profile instance
|
||||
* @return HttpProfile|false A Profile instance
|
||||
*/
|
||||
public function getProfile()
|
||||
{
|
||||
|
@ -109,7 +109,7 @@ class XmlUtils
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a \DomElement object to a PHP array.
|
||||
* Converts a \DOMElement object to a PHP array.
|
||||
*
|
||||
* The following rules applies during the conversion:
|
||||
*
|
||||
@ -123,7 +123,7 @@ class XmlUtils
|
||||
*
|
||||
* * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
|
||||
*
|
||||
* @param \DomElement $element A \DomElement instance
|
||||
* @param \DOMElement $element A \DOMElement instance
|
||||
* @param bool $checkPrefix Check prefix in an element or an attribute name
|
||||
*
|
||||
* @return array A PHP array
|
||||
|
@ -570,7 +570,7 @@ EOF
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a \DomElement object to a PHP array.
|
||||
* Converts a \DOMElement object to a PHP array.
|
||||
*
|
||||
* The following rules applies during the conversion:
|
||||
*
|
||||
@ -584,7 +584,7 @@ EOF
|
||||
*
|
||||
* * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
|
||||
*
|
||||
* @param \DomElement $element A \DomElement instance
|
||||
* @param \DOMElement $element A \DOMElement instance
|
||||
*
|
||||
* @return array A PHP array
|
||||
*/
|
||||
|
@ -303,7 +303,7 @@ class DateType extends AbstractType
|
||||
private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $timestamps)
|
||||
{
|
||||
$pattern = $formatter->getPattern();
|
||||
$timezone = $formatter->getTimezoneId();
|
||||
$timezone = $formatter->getTimeZoneId();
|
||||
$formattedTimestamps = array();
|
||||
|
||||
if ($setTimeZone = \PHP_VERSION_ID >= 50500 || method_exists($formatter, 'setTimeZone')) {
|
||||
|
@ -47,7 +47,7 @@ abstract class AbstractComparisonValidator extends ConstraintValidator
|
||||
if ($value instanceof \DateTimeImmutable) {
|
||||
// If $value is immutable, convert the compared value to a
|
||||
// DateTimeImmutable too
|
||||
$comparedValue = new \DatetimeImmutable($comparedValue);
|
||||
$comparedValue = new \DateTimeImmutable($comparedValue);
|
||||
} elseif ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
|
||||
// Otherwise use DateTime
|
||||
$comparedValue = new \DateTime($comparedValue);
|
||||
|
Reference in New Issue
Block a user