[5.3] Fixed the validator bug in hydrateFiles when removing the files array

[chengguoqiang]

fixed the bug of the method hydrateFiles when remove the files array.

[chengguoqiang]

tests for #15660

[themsaid]

The test you added is currently passing without the changes you are introducing, can you please describe what are you trying to fix?

[chengguoqiang]

@themsaid Upload the files array , hydrateFiles can't remove it from data array

[themsaid]

@chengguoqiang can you please add a failing test?

[taylorotwell]

We also need a much better description of what this is attempting to solve / fix / do before merging.

[chengguoqiang]

@themsaid I added a failing test, please check, thank you.

[chengguoqiang]

@taylorotwell the description was modified, would you please check the description for me

[themsaid]

Well you just pointed out a bug, but the fix isn't actually complete. The validator works fine with this bug except for the part of separating data from files for array file uploads, means that now $this->data won't have these file uploads, and the each() method relys only on the data attribute, so you'll need to update the each() method and merge the files array to the $data array inside the method before starting the iteration.

To ensure everything is working, you may add these tests:

public function testFilesHydration()
{
    $trans = $this->getIlluminateArrayTranslator();
    $file = new File(__FILE__, false);
    $v = new Validator($trans, ['file' => $file, 'text' => 'text'], ['name' => 'Required']);
    $this->assertEquals(['file' => $file], $v->getFiles());
    $this->assertEquals(['text' => 'text'], $v->getData());
}

public function testArrayOfFilesHydration()
{
    $trans = $this->getIlluminateArrayTranslator();
    $file = new File(__FILE__, false);
    $file2 = new File(__FILE__, false);
    $v = new Validator($trans, ['file' => [$file, $file2], 'text' => 'text'], ['name' => 'Required']);
    $this->assertEquals(['file.0' => $file, 'file.1' => $file2], $v->getFiles());
    $this->assertEquals(['text' => 'text'], $v->getData());
}

public function testMultipleFileUploads()
{
    $trans = $this->getIlluminateArrayTranslator();
    $file = new File(__FILE__, false);
    $file2 = new File(__FILE__, false);
    $v = new Validator($trans, ['file' => [$file, $file2]], ['file.*' => 'Required|mimes:xls']);
    $this->assertFalse($v->passes());
}

public function testFileUploads()
{
    $trans = $this->getIlluminateArrayTranslator();
    $file = new File(__FILE__, false);
    $v = new Validator($trans, ['file' => $file], ['file' => 'Required|mimes:xls']);
    $this->assertFalse($v->passes());
}

[chengguoqiang]

@themsaid improvement

[themsaid]

I'm sorry but your version of testMultipleFileUploads() doesn't really test anything, same for testFileUploads ().

These simple tests should pass:

public function testMultipleFileUploads()
{
    $trans = $this->getIlluminateArrayTranslator();
    $file = new File(__FILE__, false);
    $file2 = new File(__FILE__, false);
    $v = new Validator($trans, ['file' => [$file, $file2]], ['file.*' => 'Required|mimes:xls']);
    $this->assertFalse($v->passes());
}

public function testFileUploads()
{
    $trans = $this->getIlluminateArrayTranslator();
    $file = new File(__FILE__, false);
    $v = new Validator($trans, ['file' => $file], ['file' => 'Required|mimes:xls']);
    $this->assertFalse($v->passes());
}

If you try it testMultipleFileUploads() will fail, which is the problem we need to solve, this test should pass.

[chengguoqiang]

I update the each() method and merge the files array to the $data array inside the method before starting the iteration. these simple tests what you given run fail:

[themsaid]

What's the reason for this change? null is a value we still want to get.

[themsaid]

In the each() method you need to have this:

$data = array_merge(
            Arr::dot($this->initializeAttributeOnData($attribute)), 
            $this->files
        );

so that it looks into the files array as well, if you have this the tests will pass.

[chengguoqiang]

the tests pass, thank you very match

[GrahamCampbell]

Please rebase and squash to one commtit.