Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.x] Fix explicit models in string-based database validation rules #30790

Merged
merged 3 commits into from Dec 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/Illuminate/Validation/Concerns/ValidatesAttributes.php
Expand Up @@ -13,6 +13,7 @@
use Egulias\EmailValidator\Validation\RFCValidation;
use Egulias\EmailValidator\Validation\SpoofCheckValidation;
use Exception;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Arr;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Date;
Expand Down Expand Up @@ -815,7 +816,17 @@ protected function getUniqueExtra($parameters)
*/
public function parseTable($table)
{
return Str::contains($table, '.') ? explode('.', $table, 2) : [null, $table];
[$connection, $table] = Str::contains($table, '.') ? explode('.', $table, 2) : [null, $table];

if (Str::contains($table, '\\') && class_exists($table)) {
$model = new $table;

if ($model instanceof Model) {
$table = $model->getTable();
}
}

return [$connection, $table];
}

/**
Expand Down
44 changes: 44 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
Expand Up @@ -11,6 +11,7 @@
use Illuminate\Contracts\Translation\Translator as TranslatorContract;
use Illuminate\Contracts\Validation\ImplicitRule;
use Illuminate\Contracts\Validation\Rule;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Arr;
use Illuminate\Support\Carbon;
use Illuminate\Translation\ArrayLoader;
Expand Down Expand Up @@ -4293,6 +4294,36 @@ public function testExtractDataFromPath()
$this->assertEquals(['cat' => ['cat1' => ['name' => '1']]], ValidationData::extractDataFromPath('cat.cat1.name', $data));
}

public function testParsingTablesFromModels()
{
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, [], []);

$implicit_no_connection = $v->parseTable(ImplicitTableModel::class);
$this->assertEquals(null, $implicit_no_connection[0]);
$this->assertEquals('implicit_table_models', $implicit_no_connection[1]);

$explicit_no_connection = $v->parseTable(ExplicitTableModel::class);
$this->assertEquals(null, $explicit_no_connection[0]);
$this->assertEquals('explicits', $explicit_no_connection[1]);

$raw_no_connection = $v->parseTable('table');
$this->assertEquals(null, $raw_no_connection[0]);
$this->assertEquals('table', $raw_no_connection[1]);

$implicit_connection = $v->parseTable('connection.'.ImplicitTableModel::class);
$this->assertEquals('connection', $implicit_connection[0]);
$this->assertEquals('implicit_table_models', $implicit_connection[1]);

$explicit_connection = $v->parseTable('connection.'.ExplicitTableModel::class);
$this->assertEquals('connection', $explicit_connection[0]);
$this->assertEquals('explicits', $explicit_connection[1]);

$raw_connection = $v->parseTable('connection.table');
$this->assertEquals('connection', $raw_connection[0]);
$this->assertEquals('table', $raw_connection[1]);
}

public function testUsingSettersWithImplicitRules()
{
$trans = $this->getIlluminateArrayTranslator();
Expand Down Expand Up @@ -4755,3 +4786,16 @@ public function getIlluminateArrayTranslator()
);
}
}

class ImplicitTableModel extends Model
{
protected $guarded = [];
public $timestamps = false;
}

class ExplicitTableModel extends Model
{
protected $table = 'explicits';
protected $guarded = [];
public $timestamps = false;
}