Permalink
Browse files

Fix a few code standards errors.

  • Loading branch information...
markstory committed Apr 7, 2012
1 parent ff35762 commit a24aca6ffc082c26e967ff1c2f4d002629c7c10e
@@ -134,7 +134,7 @@ protected function _bootstrap() {
include_once CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'Config' . DS . 'core.php';
App::build();
}
-
+
$this->setErrorHandlers();
if (!defined('FULL_BASE_URL')) {
@@ -1168,7 +1168,7 @@ protected function _filterResults(&$results, Model $model, $filtered = array())
* @return mixed
* @throws CakeException when results cannot be created.
*/
- public function queryAssociation(Model $model, &$linkModel, $type, $association, $assocData, &$queryData, $external = false, &$resultSet, $recursive, $stack) {
+ public function queryAssociation(Model $model, &$linkModel, $type, $association, $assocData, &$queryData, $external, &$resultSet, $recursive, $stack) {
if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
if (!is_array($resultSet)) {
throw new CakeException(__d('cake_dev', 'Error in Model %s', get_class($model)));
@@ -1453,7 +1453,7 @@ protected function _mergeAssociation(&$data, &$merge, $association, $type, $self
* @param array $resultSet
* @return mixed
*/
- public function generateAssociationQuery(Model $model, $linkModel, $type, $association = null, $assocData = array(), &$queryData, $external = false, &$resultSet) {
+ public function generateAssociationQuery(Model $model, $linkModel, $type, $association, $assocData, &$queryData, $external, &$resultSet) {
$queryData = $this->_scrubQueryData($queryData);
$assocData = $this->_scrubQueryData($assocData);
$modelAlias = $model->alias;
@@ -496,7 +496,6 @@ public function headerCharset($charset = null) {
return $this->headerCharset = $charset;
}
-
/**
* Set email
*
@@ -454,7 +454,7 @@ public function testHighlight() {
$result = $this->Text->highlight($text, $phrases, array('format' => '<b>\1</b>'));
$expected = '<b>This</b> is a test <b>text</b>';
$this->assertEquals($expected, $result);
-
+
$phrases = array('is', 'text');
$result = $this->Text->highlight($text, $phrases, array('format' => '<b>\1</b>', 'regex' => "|\b%s\b|iu"));
$expected = 'This <b>is</b> a test <b>text</b>';

0 comments on commit a24aca6

Please sign in to comment.