Merge branch '2.x'

* 2.x:
  make LanguageMap countable

Author: xabbuh

src/Definition.php

@@ -219,15 +219,15 @@ public function equals(Definition $definition)
             return false;
         }
 
-        if (!is_array($this->name) xor !is_array($definition->name)) {
+        if (null !== $this->name xor null !== $definition->name) {
             return false;
         }
 
-        if (!is_array($this->description) xor !is_array($definition->description)) {
+        if (null !== $this->description xor null !== $definition->description) {
             return false;
         }
 
-        if (is_array($this->name)) {
+        if (null !== $this->name) {
             foreach ($this->name as $language => $value) {
                 if (!isset($definition->name[$language])) {
                     return false;
@@ -239,7 +239,7 @@ public function equals(Definition $definition)
             }
         }
 
-        if (is_array($this->description)) {
+        if (null !== $this->description) {
             foreach ($this->description as $language => $value) {
                 if (!isset($definition->description[$language])) {
                     return false;

src/LanguageMap.php

@@ -16,7 +16,7 @@
  *
  * @author Christian Flothmann <[email protected]>
  */
-final class LanguageMap implements \ArrayAccess
+final class LanguageMap implements \ArrayAccess, \Countable
 {
     private $map;
 
@@ -104,6 +104,11 @@ public function offsetUnset($languageTag)
         throw new \LogicException('Entries of a language map cannot be removed.');
     }
 
+    public function count()
+    {
+        return count($this->map);
+    }
+
     public function equals(LanguageMap $languageMap)
     {
         if (count($this->map) !== count($languageMap->map)) {

src/Verb.php

@@ -75,23 +75,25 @@ public function equals(Verb $verb)
             return false;
         }
 
-        if (!is_array($this->display) xor !is_array($verb->display)) {
+        if (null === $this->display && null === $verb->display) {
+            return true;
+        }
+
+        if (null !== $this->display xor null !== $verb->display) {
             return false;
         }
 
         if (count($this->display) !== count($verb->getDisplay())) {
             return false;
         }
 
-        if (is_array($this->display)) {
-            foreach ($this->display as $language => $value) {
-                if (!isset($verb->display[$language])) {
-                    return false;
-                }
+        foreach ($this->display as $language => $value) {
+            if (!isset($verb->display[$language])) {
+                return false;
+            }
 
-                if ($value !== $verb->display[$language]) {
-                    return false;
-                }
+            if ($value !== $verb->display[$language]) {
+                return false;
             }
         }