From b7e75a6399671b8fecade32da9bc53c207951fb1 Mon Sep 17 00:00:00 2001 From: euromark Date: Wed, 14 Nov 2012 12:36:55 +0100 Subject: [PATCH] more whitespace coding standards --- lib/Cake/Model/Behavior/TreeBehavior.php | 2 +- lib/Cake/Network/CakeResponse.php | 4 ++-- lib/Cake/Network/Http/HttpSocket.php | 2 +- .../Model/Behavior/ContainableBehaviorTest.php | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/Cake/Model/Behavior/TreeBehavior.php b/lib/Cake/Model/Behavior/TreeBehavior.php index a2da711a3..ce0414e1c 100644 --- a/lib/Cake/Model/Behavior/TreeBehavior.php +++ b/lib/Cake/Model/Behavior/TreeBehavior.php @@ -618,7 +618,7 @@ class TreeBehavior extends ModelBehavior { 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') { diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php index d85b91af9..67bf771a7 100644 --- a/lib/Cake/Network/CakeResponse.php +++ b/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'), diff --git a/lib/Cake/Network/Http/HttpSocket.php b/lib/Cake/Network/Http/HttpSocket.php index a0dae10f6..e032c3231 100644 --- a/lib/Cake/Network/Http/HttpSocket.php +++ b/lib/Cake/Network/Http/HttpSocket.php @@ -876,7 +876,7 @@ class HttpSocket extends CakeSocket { 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'); diff --git a/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php index be60e0954..40d3c37a3 100644 --- a/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php @@ -3466,18 +3466,18 @@ class ContainableBehaviorTest extends CakeTestCase { $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 '???'" ) ) );