minor #24854 Docblock fixes (nicolas-grekas)

This PR was merged into the 2.7 branch.

Discussion
----------

Docblock fixes

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

b56bfe7 Docblock fixes
This commit is contained in:
Nicolas Grekas 2017-11-07 12:56:10 +01:00
commit 4371d03d61
7 changed files with 9 additions and 9 deletions

View File

@ -69,7 +69,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
* only do anything if the parameter is present. (But regardless of the * only do anything if the parameter is present. (But regardless of the
* value of that parameter. * value of that parameter.
* *
* @var string * @var string|false
*/ */
protected $enabledParameter; protected $enabledParameter;

View File

@ -193,7 +193,7 @@ class CodeExtension extends AbstractExtension
* @param string $file An absolute file path * @param string $file An absolute file path
* @param int $line The line number * @param int $line The line number
* *
* @return string A link of false * @return string|false A link or false
*/ */
public function getFileLink($file, $line) public function getFileLink($file, $line)
{ {

View File

@ -62,7 +62,7 @@ class Client extends BaseClient
/** /**
* Gets the profile associated with the current Response. * Gets the profile associated with the current Response.
* *
* @return HttpProfile A Profile instance * @return HttpProfile|false A Profile instance
*/ */
public function getProfile() public function getProfile()
{ {

View File

@ -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: * 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>) * * 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 * @param bool $checkPrefix Check prefix in an element or an attribute name
* *
* @return array A PHP array * @return array A PHP array

View File

@ -547,7 +547,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: * The following rules applies during the conversion:
* *
@ -561,7 +561,7 @@ EOF
* *
* * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>) * * 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 * @return array A PHP array
*/ */

View File

@ -268,7 +268,7 @@ class DateType extends AbstractType
private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $timestamps) private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $timestamps)
{ {
$pattern = $formatter->getPattern(); $pattern = $formatter->getPattern();
$timezone = $formatter->getTimezoneId(); $timezone = $formatter->getTimeZoneId();
$formattedTimestamps = array(); $formattedTimestamps = array();
if ($setTimeZone = \PHP_VERSION_ID >= 50500 || method_exists($formatter, 'setTimeZone')) { if ($setTimeZone = \PHP_VERSION_ID >= 50500 || method_exists($formatter, 'setTimeZone')) {

View File

@ -47,7 +47,7 @@ abstract class AbstractComparisonValidator extends ConstraintValidator
if ($value instanceof \DateTimeImmutable) { if ($value instanceof \DateTimeImmutable) {
// If $value is immutable, convert the compared value to a // If $value is immutable, convert the compared value to a
// DateTimeImmutable too // DateTimeImmutable too
$comparedValue = new \DatetimeImmutable($comparedValue); $comparedValue = new \DateTimeImmutable($comparedValue);
} elseif ($value instanceof \DateTime || $value instanceof \DateTimeInterface) { } elseif ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
// Otherwise use DateTime // Otherwise use DateTime
$comparedValue = new \DateTime($comparedValue); $comparedValue = new \DateTime($comparedValue);