Merge branch '4.4' into 5.2

* 4.4:
  [travis] use packagist API v2
  [translation] Fix update existing key with existing +int-icu domain
  [Contracts] Fix branch name in README.md links

Author: nicolas-grekas

MessageCatalogue.php

@@ -163,7 +163,7 @@ public function add(array $messages, string $domain = 'messages')
         }
         $intlDomain = $domain;
         $suffixLength = \strlen(self::INTL_DOMAIN_SUFFIX);
-        if (\strlen($domain) > $suffixLength && false !== strpos($domain, self::INTL_DOMAIN_SUFFIX, -$suffixLength)) {
+        if (\strlen($domain) < $suffixLength || false === strpos($domain, self::INTL_DOMAIN_SUFFIX, -$suffixLength)) {
             $intlDomain .= self::INTL_DOMAIN_SUFFIX;
         }
         foreach ($messages as $id => $message) {

Tests/MessageCatalogueTest.php

@@ -58,7 +58,7 @@ public function testAll()
         $this->assertEquals($messages, $catalogue->all());
     }
 
-    public function testAllIntICU()
+    public function testAllIntlIcu()
     {
         $messages = [
             'domain1+intl-icu' => ['foo' => 'bar'],
@@ -118,6 +118,16 @@ public function testAdd()
         $this->assertEquals('bar', $catalogue->get('foo', 'domain88'));
     }
 
+    public function testAddIntlIcu()
+    {
+        $catalogue = new MessageCatalogue('en', ['domain1+intl-icu' => ['foo' => 'foo']]);
+        $catalogue->add(['foo1' => 'foo1'], 'domain1');
+        $catalogue->add(['foo' => 'bar'], 'domain1');
+
+        $this->assertSame('bar', $catalogue->get('foo', 'domain1'));
+        $this->assertSame('foo1', $catalogue->get('foo1', 'domain1'));
+    }
+
     public function testReplace()
     {
         $catalogue = new MessageCatalogue('en', ['domain1' => ['foo' => 'foo'], 'domain1+intl-icu' => ['bar' => 'bar']]);