Merge branch '2.7' into 2.8

fabpot · fabpot · commit bf9c7d6261b9 · 2017-03-21T14:39:01.000-07:00
* 2.7:
  [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
diff --git a/Tests/Resources/TranslationFilesTest.php b/Tests/Resources/TranslationFilesTest.php
@@ -25,6 +25,8 @@ public function testTranslationFileIsValid($filePath)
         } else {
             \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
         }
+
+        $this->addToAssertionCount(1);
     }
 
     public function provideTranslationFiles()

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ public function testTranslationFileIsValid($filePath)`
`25`	`25`	`} else {`
`26`	`26`	`\PHPUnit\Util\XML::loadfile($filePath, false, false, true);`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+ $this->addToAssertionCount(1);`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`public function provideTranslationFiles()`