8000 minor #58432 Make ``@var`` occurrences consistent (alexandre-daubois) · symfony/symfony@24f9ef8 · GitHub
[go: up one dir, main page]

Skip to content

Commit 24f9ef8

Browse files
committed
minor #58432 Make @var occurrences consistent (alexandre-daubois)
This PR was merged into the 7.2 branch. Discussion ---------- Make ``@var`` occurrences consistent | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Both notation are indeed valid but given the number of occurrences, I suggest making the few "inverted" ones consistent with the rest of the whole codebase. Commits ------- 4536275 Make ``@var`` occurrences consistent
2 parents 9a3e33b + 4536275 commit 24f9ef8

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function build(ContainerBuilder $container): void
2424
{
2525
parent::build($container);
2626

27-
/** @var $extension DependencyInjection\TestExtension */
27+
/** @var DependencyInjection\TestExtension $extension */
2828
$extension = $container->getExtension('test');
2929

3030
if (!$container->getParameterBag() instanceof FrozenParameterBag) {

src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function __construct(
4040
// the DIC, where the XML file is loaded automatically. Thus the following
4141
// code must be kept synchronized with validation.xml
4242

43-
/* @var $metadata ClassMetadata */
43+
/* @var ClassMetadata $metadata */
4444
$metadata->addConstraint(new Form());
4545
$metadata->addConstraint(new Traverse(false));
4646
}

src/Symfony/Component/Form/FormBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public function count(): int
142142

143143
public function getFormConfig(): FormConfigInterface
144144
{
145-
/** @var $config self */
145+
/** @var self $config */
146146
$config = parent::getFormConfig();
147147

148148
$config->children = [];

src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function __construct(?DocBlockFactoryInterface $docBlockFactory = null, ?
8080

8181
public function getShortDescription(string $class, string $property, array $context = []): ?string
8282
{
83-
/** @var $docBlock DocBlock */
83+
/** @var DocBlock $docBlock */
8484
[$docBlock] = $this->findDocBlock($class, $property);
8585
if (!$docBlock) {
8686
return null;
@@ -107,7 +107,7 @@ public function getShortDescription(string $class, string $property, array $cont
107107

108108
public function getLongDescription(string $class, string $property, array $context = []): ?string
109109
{
110-
/** @var $docBlock DocBlock */
110+
/** @var DocBlock $docBlock */
111111
[$docBlock] = $this->findDocBlock($class, $property);
112112
if (!$docBlock) {
113113
return null;
@@ -120,7 +120,7 @@ public function getLongDescription(string $class, string $property, array $conte
120120

121121
public function getTypes(string $class, string $property, array $context = []): ?array
122122
{
123-
/** @var $docBlock DocBlock */
123+
/** @var DocBlock $docBlock */
124124
[$docBlock, $source, $prefix] = $this->findDocBlock($class, $property);
125125
if (!$docBlock) {
126126
return null;
@@ -199,7 +199,7 @@ public function getTypesFromConstructor(string $class, string $property): ?array
199199
*/
200200
public function getType(string $class, string $property, array $context = []): ?Type
201201
{
202-
/** @var $docBlock DocBlock */
202+
/** @var DocBlock $docBlock */
203203
[$docBlock, $source, $prefix] = $this->findDocBlock($class, $property);
204204
if (!$docBlock) {
205205
return null;

src/Symfony/Component/Routing/Tests/Fixtures/validresource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
/** @var $loader \Symfony\Component\Routing\Loader\PhpFileLoader */
3+
/** @var \Symfony\Component\Routing\Loader\PhpFileLoader $loader */
44
/** @var \Symfony\Component\Routing\RouteCollection $collection */
55
$collection = $loader->import('validpattern.php');
66
$collection->addDefaults([

0 commit comments

Comments
 (0)
0