Skip to content

Commit 362fcf4

Browse files
Merge branch '3.3' into 3.4
* 3.3: (21 commits) [appveyor] disable memory limit on composer up Remove some unused variables and properties Remove some unused variables, properties and methods fix some edge cases with indented blocks [ExpressionLanguage] Fix parse error on 5.3 [HttpKernel] remove noisy frame in controller stack traces [DI] Fix circular-aliases message [ExpressionLanguage] throw an SyntaxError instead of letting a undefined index notice Prevent a loop in aliases within the `findDefinition` method Fix php doc in Table class bumped Symfony version to 3.3.15 updated VERSION for 3.3.14 updated CHANGELOG for 3.3.14 bumped Symfony version to 2.8.33 updated VERSION for 2.8.32 updated CHANGELOG for 2.8.32 bumped Symfony version to 2.7.40 updated VERSION for 2.7.39 update CONTRIBUTORS for 2.7.39 updated CHANGELOG for 2.7.39 ...
2 parents 1a46cfa + 5a26b97 commit 362fcf4

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Test/ConstraintValidatorTestCase.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ class ConstraintViolationAssertion
227227
private $parameters = array();
228228
private $invalidValue = 'InvalidValue';
229229
private $propertyPath = 'property.path';
230-
private $translationDomain;
231230
private $plural;
232231
private $code;
233232
private $constraint;
@@ -264,7 +263,7 @@ public function setParameters(array $parameters)
264263

265264
public function setTranslationDomain($translationDomain)
266265
{
267-
$this->translationDomain = $translationDomain;
266+
// no-op for BC
268267

269268
return $this;
270269
}

0 commit comments

Comments
 (0)