From f0205f53ada0c1074c81f027c5d319af957d020f Mon Sep 17 00:00:00 2001
From: Kim Egede Jakobsen <kimegede@gmail.com>
Date: Sun, 8 Sep 2013 21:18:59 +0200
Subject: [PATCH] Try to make same comments for constructors.

Conflicts:
	lib/Cake/I18n/L10n.php
---
 lib/Cake/Controller/CakeErrorController.php    |  2 +-
 lib/Cake/Core/Object.php                       |  2 +-
 lib/Cake/I18n/L10n.php                         |  1 +
 lib/Cake/Log/Engine/BaseLog.php                |  2 +-
 lib/Cake/Network/CakeResponse.php              | 14 +++++++-------
 lib/Cake/TestSuite/CakeTestSuiteDispatcher.php |  2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/Cake/Controller/CakeErrorController.php b/lib/Cake/Controller/CakeErrorController.php
index 1755f3741..9afabdadf 100644
--- a/lib/Cake/Controller/CakeErrorController.php
+++ b/lib/Cake/Controller/CakeErrorController.php
@@ -39,7 +39,7 @@ class CakeErrorController extends AppController {
 	public $uses = array();
 
 /**
- * __construct
+ * Constructor
  *
  * @param CakeRequest $request
  * @param CakeResponse $response
diff --git a/lib/Cake/Core/Object.php b/lib/Cake/Core/Object.php
index 053c68f7c..1e35c6ba1 100644
--- a/lib/Cake/Core/Object.php
+++ b/lib/Cake/Core/Object.php
@@ -31,7 +31,7 @@ App::uses('CakeLog', 'Log');
 class Object {
 
 /**
- * constructor, no-op
+ * Constructor, no-op
  *
  */
 	public function __construct() {
diff --git a/lib/Cake/I18n/L10n.php b/lib/Cake/I18n/L10n.php
index aba0afbf7..bac9ee5df 100644
--- a/lib/Cake/I18n/L10n.php
+++ b/lib/Cake/I18n/L10n.php
@@ -327,6 +327,7 @@ class L10n {
 
 /**
  * Class constructor
+ *
  */
 	public function __construct() {
 		if (defined('DEFAULT_LANGUAGE')) {
diff --git a/lib/Cake/Log/Engine/BaseLog.php b/lib/Cake/Log/Engine/BaseLog.php
index a7b3953bb..a053964f8 100644
--- a/lib/Cake/Log/Engine/BaseLog.php
+++ b/lib/Cake/Log/Engine/BaseLog.php
@@ -35,7 +35,7 @@ abstract class BaseLog implements CakeLogInterface {
 	protected $_config = array();
 
 /**
- * __construct method
+ * Constructor
  *
  * @param array $config Configuration array
  */
diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php
index ddabc3f41..ac893b273 100644
--- a/lib/Cake/Network/CakeResponse.php
+++ b/lib/Cake/Network/CakeResponse.php
@@ -376,7 +376,7 @@ class CakeResponse {
 	protected $_cookies = array();
 
 /**
- * Class constructor
+ * Constructor
  *
  * @param array $options list of parameters to setup the response. Possible values are:
  *	- body: the response text that should be sent to the client
@@ -630,12 +630,12 @@ class CakeResponse {
 /**
  * Queries & sets valid HTTP response codes & messages.
  *
- * @param integer|array $code If $code is an integer, then the corresponding code/message is 
- *        returned if it exists, null if it does not exist. If $code is an array, then the 
- *        keys are used as codes and the values as messages to add to the default HTTP 
- *        codes. The codes must be integers greater than 99 and less than 1000. Keep in 
- *        mind that the HTTP specification outlines that status codes begin with a digit 
- *        between 1 and 5, which defines the class of response the client is to expect. 
+ * @param integer|array $code If $code is an integer, then the corresponding code/message is
+ *        returned if it exists, null if it does not exist. If $code is an array, then the
+ *        keys are used as codes and the values as messages to add to the default HTTP
+ *        codes. The codes must be integers greater than 99 and less than 1000. Keep in
+ *        mind that the HTTP specification outlines that status codes begin with a digit
+ *        between 1 and 5, which defines the class of response the client is to expect.
  *        Example:
  *
  *        httpCodes(404); // returns array(404 => 'Not Found')
diff --git a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
index e7a5dabd8..904997466 100644
--- a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
+++ b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
@@ -77,7 +77,7 @@ class CakeTestSuiteDispatcher {
 	protected static $_Reporter = null;
 
 /**
- * constructor
+ * Constructor
  *
  */
 	public function __construct() {