This commit is contained in:
Fabien Potencier 2015-05-15 16:02:48 +02:00
parent c658fcdbca
commit d883ba0984
5 changed files with 4 additions and 6 deletions

View File

@ -22,5 +22,4 @@ class GlobTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(Glob::toRegex('.*', true, true, ''), '^\.[^/]*$'); $this->assertEquals(Glob::toRegex('.*', true, true, ''), '^\.[^/]*$');
$this->assertEquals(Glob::toRegex('.*', true, true, '/'), '/^\.[^/]*$/'); $this->assertEquals(Glob::toRegex('.*', true, true, '/'), '/^\.[^/]*$/');
} }
} }

View File

@ -66,7 +66,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
// should set a response, but does not // should set a response, but does not
}); });
$kernel = new HttpKernel($dispatcher, $this->getResolver(function () use($exception) { throw $exception; })); $kernel = new HttpKernel($dispatcher, $this->getResolver(function () use ($exception) { throw $exception; }));
try { try {
$kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true); $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);

View File

@ -108,4 +108,3 @@ class IpValidator extends ConstraintValidator
} }
} }
} }

View File

@ -238,15 +238,15 @@ class UuidValidator extends ConstraintValidator
) )
->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR) ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR)
->addViolation(); ->addViolation();
} else { } else {
$this->buildViolation($constraint->message) $this->buildViolation($constraint->message)
->setParameter( ->setParameter(
'{{ value }}', '{{ value }}',
$this->formatValue($value) $this->formatValue($value)
) )
->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR) ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR)
->addViolation(); ->addViolation();
} }
return; return;
} }