merged branch caponica/cache-clear-win-workaround (PR #8767)

fabpot · fabpot · commit d60fa064f38b · 2013-08-15T15:44:11.000+02:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8767). Discussion ---------- Added sleep() workaround for windows php rename bug For more info see links in issue #8766 Commits ------- b3c815b Added sleep() workaround for windows php rename bug
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -83,6 +83,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->warmup($warmupDir, $realCacheDir, !$input->getOption('no-optional-warmers'));
 
             $filesystem->rename($realCacheDir, $oldCacheDir);
+            if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+                sleep(1);  // workaround for windows php rename bug
+            }
             $filesystem->rename($warmupDir, $realCacheDir);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,9 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`83`	`83`	`$this->warmup($warmupDir, $realCacheDir, !$input->getOption('no-optional-warmers'));`
`84`	`84`
`85`	`85`	`$filesystem->rename($realCacheDir, $oldCacheDir);`
	`86`	`+ if (defined('PHP_WINDOWS_VERSION_BUILD')) {`
	`87`	`+ sleep(1); // workaround for windows php rename bug`
	`88`	`+ }`
`86`	`89`	`$filesystem->rename($warmupDir, $realCacheDir);`
`87`	`90`	`}`
`88`	`91`