Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 9d8cb1ce18cd · 2016-02-22T17:12:29.000+01:00
* 2.3:
  PhpUnitNoDedicateAssertFixer results
  Improve Norwegian translations
  Simplify markdown for PR template

Conflicts:
	src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
	src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php
diff --git a/Tests/CacheWarmer/CacheWarmerTest.php b/Tests/CacheWarmer/CacheWarmerTest.php
@@ -32,7 +32,7 @@ public function testWriteCacheFileCreatesTheFile()
         $warmer = new TestCacheWarmer(self::$cacheFile);
         $warmer->warmUp(dirname(self::$cacheFile));
 
-        $this->assertTrue(file_exists(self::$cacheFile));
+        $this->assertFileExists(self::$cacheFile);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function testWriteCacheFileCreatesTheFile()`
`32`	`32`	`$warmer = new TestCacheWarmer(self::$cacheFile);`
`33`	`33`	`$warmer->warmUp(dirname(self::$cacheFile));`
`34`	`34`
`35`		`- $this->assertTrue(file_exists(self::$cacheFile));`
	`35`	`+ $this->assertFileExists(self::$cacheFile);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`