浏览代码

coding standards

euromark 13 年之前
父节点
当前提交
cd3966ae54
共有 3 个文件被更改,包括 4 次插入5 次删除
  1. 1 3
      Controller/Component/Auth/DirectAuthenticate.php
  2. 1 1
      Model/Behavior/BitmaskedBehavior.php
  3. 2 1
      Model/MyModel.php

+ 1 - 3
Controller/Component/Auth/DirectAuthenticate.php

@@ -60,9 +60,7 @@ class DirectAuthenticate extends BaseAuthenticate {
 		if (empty($request->data[$model])) {
 			return false;
 		}
-		if (
-			empty($request->data[$model][$fields['username']])
-		) {
+		if (empty($request->data[$model][$fields['username']])) {
 			return false;
 		}
 		return true;

+ 1 - 1
Model/Behavior/BitmaskedBehavior.php

@@ -133,7 +133,7 @@ class BitmaskedBehavior extends ModelBehavior {
 			return null;
 		}
 		foreach ((array)$value as $key => $val) {
-			$res |= (int) $val;
+			$res |= (int)$val;
 		}
 		if ($res === 0) {
 			return null; # make sure notEmpty validation rule triggers

+ 2 - 1
Model/MyModel.php

@@ -389,7 +389,8 @@ class MyModel extends Model {
 				$this->data[$this->alias][$k] = $this->data[$k][$k];
 			}
 		}
-		parent::beforeValidate($options);
+
+		return parent::beforeValidate($options);
 	}