Skip to content

Commit 0f8119b

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 e27710d + 5432cff commit 0f8119b

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

MessageCatalogueInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ public function add($messages, $domain = 'messages');
105105
*
106106
* The two catalogues must have the same locale.
107107
*/
108-
public function addCatalogue(MessageCatalogueInterface $catalogue);
108+
public function addCatalogue(self $catalogue);
109109

110110
/**
111111
* Merges translations from the given Catalogue into the current one
112112
* only when the translation does not exist.
113113
*
114114
* This is used to provide default translations when they do not exist for the current locale.
115115
*/
116-
public function addFallbackCatalogue(MessageCatalogueInterface $catalogue);
116+
public function addFallbackCatalogue(self $catalogue);
117117

118118
/**
119119
* Gets the fallback catalogue.

Tests/Command/XliffLintCommandTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
use Symfony\Component\Console\Application;
1616
use Symfony\Component\Console\Output\OutputInterface;
1717
use Symfony\Component\Console\Tester\CommandTester;
18-
use Symfony\Component\Console\Helper\HelperSet;
19-
use Symfony\Component\Console\Input\InputDefinition;
20-
use Symfony\Component\HttpKernel\KernelInterface;
2118
use Symfony\Component\Translation\Command\XliffLintCommand;
2219

2320
/**

0 commit comments

Comments
 (0)