X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=vendor%2Fsymfony%2Fvalidator%2FTest%2FConstraintValidatorTestCase.php;h=087a90a1850d7f09d12e4befa4bb08074695c323;hb=4e1bfbf98b844da83b18aca92ef00f11a4735806;hp=c2932f81e8b1f54acf3477fa6cce9180f051ff42;hpb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;p=yaffs-website diff --git a/vendor/symfony/validator/Test/ConstraintValidatorTestCase.php b/vendor/symfony/validator/Test/ConstraintValidatorTestCase.php index c2932f81e..087a90a18 100644 --- a/vendor/symfony/validator/Test/ConstraintValidatorTestCase.php +++ b/vendor/symfony/validator/Test/ConstraintValidatorTestCase.php @@ -121,8 +121,8 @@ abstract class ConstraintValidatorTestCase extends TestCase protected function setObject($object) { $this->object = $object; - $this->metadata = is_object($object) - ? new ClassMetadata(get_class($object)) + $this->metadata = \is_object($object) + ? new ClassMetadata(\get_class($object)) : null; $this->context->setNode($this->value, $this->object, $this->metadata, $this->propertyPath); @@ -131,8 +131,8 @@ abstract class ConstraintValidatorTestCase extends TestCase protected function setProperty($object, $property) { $this->object = $object; - $this->metadata = is_object($object) - ? new PropertyMetadata(get_class($object), $property) + $this->metadata = \is_object($object) + ? new PropertyMetadata(\get_class($object), $property) : null; $this->context->setNode($this->value, $this->object, $this->metadata, $this->propertyPath); @@ -192,7 +192,7 @@ abstract class ConstraintValidatorTestCase extends TestCase protected function assertNoViolation() { - $this->assertSame(0, $violationsCount = count($this->context->getViolations()), sprintf('0 violation expected. Got %u.', $violationsCount)); + $this->assertSame(0, $violationsCount = \count($this->context->getViolations()), sprintf('0 violation expected. Got %u.', $violationsCount)); } /** @@ -227,7 +227,6 @@ class ConstraintViolationAssertion private $parameters = array(); private $invalidValue = 'InvalidValue'; private $propertyPath = 'property.path'; - private $translationDomain; private $plural; private $code; private $constraint; @@ -264,7 +263,7 @@ class ConstraintViolationAssertion public function setTranslationDomain($translationDomain) { - $this->translationDomain = $translationDomain; + // no-op for BC return $this; } @@ -315,7 +314,7 @@ class ConstraintViolationAssertion $violations = iterator_to_array($this->context->getViolations()); - Assert::assertSame($expectedCount = count($expected), $violationsCount = count($violations), sprintf('%u violation(s) expected. Got %u.', $expectedCount, $violationsCount)); + Assert::assertSame($expectedCount = \count($expected), $violationsCount = \count($violations), sprintf('%u violation(s) expected. Got %u.', $expectedCount, $violationsCount)); reset($violations);