Skip to content

Commit

Permalink
Fix CS errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
ADmad committed Aug 1, 2014
1 parent deed3dc commit e6c9dc7
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Database/Type/DateType.php
Expand Up @@ -38,7 +38,7 @@ public function marshal($value) {
}
return $date;
}

/**
* Convert strings into Date instances.
*
Expand Down
16 changes: 14 additions & 2 deletions tests/TestCase/Controller/Component/PaginatorComponentTest.php
Expand Up @@ -362,15 +362,27 @@ public function testMergeOptionsMaxLimit() {
'paramType' => 'named',
);
$result = $this->Paginator->mergeOptions('Post', $settings);
$expected = array('page' => 1, 'limit' => 200, 'maxLimit' => 200, 'paramType' => 'named', 'whitelist' => ['limit', 'sort', 'page', 'direction'],);
$expected = array(
'page' => 1,
'limit' => 200,
'maxLimit' => 200,
'paramType' => 'named',
'whitelist' => ['limit', 'sort', 'page', 'direction']
);
$this->assertEquals($expected, $result);

$settings = array(
'maxLimit' => 10,
'paramType' => 'named',
);
$result = $this->Paginator->mergeOptions('Post', $settings);
$expected = array('page' => 1, 'limit' => 20, 'maxLimit' => 10, 'paramType' => 'named', 'whitelist' => ['limit', 'sort', 'page', 'direction'],);
$expected = array(
'page' => 1,
'limit' => 20,
'maxLimit' => 10,
'paramType' => 'named',
'whitelist' => ['limit', 'sort', 'page', 'direction']
);
$this->assertEquals($expected, $result);
}

Expand Down

0 comments on commit e6c9dc7

Please sign in to comment.