Merge branch '2.8' into 3.2

* 2.8:
  Fixes a typo in the form collector styles
  [HttpKernel] Fixed bug with purging of HTTPS URLs
  fix some risky tests
  [DI] [YamlFileLoader] change error message of a non existing file
  [Security] Added option to return true in the method isRememberMeRequested

Author: fabpot

Tests/PluralizationRulesTest.php

@@ -65,7 +65,6 @@ public function successLangcodes()
             array('2', array('nl', 'fr', 'en', 'de', 'de_GE', 'hy', 'hy_AM')),
             array('3', array('be', 'bs', 'cs', 'hr')),
             array('4', array('cy', 'mt', 'sl')),
-            array('5', array()),
             array('6', array('ar')),
         );
     }
@@ -86,7 +85,6 @@ public function failingLangcodes()
             array('3', array('cbs')),
             array('4', array('gd', 'kw')),
             array('5', array('ga')),
-            array('6', array()),
         );
     }
 

Tests/TranslatorTest.php

@@ -156,6 +156,7 @@ public function testSetFallbackValidLocales($locale)
         $translator = new Translator($locale, new MessageSelector());
         $translator->setFallbackLocales(array('fr', $locale));
         // no assertion. this method just asserts that no exception is thrown
+        $this->addToAssertionCount(1);
     }
 
     public function testTransWithFallbackLocale()
@@ -187,6 +188,7 @@ public function testAddResourceValidLocales($locale)
         $translator = new Translator('fr', new MessageSelector());
         $translator->addResource('array', array('foo' => 'foofoo'), $locale);
         // no assertion. this method just asserts that no exception is thrown
+        $this->addToAssertionCount(1);
     }
 
     public function testAddResourceAfterTrans()
@@ -390,6 +392,7 @@ public function testTransChoiceValidLocale($locale)
 
         $translator->transChoice('foo', 1, array(), '', $locale);
         // no assertion. this method just asserts that no exception is thrown
+        $this->addToAssertionCount(1);
     }
 
     public function getTransFileTests()