Allow negative condition in presence verifier · JavaDevl/framework@e0c7d76 · GitHub

JavaDevl / framework Public

forked from laravel/framework

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit e0c7d76

Browse filesBrowse the repository at this point in the historyBrowse files

Roman Kinyakin

committed

Allow negative condition in presence verifier

1 parent 6b461ca commit e0c7d76
Copy full SHA for e0c7d76

2 files changed

+5-1Lines changed: 5 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/Illuminate/Validation
  • DatabasePresenceVerifier.php
• tests/Validation
  • ValidationDatabasePresenceVerifierTest.php

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/Illuminate/Validation/DatabasePresenceVerifier.php‎

Copy file name to clipboardExpand all lines: src/Illuminate/Validation/DatabasePresenceVerifier.php

+3Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -2,6 +2,7 @@
2	2
3	3	namespace Illuminate\Validation;
4	4
	5	+ use Illuminate\Support\Str;
5	6	use Illuminate\Database\ConnectionResolverInterface;
6	7
7	8	class DatabasePresenceVerifier implements PresenceVerifierInterface
@@ -91,6 +92,8 @@ protected function addWhere($query, $key, $extraValue)
91	92	$query->whereNull($key);
92	93	} elseif ($extraValue === 'NOT_NULL') {
93	94	$query->whereNotNull($key);
	95	+ } elseif (Str::startsWith($extraValue, '!')) {
	96	+ $query->where($key, '!=', mb_substr($extraValue, 1));
94	97	} else {
95	98	$query->where($key, $extraValue);
96	99	}

Collapse file

‎tests/Validation/ValidationDatabasePresenceVerifierTest.php‎

Copy file name to clipboardExpand all lines: tests/Validation/ValidationDatabasePresenceVerifierTest.php

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -16,11 +16,12 @@ public function testBasicCount()
16	16	$db->shouldReceive('connection')->once()->with('connection')->andReturn($conn = m::mock('StdClass'));
17	17	$conn->shouldReceive('table')->once()->with('table')->andReturn($builder = m::mock('StdClass'));
18	18	$builder->shouldReceive('where')->with('column', '=', 'value')->andReturn($builder);
19		- $extra = ['foo' => 'NULL', 'bar' => 'NOT_NULL', 'baz' => 'taylor', 'faz' => true];
	19	+ $extra = ['foo' => 'NULL', 'bar' => 'NOT_NULL', 'baz' => 'taylor', 'faz' => true, 'not' => '!admin'];
20	20	$builder->shouldReceive('whereNull')->with('foo');
21	21	$builder->shouldReceive('whereNotNull')->with('bar');
22	22	$builder->shouldReceive('where')->with('baz', 'taylor');
23	23	$builder->shouldReceive('where')->with('faz', true);
	24	+ $builder->shouldReceive('where')->with('not', '!=', 'admin');
24	25	$builder->shouldReceive('count')->once()->andReturn(100);
25	26
26	27	$this->assertEquals(100, $verifier->getCount('table', 'column', 'value', null, null, $extra));

0 commit comments

Comments

0 (0)