diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.1

Browse Source 
* 3.4:
  [DI] dont fail on missing classes when resource tracking is disabled
  [Validator] Added the missing constraints instance checks
This commit is contained in:
Nicolas Grekas 2018-11-15 13:40:31 +01:00
commit 17163ab430
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View File

@ -348,7 +348,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
$resource = new ClassExistenceResource($class, false);
$classReflector = $resource->isFresh(0) ? false : new \ReflectionClass($class);
} else {
$classReflector = new \ReflectionClass($class);
$classReflector = class_exists($class) ? new \ReflectionClass($class) : false;
}
} catch (\ReflectionException $e) {
if ($throw) {

5
src/Symfony/Component/Validator/Constraints/BicValidator.php
View File

@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
/**
* @author Michael Hirschler <michael.vhirsch@gmail.com>
@ -26,6 +27,10 @@ class BicValidator extends ConstraintValidator
*/
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Bic) {
throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Bic');
}
if (null === $value || '' === $value) {
return;
}

4
src/Symfony/Component/Validator/Constraints/CountValidator.php
View File

@ -25,6 +25,10 @@ class CountValidator extends ConstraintValidator
*/
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Count) {
throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Count');
}
if (null === $value) {
return;
}

8
src/Symfony/Component/Validator/Constraints/UuidValidator.php
View File

@ -66,14 +66,14 @@ class UuidValidator extends ConstraintValidator
*/
public function validate($value, Constraint $constraint)
{
if (null === $value || '' === $value) {
return;
}
if (!$constraint instanceof Uuid) {
throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Uuid');
}
if (null === $value || '' === $value) {
return;
}
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
throw new UnexpectedTypeException($value, 'string');
}