Merge branch '2.7' into 2.8

* 2.7:
  [TwigBundle] add back exception check
  Dont call count on non countable object

Author: fabpot

Dumper/IcuResFileDumper.php

@@ -62,7 +62,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
 
         $resOffset = $this->getPosition($data);
 
-        $data .= pack('v', count($messages))
+        $data .= pack('v', count($messages->all($domain)))
             .$indexes
             .$this->writePadding($data)
             .$resources
@@ -73,11 +73,11 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
         $root = pack('V7',
             $resOffset + (2 << 28), // Resource Offset + Resource Type
             6,                      // Index length
-            $keyTop,                // Index keys top
-            $bundleTop,             // Index resources top
-            $bundleTop,             // Index bundle top
-            count($messages),       // Index max table length
-            0                       // Index attributes
+            $keyTop,                        // Index keys top
+            $bundleTop,                     // Index resources top
+            $bundleTop,                     // Index bundle top
+            count($messages->all($domain)), // Index max table length
+            0                               // Index attributes
         );
 
         $header = pack('vC2v4C12@32',