From c26b7bbffe351ebb0c991319a094ff09dbda9059 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 20 Oct 2015 21:08:57 -0400
Subject: [PATCH] Fix PHPCS errors and failing test.

Refs #7577
---
 .../Console/Command/Task/ModelTaskTest.php    |  2 +-
 lib/Cake/Utility/Validation.php               | 38 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
index e1b3625a0..da5b8d7cb 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
@@ -400,7 +400,7 @@ class ModelTaskTest extends CakeTestCase {
 	public function testInteractiveDoValidationWithSkipping() {
 		$this->Task->expects($this->any())
 			->method('in')
-			->will($this->onConsecutiveCalls('34', '24', 'n', '10', 's'));
+			->will($this->onConsecutiveCalls('35', '24', 'n', '10', 's'));
 		$this->Task->interactive = true;
 		$Model = $this->getMock('Model');
 		$Model->primaryKey = 'id';
diff --git a/lib/Cake/Utility/Validation.php b/lib/Cake/Utility/Validation.php
index 99b0bd0be..e05c31a9f 100644
--- a/lib/Cake/Utility/Validation.php
+++ b/lib/Cake/Utility/Validation.php
@@ -1038,25 +1038,25 @@ class Validation {
 	}
 
 /**
-* Validate an uploaded file.
-*
-* Helps join `uploadError`, `fileSize` and `mimeType` into
-* one higher level validation method.
-*
-* ### Options
-*
-* - `types` - A list of valid mime types. If empty all types
-*   will be accepted. The `type` will not be looked at, instead
-*   the file type will be checked with ext/finfo.
-* - `minSize` - The minimum file size. Defaults to not checking.
-* - `maxSize` - The maximum file size. Defaults to not checking.
-* - `optional` - Whether or not this file is optional. Defaults to false.
-*   If true a missing file will pass the validator regardless of other constraints.
-*
-* @param array $file The uploaded file data from PHP.
-* @param array $options An array of options for the validation.
-* @return bool
-*/
+ * Validate an uploaded file.
+ *
+ * Helps join `uploadError`, `fileSize` and `mimeType` into
+ * one higher level validation method.
+ *
+ * ### Options
+ *
+ * - `types` - A list of valid mime types. If empty all types
+ *   will be accepted. The `type` will not be looked at, instead
+ *   the file type will be checked with ext/finfo.
+ * - `minSize` - The minimum file size. Defaults to not checking.
+ * - `maxSize` - The maximum file size. Defaults to not checking.
+ * - `optional` - Whether or not this file is optional. Defaults to false.
+ *   If true a missing file will pass the validator regardless of other constraints.
+ *
+ * @param array $file The uploaded file data from PHP.
+ * @param array $options An array of options for the validation.
+ * @return bool
+ */
 	public static function uploadedFile($file, $options = array()) {
 		$options += array(
 			'minSize' => null,