adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix PHPCS errors and failing test.

Browse source 
Refs #7577
This commit is contained in:
mark_story 2015-10-20 21:08:57 -04:00
parent 0cdfed0aee
commit c26b7bbffe
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
View file

@ -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';

38
lib/Cake/Utility/Validation.php
View file

@ -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,