Skip to content

Commit 96dcb10

Browse files
Merge branch '2.7' into 2.8
* 2.7: Docblock fixes
2 parents 9ca5069 + 4371d03 commit 96dcb10

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
6969
* only do anything if the parameter is present. (But regardless of the
7070
* value of that parameter.
7171
*
72-
* @var string
72+
* @var string|false
7373
*/
7474
protected $enabledParameter;
7575

src/Symfony/Bridge/Twig/Extension/CodeExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public function formatFile($file, $line, $text = null)
193193
* @param string $file An absolute file path
194194
* @param int $line The line number
195195
*
196-
* @return string A link of false
196+
* @return string|false A link or false
197197
*/
198198
public function getFileLink($file, $line)
199199
{

src/Symfony/Bundle/FrameworkBundle/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function getKernel()
6262
/**
6363
* Gets the profile associated with the current Response.
6464
*
65-
* @return HttpProfile A Profile instance
65+
* @return HttpProfile|false A Profile instance
6666
*/
6767
public function getProfile()
6868
{

src/Symfony/Component/Config/Util/XmlUtils.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public static function loadFile($file, $schemaOrCallable = null)
109109
}
110110

111111
/**
112-
* Converts a \DomElement object to a PHP array.
112+
* Converts a \DOMElement object to a PHP array.
113113
*
114114
* The following rules applies during the conversion:
115115
*
@@ -123,7 +123,7 @@ public static function loadFile($file, $schemaOrCallable = null)
123123
*
124124
* * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
125125
*
126-
* @param \DomElement $element A \DomElement instance
126+
* @param \DOMElement $element A \DOMElement instance
127127
* @param bool $checkPrefix Check prefix in an element or an attribute name
128128
*
129129
* @return array A PHP array

src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ private function loadFromExtensions(\DOMDocument $xml)
570570
}
571571

572572
/**
573-
* Converts a \DomElement object to a PHP array.
573+
* Converts a \DOMElement object to a PHP array.
574574
*
575575
* The following rules applies during the conversion:
576576
*
@@ -584,7 +584,7 @@ private function loadFromExtensions(\DOMDocument $xml)
584584
*
585585
* * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
586586
*
587-
* @param \DomElement $element A \DomElement instance
587+
* @param \DOMElement $element A \DOMElement instance
588588
*
589589
* @return array A PHP array
590590
*/

src/Symfony/Component/Form/Extension/Core/Type/DateType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public function getBlockPrefix()
303303
private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $timestamps)
304304
{
305305
$pattern = $formatter->getPattern();
306-
$timezone = $formatter->getTimezoneId();
306+
$timezone = $formatter->getTimeZoneId();
307307
$formattedTimestamps = array();
308308

309309
if ($setTimeZone = \PHP_VERSION_ID >= 50500 || method_exists($formatter, 'setTimeZone')) {

src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function validate($value, Constraint $constraint)
4747
if ($value instanceof \DateTimeImmutable) {
4848
// If $value is immutable, convert the compared value to a
4949
// DateTimeImmutable too
50-
$comparedValue = new \DatetimeImmutable($comparedValue);
50+
$comparedValue = new \DateTimeImmutable($comparedValue);
5151
} elseif ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
5252
// Otherwise use DateTime
5353
$comparedValue = new \DateTime($comparedValue);

0 commit comments

Comments
 (0)