Skip to content

Commit b4ccde0

Browse files
Merge branch '3.4' into 4.0
* 3.4: (37 commits) Remove some unused variables and properties [appveyor] disable memory limit on composer up [HttpFoundation] don't prefix cookies with "Set-Cookie:" Remove some unused variables and properties Fix debug:form definition 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] Force root-namespace for function calls in the dumper container [DI] Fix circular-aliases message register system cache clearer only if it's used doc : Namespace prefix must end with a "\" [ExpressionLanguage] throw an SyntaxError instead of letting a undefined index notice Prevent a loop in aliases within the `findDefinition` method [HttpKernel] Disable inlining on PHP 5 Ensure that inlined services with parameterized class name can be dumped [DI] Fix non-string class handling in PhpDumper Throw a sensible exception when controller has been removed Remove LOCK_EX That Breaks Cache Usage on NFS ...
2 parents 53437bd + 362fcf4 commit b4ccde0

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)