Skip to content

Commit a1a3c58

Browse files
Merge branch '6.4' into 7.2
* 6.4: [Routing] Add test to validate that default value is allowed to not match requirement fix handling required options Fix @var phpdoc [Lock] [MongoDB] Enforce readPreference=primary and writeConcern=majority [FrameworkBundle] fix phpdoc in `MicroKernelTrait` Fixed validator translations for Albanian
2 parents 9e78a24 + 9c17469 commit a1a3c58

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

Extension/Validator/Constraints/FormValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function validate(mixed $form, Constraint $formConstraint): void
3939
return;
4040
}
4141

42-
/* @var FormInterface $form */
42+
/** @var FormInterface $form */
4343
$config = $form->getConfig();
4444

4545
$validator = $this->context->getValidator()->inContext($this->context);

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 ClassMetadata $metadata */
43+
/** @var ClassMetadata $metadata */
4444
$metadata->addConstraint(new Form());
4545
$metadata->addConstraint(new Traverse(false));
4646
}

Extension/Validator/ViolationMapper/ViolationMapper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ private function matchChild(FormInterface $form, PropertyPathIteratorInterface $
248248

249249
// Test mapping rules as long as we have any
250250
foreach ($rules as $key => $rule) {
251-
/* @var MappingRule $rule */
251+
/** @var MappingRule $rule */
252252

253253
// Mapping rule matches completely, terminate.
254254
if (null !== ($form = $rule->match($chunk))) {
@@ -312,7 +312,7 @@ private function reconstructPath(ViolationPath $violationPath, FormInterface $or
312312
// Cut the piece out of the property path and proceed
313313
$propertyPathBuilder->remove($i);
314314
} else {
315-
/* @var \Symfony\Component\PropertyAccess\PropertyPathInterface $propertyPath */
315+
/** @var \Symfony\Component\PropertyAccess\PropertyPathInterface $propertyPath */
316316
$propertyPath = $scope->getPropertyPath();
317317

318318
if (null === $propertyPath) {

FormErrorIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function __toString(): string
7676
if ($error instanceof FormError) {
7777
$string .= 'ERROR: '.$error->getMessage()."\n";
7878
} else {
79-
/* @var self $error */
79+
/** @var self $error */
8080
$string .= $error->getForm()->getName().":\n";
8181
$string .= self::indent((string) $error);
8282
}

ResolvedFormType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function finishView(FormView $view, FormInterface $form, array $options):
118118
$this->innerType->finishView($view, $form, $options);
119119

120120
foreach ($this->typeExtensions as $extension) {
121-
/* @var FormTypeExtensionInterface $extension */
121+
/** @var FormTypeExtensionInterface $extension */
122122
$extension->finishView($view, $form, $options);
123123
}
124124
}

Tests/SimpleFormTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ public function testInitializeSetsDefaultData()
10521052
$config = $this->getBuilder()->setData('DEFAULT')->getFormConfig();
10531053
$form = new Form($config);
10541054

1055-
/* @var Form $form */
1055+
/** @var Form $form */
10561056
$form->initialize();
10571057

10581058
$this->assertSame('DEFAULT', $form->getData());

0 commit comments

Comments
 (0)