Skip to content
Permalink
Browse files

Fix merge: value in first argument and disable caching

Ref: 542d594
  • Loading branch information...
rchavik committed Jul 8, 2013
1 parent c92ecda commit 740513c039a0900546caa58f013662dc3a1079c2
@@ -447,7 +447,7 @@ protected function _extractValidationMessages() {
$plugins = array(null);
if (empty($this->params['exclude-plugins'])) {
$plugins = array_merge($plugins, App::objects('plugins'));
$plugins = array_merge($plugins, App::objects('Plugin', null, false));
}
foreach ($plugins as $plugin) {
$this->_extractPluginValidationMessages($plugin);
@@ -350,7 +350,7 @@ public function testExtractModelValidationInPlugin() {
$this->out = $this->getMock('Cake\Console\ConsoleOutput', array(), array(), '', false);
$this->in = $this->getMock('Cake\Console\ConsoleInput', array(), array(), '', false);
$this->Task = $this->getMock('Cake\Console\Command\Task\ExtractTask',
array('_isExtractingApp', '_extractValidationMessages', 'in', 'out', 'err', 'clear', '_stop'),
array('_isExtractingApp', 'in', 'out', 'err', 'clear', '_stop'),
array($this->out, $this->out, $this->in)
);

0 comments on commit 740513c

Please sign in to comment.
You can’t perform that action at this time.