Skip to content

Commit 78e0aec

Browse files
Merge branch '4.1'
* 4.1: (22 commits) Fix CS [PropertyInfo] fix resolving parent|self type hints fixed CS fix merge [Security] Fix logout Cleanup 2 tests for the HttpException classes #27250 limiting GET_LOCK key up to 64 char due to changes in MySQL 5.7.5 and later [Config] Fix tests when path contains UTF chars [DI] Shared services should not be inlined in non-shared ones [Profiler] Remove propel & event_listener_loading category identifiers [Filesystem] Fix usages of error_get_last() [Cache][Lock] Fix usages of error_get_last() [Debug] Fix populating error_get_last() for handled silent errors fixed CS fixed CS fixed CS [FrameworkBundle] Fix cache:clear on vagrant [HttpKernel] Handle NoConfigurationException "onKernelException()" Fix misses calculation when calling getItems [DI] Display previous error messages when throwing unused bindings ...
2 parents 0ea15f6 + c6e4dc1 commit 78e0aec

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ConstraintViolationListInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function add(ConstraintViolationInterface $violation);
2626
/**
2727
* Merges an existing violation list into this list.
2828
*/
29-
public function addAll(ConstraintViolationListInterface $otherList);
29+
public function addAll(self $otherList);
3030

3131
/**
3232
* Returns the violation at a given offset.

Mapping/ClassMetadata.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ public function addGetterMethodConstraints($property, $method, array $constraint
330330
/**
331331
* Merges the constraints of the given metadata into this object.
332332
*/
333-
public function mergeConstraints(ClassMetadata $source)
333+
public function mergeConstraints(self $source)
334334
{
335335
if ($source->isGroupSequenceProvider()) {
336336
$this->setGroupSequenceProvider(true);

0 commit comments

Comments
 (0)