Merge branch 'feature/5908' into develop

Close zendframework/zendframework#5908

src/Translator/TextDomain.php

@@ -25,6 +25,13 @@ class TextDomain extends ArrayObject
      */
     protected $pluralRule;
 
+    /**
+     * Default plural rule shared between instances.
+     *
+     * @var PluralRule
+     */
+    protected static $defaultPluralRule;
+
     /**
      * Set the plural rule
      *
@@ -40,17 +47,40 @@ public function setPluralRule(PluralRule $rule)
     /**
      * Get the plural rule.
      *
-     * Lazy loads a default rule if none already registered
+     * @param  bool $fallbackToDefaultRule
+     * @return PluralRule|null
+     */
+    public function getPluralRule($fallbackToDefaultRule = true)
+    {
+        if ($this->pluralRule === null && $fallbackToDefaultRule) {
+            return static::getDefaultPluralRule();
+        }
+
+        return $this->pluralRule;
+    }
+
+    /**
+     * Checks whether the text domain has a plural rule.
+     *
+     * @return bool
+     */
+    public function hasPluralRule()
+    {
+        return ($this->pluralRule !== null);
+    }
+
+    /**
+     * Returns a shared default plural rule.
      *
      * @return PluralRule
      */
-    public function getPluralRule()
+    public static function getDefaultPluralRule()
     {
-        if ($this->pluralRule === null) {
-            $this->setPluralRule(PluralRule::fromString('nplurals=2; plural=n != 1;'));
+        if (static::$defaultPluralRule === null) {
+            static::$defaultPluralRule = PluralRule::fromString('nplurals=2; plural=n != 1;');
         }
 
-        return $this->pluralRule;
+        return static::$defaultPluralRule;
     }
 
     /**
@@ -66,8 +96,12 @@ public function getPluralRule()
      */
     public function merge(TextDomain $textDomain)
     {
-        if ($this->getPluralRule()->getNumPlurals() !== $textDomain->getPluralRule()->getNumPlurals()) {
-            throw new Exception\RuntimeException('Plural rule of merging text domain is not compatible with the current one');
+        if ($this->hasPluralRule() && $textDomain->hasPluralRule()) {
+            if ($this->getPluralRule()->getNumPlurals() !== $textDomain->getPluralRule()->getNumPlurals()) {
+                throw new Exception\RuntimeException('Plural rule of merging text domain is not compatible with the current one');
+            }
+        } elseif ($textDomain->hasPluralRule()) {
+            $this->setPluralRule($textDomain->getPluralRule());
         }
 
         $this->exchangeArray(

test/Translator/TextDomainTest.php

@@ -58,10 +58,43 @@ public function testMergingIncompatibleTextDomains()
     {
         $this->setExpectedException('Zend\I18n\Exception\RuntimeException', 'is not compatible');
 
+        $domainA = new TextDomain();
+        $domainB = new TextDomain();
+        $domainA->setPluralRule(PluralRule::fromString('nplurals=3; plural=n'));
+        $domainB->setPluralRule(PluralRule::fromString('nplurals=2; plural=n'));
+
+        $domainA->merge($domainB);
+    }
+
+    public function testMergingTextDomainsWithPluralRules()
+    {
+        $domainA = new TextDomain();
+        $domainB = new TextDomain();
+
+        $domainA->merge($domainB);
+        $this->assertFalse($domainA->hasPluralRule());
+        $this->assertFalse($domainB->hasPluralRule());
+    }
+
+    public function testMergingTextDomainWithPluralRuleIntoTextDomainWithoutPluralRule()
+    {
         $domainA = new TextDomain();
         $domainB = new TextDomain();
         $domainB->setPluralRule(PluralRule::fromString('nplurals=3; plural=n'));
 
         $domainA->merge($domainB);
+        $this->assertEquals(3, $domainA->getPluralRule()->getNumPlurals());
+        $this->assertEquals(3, $domainB->getPluralRule()->getNumPlurals());
+    }
+
+    public function testMergingTextDomainWithoutPluralRuleIntoTextDomainWithPluralRule()
+    {
+        $domainA = new TextDomain();
+        $domainB = new TextDomain();
+        $domainA->setPluralRule(PluralRule::fromString('nplurals=3; plural=n'));
+
+        $domainA->merge($domainB);
+        $this->assertEquals(3, $domainA->getPluralRule()->getNumPlurals());
+        $this->assertFalse($domainB->hasPluralRule());
     }
 }