bug #18271 [FileSystem] Google app engine filesystem (swordbeta)

fabpot · fabpot · commit 7dafdda580aa · 2016-03-27T12:19:31.000+02:00
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #18271). Discussion ---------- [FileSystem] Google app engine filesystem | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17922 | License | MIT | Doc PR | - Commits ------- 06d8697 [FileSystem] Add support for Google App Engine.
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -486,13 +486,13 @@ public function tempnam($dir, $prefix)
     {
         list($scheme, $hierarchy) = $this->getSchemeAndHierarchy($dir);
 
-        // If no scheme or scheme is "file" create temp file in local filesystem
-        if (null === $scheme || 'file' === $scheme) {
+        // If no scheme or scheme is "file" or "gs" create temp file in local filesystem
+        if (null === $scheme || 'file' === $scheme || 'gs' === $scheme) {
             $tmpFile = tempnam($hierarchy, $prefix);
 
             // If tempnam failed or no scheme return the filename otherwise prepend the scheme
             if (false !== $tmpFile) {
-                if (null !== $scheme) {
+                if (null !== $scheme && 'gs' !== $scheme) {
                     return $scheme.'://'.$tmpFile;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -486,13 +486,13 @@ public function tempnam($dir, $prefix)`
`486`	`486`	`{`
`487`	`487`	`list($scheme, $hierarchy) = $this->getSchemeAndHierarchy($dir);`
`488`	`488`
`489`		`- // If no scheme or scheme is "file" create temp file in local filesystem`
`490`		`- if (null === $scheme \|\| 'file' === $scheme) {`
	`489`	`+ // If no scheme or scheme is "file" or "gs" create temp file in local filesystem`
	`490`	`+ if (null === $scheme \|\| 'file' === $scheme \|\| 'gs' === $scheme) {`
`491`	`491`	`$tmpFile = tempnam($hierarchy, $prefix);`
`492`	`492`
`493`	`493`	`// If tempnam failed or no scheme return the filename otherwise prepend the scheme`
`494`	`494`	`if (false !== $tmpFile) {`
`495`		`- if (null !== $scheme) {`
	`495`	`+ if (null !== $scheme && 'gs' !== $scheme) {`
`496`	`496`	`return $scheme.'://'.$tmpFile;`
`497`	`497`	`}`
`498`	`498`