Skip to content

Commit

Permalink
Fix a few more coding standards errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Apr 3, 2012
1 parent 18296d2 commit 72cb96b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/Cake/Model/Datasource/DboSource.php
Expand Up @@ -198,7 +198,7 @@ class DboSource extends DataSource {
* Default fields that are used by the DBO
*
* @var array
*/
*/
protected $_queryDefaults = array(
'conditions' => array(),
'fields' => null,
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Model/Permission.php
Expand Up @@ -108,7 +108,7 @@ public function check($aro, $aco, $action = "*") {
$acoIDs = Set::extract($acoPath, '{n}.' . $this->Aco->alias . '.id');

$count = count($aroPath);
for ($i = 0 ; $i < $count; $i++) {
for ($i = 0; $i < $count; $i++) {
$permAlias = $this->alias;

$perms = $this->find('all', array(
Expand Down
2 changes: 2 additions & 0 deletions lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
Expand Up @@ -38,13 +38,15 @@ class TestCacheSession extends CacheSession {
protected function _writeSession() {
return true;
}

}

class TestDatabaseSession extends DatabaseSession {

protected function _writeSession() {
return true;
}

}

/**
Expand Down
12 changes: 6 additions & 6 deletions lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
Expand Up @@ -836,10 +836,10 @@ public function testTransactionLogging() {
$log = $db->getLog();
$this->assertEquals($expected, $log['log'][0]);
}

/**
* Test build statement with some fields missing
*
*
* @return void
*/
public function testBuildStatementDefaults() {
Expand All @@ -850,13 +850,13 @@ public function testBuildStatementDefaults() {
array(
'fields' => array('DISTINCT(AssetsTag.asset_id)'),
'table' => "assets_tags",
'alias'=>"AssetsTag",
'conditions' => array("Tag.name"=>'foo bar'),
'limit' => null,
'alias' => "AssetsTag",
'conditions' => array("Tag.name" => 'foo bar'),
'limit' => null,
'group' => "AssetsTag.asset_id"
),
$this->Model
);
}

}

0 comments on commit 72cb96b

Please sign in to comment.