From e4b939bba0aad5bd9fa48e65f7a940f12008ddcc Mon Sep 17 00:00:00 2001 From: mark_story Date: Mon, 8 Feb 2016 22:37:25 -0500 Subject: [PATCH] Backport fix for Validation::uploadedFile to 2.x Don't fail validation when the keys are not the expected order. Refs #8201 --- lib/Cake/Test/Case/Utility/ValidationTest.php | 16 ++++++++++++++++ lib/Cake/Utility/Validation.php | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/Cake/Test/Case/Utility/ValidationTest.php b/lib/Cake/Test/Case/Utility/ValidationTest.php index 8b326f166bd..0e1c6293fac 100644 --- a/lib/Cake/Test/Case/Utility/ValidationTest.php +++ b/lib/Cake/Test/Case/Utility/ValidationTest.php @@ -2505,4 +2505,20 @@ public function testUploadedFileNoFile() { ); $this->assertFalse(Validation::uploadedFile($file, $options), 'File is required.'); } +/** + * Test uploaded file validation. + * + * @return void + */ + public function testUploadedFileWithDifferentFileParametersOrder() { + $file = array( + 'name' => 'cake.power.gif', + 'error' => UPLOAD_ERR_OK, + 'tmp_name' => CORE_PATH . 'Cake' . DS . 'Test' . DS . 'test_app' . DS . 'webroot/img/cake.power.gif', + 'type' => 'text/plain', + 'size' => 201 + ); + $options = array(); + $this->assertTrue(Validation::uploadedFile($file, $options), 'Wrong order'); + } } diff --git a/lib/Cake/Utility/Validation.php b/lib/Cake/Utility/Validation.php index 2f20d27394a..2700c0ac707 100644 --- a/lib/Cake/Utility/Validation.php +++ b/lib/Cake/Utility/Validation.php @@ -1016,7 +1016,8 @@ public static function uploadedFile($file, $options = array()) { if (!is_array($file)) { return false; } - $keys = array('name', 'tmp_name', 'error', 'type', 'size'); + $keys = array('error', 'name', 'size', 'tmp_name', 'type'); + ksort($file); if (array_keys($file) != $keys) { return false; }