Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

more whitespace coding standards

  • Loading branch information...
commit b7e75a6399671b8fecade32da9bc53c207951fb1 1 parent 8f78b1e
@dereuromark dereuromark authored
View
2  lib/Cake/Model/Behavior/TreeBehavior.php
@@ -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') {
View
4 lib/Cake/Network/CakeResponse.php
@@ -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'),
View
2  lib/Cake/Network/Http/HttpSocket.php
@@ -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');
View
14 lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
@@ -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 '???'"
)
)
);

1 comment on commit b7e75a6

@ceeram
Collaborator

We should make sure phpcs catches these as well

Please sign in to comment.
Something went wrong with that request. Please try again.