8000 bug #17397 Remove remaining calls to non-existing method (paradajozsef) · symfony/symfony@753811f · GitHub
[go: up one dir, main page]
Skip to content

Commit 753811f

Browse files
TobionTobion
committed
bug #17397 Remove remaining calls to non-existing method (paradajozsef)
This PR was merged into the 3.0 branch. Discussion ---------- Remove remaining calls to non-existing method | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This removes the ```$this->buildViolation``` calls (which is a dead method) from validators in 3.0, as #17357 did. I just found 3 more. I hope it's not a problem, that it's not in 2 separate PR (Doctrine Bridge, Form). But I can split them if I have to. :) Commits ------- d7e3254 [3.0] Remove calls to not-existent method
2 parents 84623ea + d7e3254 commit 753811f

File tree

2 files changed

+15
-40
lines changed

2 files changed

+15
-40
lines changed

‎src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bridge\Doctrine\Validator\Constraints;
1313

1414
use Doctrine\Common\Persistence\ManagerRegistry;
15-
use Symfony\Component\Validator\Context\ExecutionContextInterface;
1615
use Symfony\Component\Validator\Constraint;
1716
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
1817
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
@@ -139,16 +138,9 @@ public function validate($entity, Constraint $constraint)
139138
$errorPath = null !== $constraint->errorPath ? $constraint->errorPath : $fields[0];
140139
$invalidValue = isset($criteria[$errorPath]) ? $criteria[$errorPath] : $criteria[$fields[0]];
141140

142-
if ($this->context instanceof ExecutionContextInterface) {
143-
$this->context->buildViolation($constraint->message)
144-
->atPath($errorPath)
145-
->setInvalidValue($invalidValue)
146-
->addViolation();
147-
} else {
148-
$this->buildViolation($constraint->message)
149-
->atPath($errorPath)
150-
->setInvalidValue($invalidValue)
151-
->addViolation();
152-
}
141+
$this->context->buildViolation($constraint->message)
142+
->atPath($errorPath)
143+
->setInvalidValue($invalidValue)
144+
->addViolation();
153145
}
154146
}

‎src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -114,39 +114,22 @@ public function validate($form, Constraint $constraint)
114114
? (string) $form->getViewData()
115115
: gettype($form->getViewData());
116116

117-
if ($this->context instanceof ExecutionContextInterface) {
118-
$this->context->buildViolation($config->getOption('invalid_message'))
119-
->setParameters(array_replace(array('{{ value }}' => $clientDataAsString), $config->getOption('invalid_message_parameters')))
120-
->setInvalidValue($form->getViewData())
121-
->setCode(Form::NOT_SYNCHRONIZED_ERROR)
122-
->setCause($form->getTransformationFailure())
123-
->addViolation();
124-
} else {
125-
$this->buildViolation($config->getOption('invalid_message'))
126-
->setParameters(array_replace(array('{{ value }}' => $clientDataAsString), $config->getOption('invalid_message_parameters')))
127-
->setInvalidValue($form->getViewData())
128-
->setCode(Form::NOT_SYNCHRONIZED_ERROR)
129-
->setCause($form->getTransformationFailure())
130-
->addViolation();
131-
}
117+
$this->context->buildViolation($config->getOption('invalid_message'))
118+
->setParameters(array_replace(array('{{ value }}' => $clientDataAsString), $config->getOption('invalid_message_parameters')))
119+
->setInvalidValue($form->getViewData())
120+
->setCode(Form::NOT_SYNCHRONIZED_ERROR)
121+
->setCause($form->getTransformationFailure())
122+
->addViolation();
132123
}
133124
}
134125

135126
// Mark the form with an error if it contains extra fields
136127
if (!$config->getOption('allow_extra_fields') && count($form->getExtraData()) > 0) {
137-
if ($this->context instanceof ExecutionContextInterface) {
138-
$this->context->buildViolation($config->getOption('extra_fields_message'))
139-
->setParameter('{{ extra_fields }}', implode('", "', array_keys($form->getExtraData())))
140-
->setInvalidValue($form->getExtraData())
141-
->setCode(Form::NO_SUCH_FIELD_ERROR)
142-
->addViolation();
143-
} else {
144-
$this->buildViolation($config->getOption('extra_fields_message'))
145-
->setParameter('{{ extra_fields }}', implode('", "', array_keys($form->getExtraData())))
146-
->setInvalidValue($form->getExtraData())
147-
->setCode(Form::NO_SUCH_FIELD_ERROR)
148-
->addViolation();
149-
}
128+
$this->context->buildViolation($config->getOption('extra_fields_message'))
129+
->setParameter('{{ extra_fields }}', implode('", "', array_keys($form->getExtraData())))
130+
->setInvalidValue($form->getExtraData())
131+
->setCode(Form::NO_SUCH_FIELD_ERROR)
132+
->addViolation();
150133
}
151134
}
152135

0 commit comments

Comments
 (0)
0