Skip to content

Commit

Permalink
more whitespace coding standards
Browse files Browse the repository at this point in the history
  • Loading branch information
euromark committed Nov 14, 2012
1 parent 8f78b1e commit b7e75a6
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion lib/Cake/Model/Behavior/TreeBehavior.php
Expand Up @@ -618,7 +618,7 @@ public function recover(Model $Model, $mode = 'parent', $missingParentAction = n
if ($missingParents) {
if ($missingParentAction == 'return') {
foreach ($missingParents as $id => $display) {
$this->errors[] = 'cannot find the parent for ' . $Model->alias . ' with id ' . $id . '(' . $display . ')';
$this->errors[] = 'cannot find the parent for ' . $Model->alias . ' with id ' . $id . '(' . $display . ')';
}
return false;
} elseif ($missingParentAction == 'delete') {
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Network/CakeResponse.php
Expand Up @@ -277,8 +277,8 @@ class CakeResponse {
'javascript' => 'application/javascript',
'form' => 'application/x-www-form-urlencoded',
'file' => 'multipart/form-data',
'xhtml' => array('application/xhtml+xml', 'application/xhtml', 'text/xhtml'),
'xhtml-mobile' => 'application/vnd.wap.xhtml+xml',
'xhtml' => array('application/xhtml+xml', 'application/xhtml', 'text/xhtml'),
'xhtml-mobile' => 'application/vnd.wap.xhtml+xml',
'atom' => 'application/atom+xml',
'amf' => 'application/x-amf',
'wap' => array('text/vnd.wap.wml', 'text/vnd.wap.wmlscript', 'image/vnd.wap.wbmp'),
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Network/Http/HttpSocket.php
Expand Up @@ -876,7 +876,7 @@ protected function _buildRequestLine($request = array(), $versionToken = 'HTTP/1
return false;
}

$request['uri'] = $this->_parseUri($request['uri']);
$request['uri'] = $this->_parseUri($request['uri']);
$request = array_merge(array('method' => 'GET'), $request);
if (!empty($this->_proxy['host'])) {
$request['uri'] = $this->_buildUri($request['uri'], '%scheme://%host:%port/%path?%query');
Expand Down
14 changes: 7 additions & 7 deletions lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
Expand Up @@ -3466,18 +3466,18 @@ public function testResetMultipleHabtmAssociations() {
$articleHabtm = array(
'hasAndBelongsToMany' => array(
'Tag' => array(
'className' => 'Tag',
'joinTable' => 'articles_tags',
'foreignKey' => 'article_id',
'className' => 'Tag',
'joinTable' => 'articles_tags',
'foreignKey' => 'article_id',
'associationForeignKey' => 'tag_id'
),
'ShortTag' => array(
'className' => 'Tag',
'joinTable' => 'articles_tags',
'foreignKey' => 'article_id',
'className' => 'Tag',
'joinTable' => 'articles_tags',
'foreignKey' => 'article_id',
'associationForeignKey' => 'tag_id',
// LENGHT function mysql-only, using LIKE does almost the same
'conditions' => "ShortTag.tag LIKE '???'"
'conditions' => "ShortTag.tag LIKE '???'"
)
)
);
Expand Down

1 comment on commit b7e75a6

@ceeram
Copy link
Contributor

@ceeram ceeram commented on b7e75a6 Nov 14, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should make sure phpcs catches these as well

Please sign in to comment.