Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

following coding standards and simplifying some logic

  • Loading branch information...
commit f54eb0cdeef17ee637e1145b7a1ecd60fc999899 1 parent 8eb02d0
@lorenzo lorenzo authored
Showing with 8 additions and 9 deletions.
  1. +8 −9 lib/Cake/Model/ModelValidator.php
View
17 lib/Cake/Model/ModelValidator.php
@@ -241,17 +241,18 @@ public function invalidFields($options = array()) {
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 @@ public function getFields($name = null) {
}
/**
- * 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 @@ public function setOption($name, $value = null) {
* @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 @@ public function getOptions($name = NULL) {
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 @@ protected function _processWhitelist() {
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];
}

0 comments on commit f54eb0c

Please sign in to comment.
Something went wrong with that request. Please try again.