merged branch clemens-tolboom/filedumper-backup (PR #4302)

fabpot · fabpot · commit e351c9f0a88c · 2012-05-17T20:41:02.000+02:00
Commits ------- 189874d FileDumper does no backup. Discussion ---------- FileDumper does no backup. Backup check path missed a '/'. So no backup was made. Removed the repeating path construction by replacing it by new variable. --------------------------------------------------------------------------- by travisbot at 2012-05-16T14:14:58Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1345963) (merged 189874d into 5314836).
diff --git a/src/Symfony/Component/Translation/Dumper/FileDumper.php b/src/Symfony/Component/Translation/Dumper/FileDumper.php
@@ -37,11 +37,12 @@ public function dump(MessageCatalogue $messages, $options = array())
         foreach ($messages->getDomains() as $domain) {
             $file = $domain.'.'.$messages->getLocale().'.'.$this->getExtension();
             // backup
-            if (file_exists($options['path'].$file)) {
-                copy($options['path'].$file, $options['path'].'/'.$file.'~');
+            $fullpath = $options['path'].'/'.$file;
+            if (file_exists($fullpath)) {
+                copy($fullpath, $fullpath.'~');
             }
             // save file
-            file_put_contents($options['path'].'/'.$file, $this->format($messages, $domain));
+            file_put_contents($fullpath, $this->format($messages, $domain));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,12 @@ public function dump(MessageCatalogue $messages, $options = array())`
`37`	`37`	`foreach ($messages->getDomains() as $domain) {`
`38`	`38`	`$file = $domain.'.'.$messages->getLocale().'.'.$this->getExtension();`
`39`	`39`	`// backup`
`40`		`- if (file_exists($options['path'].$file)) {`
`41`		`- copy($options['path'].$file, $options['path'].'/'.$file.'~');`
	`40`	`+ $fullpath = $options['path'].'/'.$file;`
	`41`	`+ if (file_exists($fullpath)) {`
	`42`	`+ copy($fullpath, $fullpath.'~');`
`42`	`43`	`}`
`43`	`44`	`// save file`
`44`		`- file_put_contents($options['path'].'/'.$file, $this->format($messages, $domain));`
	`45`	`+ file_put_contents($fullpath, $this->format($messages, $domain));`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`