Merge pull request cakephp#1401 from dereuromark/master

CS fixes

Author: markstory

lib/Cake/Console/Command/Task/ExtractTask.php

@@ -247,6 +247,7 @@ public function execute() {
  * @param string $domain
  * @param string $msgid
  * @param array $details
+ * @return void
  */
 	protected function _addTranslation($domain, $msgid, $details = array()) {
 		if (empty($this->_translations[$domain][$msgid])) {

lib/Cake/Console/ConsoleErrorHandler.php

@@ -96,6 +96,7 @@ public function handleError($code, $description, $file = null, $line = null, $co
  * Wrapper for exit(), used for testing.
  *
  * @param int $code The exit code.
+ * @return void
  */
 	protected function _stop($code = 0) {
 		exit($code);

lib/Cake/Controller/Component/Acl/AclInterface.php

@@ -28,6 +28,7 @@ interface AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
+ * @return boolean Success
  */
 	public function check($aro, $aco, $action = "*");
 
@@ -65,6 +66,7 @@ public function inherit($aro, $aco, $action = "*");
  * Initialization method for the Acl implementation
  *
  * @param AclComponent $component
+ * @return void
  */
 	public function initialize(Component $component);
 

lib/Cake/Log/CakeLog.php

@@ -255,8 +255,8 @@ public static function configured() {
  * }}}
  *
  * @param array $levels array
- * @param bool $append true to append, false to replace
- * @return array active log levels
+ * @param boolean $append true to append, false to replace
+ * @return array Active log levels
  */
 	public static function levels($levels = array(), $append = true) {
 		if (empty(self::$_Collection)) {
@@ -278,7 +278,7 @@ public static function levels($levels = array(), $append = true) {
 /**
  * Reset log levels to the original value
  *
- * @return array default log levels
+ * @return array Default log levels
  */
 	public static function defaultLevels() {
 		self::$_levelMap = self::$_defaultLevels;
@@ -304,7 +304,7 @@ public static function drop($streamName) {
  * Checks whether $streamName is enabled
  *
  * @param string $streamName to check
- * @return bool
+ * @return boolean
  * @throws CakeLogException
  */
 	public static function enabled($streamName) {

lib/Cake/Model/Behavior/TranslateBehavior.php

@@ -628,6 +628,7 @@ public function bindTranslation(Model $Model, $fields, $reset = true) {
  *
  * @param Model $Model Model instance
  * @param string $field The field to update.
+ * @return void
  */
 	protected function _removeField(Model $Model, $field) {
 		if (array_key_exists($field, $this->settings[$Model->alias])) {

lib/Cake/Model/Validator/CakeValidationSet.php

@@ -331,6 +331,7 @@ public function offsetGet($index) {
  *
  * @param string $index name of the rule
  * @param CakeValidationRule|array rule to add to $index
+ * @return void
  */
 	public function offsetSet($index, $rule) {
 		$this->setRule($index, $rule);

lib/Cake/Network/CakeRequest.php

@@ -673,7 +673,7 @@ public function domain($tldLength = 1) {
  *
  * @param integer $tldLength Number of segments your tld contains. For example: `example.com` contains 1 tld.
  *   While `example.co.uk` contains 2.
- * @return array of subdomains.
+ * @return array An array of subdomains.
  */
 	public function subdomains($tldLength = 1) {
 		$segments = explode('.', $this->host());

lib/Cake/Network/CakeSocket.php

@@ -186,6 +186,7 @@ public function connect() {
  *
  * @param int $code
  * @param string $message
+ * @return void
  */
 	protected function _connectionErrorHandler($code, $message) {
 		$this->_connectionErrors[] = $message;

lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php

@@ -498,7 +498,7 @@ public function testRevoke() {
  * Generates a list of the current aro and aco structures and a grid dump of the permissions that are defined
  * Only designed to work with the db based ACL
  *
- * @param bool $treesToo
+ * @param boolean $treesToo
  * @return void
  */
 	protected function _debug($printTreesToo = false) {

lib/Cake/Test/Case/Core/ConfigureTest.php

@@ -447,7 +447,7 @@ public function testDump() {
 /**
  * Test dumping only some of the data.
  *
- * @return
+ * @return void
  */
 	public function testDumpPartial() {
 		Configure::config('test_reader', new PhpReader(TMP));