Skip to content

Commit 6e0a9d8

Browse files
committed
Merge branch '3.0'
* 3.0: fixed CS fixed CS fixed CS fixed test fixed CS Remove default match from AbstractConfigCommand::findExtension Remove unused imports [FrameworkBundle][Validator] Fix apc cache service deprecation
2 parents 7ef620c + 4056cfb commit 6e0a9d8

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Catalogue/TargetOperation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected function processDomain($domain)
4242
//
4343
// For 'obsolete' messages, the code can't be simplifed as ``array_diff_assoc($this->source->all($domain), $this->target->all($domain))``
4444
// because doing so will not exclude messages like {x: x ∈ source ∧ x ∉ target.all ∧ x ∈ target.fallback}
45-
45+
4646
foreach ($this->source->all($domain) as $id => $message) {
4747
if ($this->target->has($id, $domain)) {
4848
$this->messages[$domain]['all'][$id] = $message;

Tests/Catalogue/TargetOperationTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,4 @@ protected function createOperation(MessageCatalogueInterface $source, MessageCat
7979
{
8080
return new TargetOperation($source, $target);
8181
}
82-
8382
}

0 commit comments

Comments
 (0)