adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed wrong validation init in Model bake task when having index starting at 1.

Browse source 
Added guess 'uuid' for type 'string' and length 36.
Updated missing calls to assertEqual() testFieldValidationGuessing().
Added test for uuid guessing.
This commit is contained in:
Thomas Ploch 2011-05-16 15:29:23 +02:00
parent b6ef1305df
commit 8ef7016545
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cake/console/libs/tasks/model.php
View file

@ -353,6 +353,7 @@ class ModelTask extends BakeTask {
$default++;
}
}
$choices[$default] = 'none'; // Needed since index starts at 1
$this->_validations = $choices;
return $choices;
}
@ -391,6 +392,8 @@ class ModelTask extends BakeTask {
if ($metaData['null'] != 1 && !in_array($fieldName, array($primaryKey, 'created', 'modified', 'updated'))) {
if ($fieldName == 'email') {
$guess = $methods['email'];
} elseif ($metaData['type'] == 'string' && $metaData['length'] == 36) {
$guess = $methods['uuid'];
} elseif ($metaData['type'] == 'string') {
$guess = $methods['notempty'];
} elseif ($metaData['type'] == 'integer') {

12
cake/tests/cases/console/libs/tasks/model.test.php
View file

@ -197,21 +197,31 @@ class ModelTaskTest extends CakeTestCase {
$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
$expected = array('notempty' => 'notempty');
$this->assertEqual($result, $expected);
$result = $this->Task->fieldValidation('text', array('type' => 'date', 'length' => 10, 'null' => false));
$expected = array('date' => 'date');
$this->assertEqual($result, $expected);
$result = $this->Task->fieldValidation('text', array('type' => 'time', 'length' => 10, 'null' => false));
$expected = array('time' => 'time');
$this->assertEqual($result, $expected);
$result = $this->Task->fieldValidation('email', array('type' => 'string', 'length' => 10, 'null' => false));
$expected = array('email' => 'email');
$this->assertEqual($result, $expected);
$result = $this->Task->fieldValidation('test', array('type' => 'integer', 'length' => 10, 'null' => false));
$expected = array('numeric' => 'numeric');
$this->assertEqual($result, $expected);
$result = $this->Task->fieldValidation('test', array('type' => 'boolean', 'length' => 10, 'null' => false));
$expected = array('numeric' => 'numeric');
$expected = array('boolean' => 'boolean');
$this->assertEqual($result, $expected);
$result = $this->Task->fieldValidation('test', array('type' => 'string', 'length' => 36, 'null' => false));
$expected = array('uuid' => 'uuid');
$this->assertEqual($result, $expected);
}
/**