Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit f0bfc985d2b8 · 2016-10-28T10:10:49.000+02:00
* 2.7:
  Compatibility with Twig 1.27
  Enhance GAE compat by removing some realpath()
  bumped Symfony version to 2.7.21
  updated VERSION for 2.7.20
  update CONTRIBUTORS for 2.7.20
  updated CHANGELOG for 2.7.20
  [SecurityBundle] Fix twig-bridge lowest dep
diff --git a/Resource/FileResource.php b/Resource/FileResource.php
@@ -32,7 +32,7 @@ class FileResource implements SelfCheckingResourceInterface, \Serializable
      */
     public function __construct($resource)
     {
-        $this->resource = realpath($resource);
+        $this->resource = realpath($resource) ?: (file_exists($resource) ? $resource : false);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class FileResource implements SelfCheckingResourceInterface, \Serializable`
`32`	`32`	`*/`
`33`	`33`	`public function __construct($resource)`
`34`	`34`	`{`
`35`		`- $this->resource = realpath($resource);`
	`35`	`+ $this->resource = realpath($resource) ?: (file_exists($resource) ? $resource : false);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`