adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-12-24 14:37:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #668 from jellehenkens/2.2-extract-improvement

Browse source 
Overwrite option to skip file exists warnings in cake i18n extract
This commit is contained in:
Mark Story 2012-05-25 09:41:38 -07:00
commit 9d76d3f88a
2 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Cake/Console/Command/Task/ExtractTask.php
View file

@ -302,6 +302,11 @@ class ExtractTask extends AppShell {
->addOption('exclude', array( ->addOption('exclude', array(
'help' => __d('cake_console', 'Comma separated list of directories to exclude.' . 'help' => __d('cake_console', 'Comma separated list of directories to exclude.' .
' Any path containing a path segment with the provided values will be skipped. E.g. test,vendors') ' Any path containing a path segment with the provided values will be skipped. E.g. test,vendors')
))
->addOption('overwrite', array(
'boolean' => true,
'default' => false,
'help' => __d('cake_console', 'Always overwrite existing .pot files.')
)); ));
} }
@ -537,6 +542,10 @@ class ExtractTask extends AppShell {
*/ */
protected function _writeFiles() { protected function _writeFiles() {
$overwriteAll = false; $overwriteAll = false;
if (!empty($this->params['overwrite'])) {
$overwriteAll = true;
}
foreach ($this->_storage as $domain => $sentences) { foreach ($this->_storage as $domain => $sentences) {
$output = $this->_writeHeader(); $output = $this->_writeHeader();
foreach ($sentences as $sentence => $header) { foreach ($sentences as $sentence => $header) {

22
lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
View file

@ -399,4 +399,26 @@ class ExtractTaskTest extends CakeTestCase {
$pattern = '#Plugin/TestPlugin/Model/TestPluginPost.php:validation for field title#'; $pattern = '#Plugin/TestPlugin/Model/TestPluginPost.php:validation for field title#';
$this->assertNotRegExp($pattern, $result); $this->assertNotRegExp($pattern, $result);
} }
/**
* Test that the extract shell overwrites existing files with the overwrite parameter
*
* @return void
*/
public function testExtractOverwrite() {
$this->Task->interactive = false;
$this->Task->params['paths'] = CAKE . 'Test' . DS . 'test_app' . DS;
$this->Task->params['output'] = $this->path . DS;
$this->Task->params['overwrite'] = true;
file_put_contents($this->path . DS . 'default.pot', 'will be overwritten');
$this->assertTrue(file_exists($this->path . DS . 'default.pot'));
$original = file_get_contents($this->path . DS . 'default.pot');
$this->Task->execute();
$result = file_get_contents($this->path . DS . 'default.pot');
$this->assertNotEquals($original, $result);
}
} }