Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #928 from shama/patch-cs

Code standards fixes
  • Loading branch information...
commit 2ab3a463cc5e03ae0db469a5aecdaff75256565c 2 parents 478461d + f10c669
@lorenzo lorenzo authored
View
2  lib/Cake/Console/Command/ServerShell.php
@@ -24,10 +24,12 @@
* @package Cake.Console.Command
*/
class ServerShell extends AppShell {
+
/**
* Default ServerHost
*/
const DEFAULT_HOST = 'localhost';
+
/**
* Default ListenPort
*/
View
1  lib/Cake/Model/Permission.php
@@ -146,7 +146,6 @@ public function check($aro, $aco, $action = "*") {
return false;
case 0:
continue;
- break;
case 1:
return true;
}
View
20 lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
@@ -66,15 +66,12 @@ public function beforeFind(Model $model, $query) {
switch ($settings['beforeFind']) {
case 'on':
return false;
- break;
case 'test':
return null;
- break;
case 'modify':
$query['fields'] = array($model->alias . '.id', $model->alias . '.name', $model->alias . '.mytime');
$query['recursive'] = -1;
return $query;
- break;
}
}
@@ -94,16 +91,12 @@ public function afterFind(Model $model, $results, $primary) {
switch ($settings['afterFind']) {
case 'on':
return array();
- break;
case 'test':
return true;
- break;
case 'test2':
return null;
- break;
case 'modify':
return Hash::extract($results, "{n}.{$model->alias}");
- break;
}
}
@@ -121,14 +114,11 @@ public function beforeSave(Model $model) {
switch ($settings['beforeSave']) {
case 'on':
return false;
- break;
case 'test':
return true;
- break;
case 'modify':
$model->data[$model->alias]['name'] .= ' modified before';
return true;
- break;
}
}
@@ -157,7 +147,6 @@ public function afterSave(Model $model, $created) {
break;
case 'test2':
return false;
- break;
case 'modify':
$model->data[$model->alias]['name'] .= ' ' . $string;
break;
@@ -179,18 +168,14 @@ public function beforeValidate(Model $model) {
case 'on':
$model->invalidate('name');
return true;
- break;
case 'test':
return null;
- break;
case 'whitelist':
$this->_addToWhitelist($model, array('name'));
return true;
- break;
case 'stop':
$model->invalidate('name');
return false;
- break;
}
}
@@ -209,11 +194,9 @@ public function afterValidate(Model $model) {
switch ($settings['afterValidate']) {
case 'on':
return false;
- break;
case 'test':
$model->data = array('foo');
return true;
- break;
}
}
@@ -232,17 +215,14 @@ public function beforeDelete(Model $model, $cascade = true) {
switch ($settings['beforeDelete']) {
case 'on':
return false;
- break;
case 'test':
return null;
- break;
case 'test2':
echo 'beforeDelete success';
if ($cascade) {
echo ' (cascading) ';
}
return true;
- break;
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.