adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

following coding standards and simplifying some logic

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2012-04-28 19:38:18 -04:30
parent 8eb02d0539
commit f54eb0cdee
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/Cake/Model/ModelValidator.php
View file

@ -241,17 +241,18 @@ class ModelValidator {
if (!$this->propagateBeforeValidate($options)) {
return false;
}
$model = $this->getModel();
$this->data = array();
$this->setOptions($options);
if (!$this->setFields()) {
return $this->getModel()->validationErrors = $this->validationErrors;
return $model->validationErrors = $this->validationErrors;
}
$this->getData();
$this->getMethods();
$this->setValidationDomain();
$this->setValidationDomain($model->validationDomain);
foreach ($this->_fields as $field) {
$field->validate();
@ -350,7 +351,7 @@ class ModelValidator {
}
/**
* Sets the CakeField isntances from the Model::$validate property after processing the fieldList and whiteList.
* Sets the CakeField instances from the Model::$validate property after processing the fieldList and whiteList.
* If Model::$validate is not set or empty, this method returns false. True otherwise.
*
* @param boolean $reset If true will reset the Validator $validate array to the Model's default
@ -413,10 +414,10 @@ class ModelValidator {
* @param string $name The options name to look up
* @return mixed Either null or the option value
*/
public function getOptions($name = NULL) {
if (NULL !== $name) {
public function getOptions($name = null) {
if ($name !== null) {
if (!isset($this->options[$name])) {
return NULL;
return null;
}
return $this->options[$name];
}
@ -432,8 +433,6 @@ class ModelValidator {
public function setValidationDomain($validationDomain = null) {
if ($validationDomain !== null) {
$this->validationDomain = $validationDomain;
} elseif ($this->_model->validationDomain !== null) {
$this->validationDomain = $this->_model->validationDomain;
} else {
$this->validationDomain = ModelValidator::DEFAULT_DOMAIN;
}
@ -471,7 +470,7 @@ class ModelValidator {
if (!empty($whitelist)) {
$this->validationErrors = array();
$validate = array();
foreach ((array) $whitelist as $f) {
foreach ((array)$whitelist as $f) {
if (!empty($this->_validate[$f])) {
$validate[$f] = $this->_validate[$f];
}