fix: TypeError in Validation is_unique/is_not_unique#7085

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.

Sign up for GitHub

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

Merged
kenjis merged 8 commits into from
Jan 12, 2023
Merged

fix: TypeError in Validation is_unique/is_not_unique #7085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d195e3
test: refactor: remove duplicate code
kenjis Jan 11, 2023
7f789ac
test: fix wrong Rules instance
kenjis Jan 11, 2023
5ab8487
test: add test for is_unique and int value
kenjis Jan 11, 2023
d7099cc
fix: TypeError in Rules::is_unique()
kenjis Jan 11, 2023
5722ab0
fix: TypeError in Rules::is_not_unique()
kenjis Jan 11, 2023
7b405d1
fix: add type check
kenjis Jan 11, 2023
7d4e0eb
fix: revert Traditional is_unique() is_not_unique() implementation
kenjis Jan 11, 2023
76c8997
style: break long lines
kenjis Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions system/Validation/Rules.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,11 @@ public function greater_than_equal_to(?string $str, string $min): bool
public function is_not_unique(?string $str, string $field, array $data): bool

@jlopes90jlopes90Jan 11, 2023•
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yesterday I was trying something else, I removed "?string" and it worked.

{
// Grab any data for exclusion of a single row.
[$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
[$field, $whereField, $whereValue] = array_pad(
explode(',', $field),
3,
null
);

// Break the table and field apart
sscanf($field, '%[^.].%[^.]', $table, $field);
Expand All@@ -97,7 +101,10 @@ public function is_not_unique(?string $str, string $field, array $data): bool
->where($field, $str)
->limit(1);

if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue)) {
if (
! empty($whereField) && ! empty($whereValue)
&& ! preg_match('/^\{(\w+)\}$/', $whereValue)
) {
$row = $row->where($whereField, $whereValue);
}

Expand DownExpand Up@@ -125,7 +132,11 @@ public function in_list(?string $value, string $list): bool
*/
public function is_unique(?string $str, string $field, array $data): bool
{
[$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
[$field, $ignoreField, $ignoreValue] = array_pad(
explode(',', $field),
3,
null
);

sscanf($field, '%[^.].%[^.]', $table, $field);

Expand All@@ -135,7 +146,10 @@ public function is_unique(?string $str, string $field, array $data): bool
->where($field, $str)
->limit(1);

if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
if (
! empty($ignoreField) && ! empty($ignoreValue)
&& ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
) {
$row = $row->where("{$ignoreField} !=", $ignoreValue);
}

Expand Down
56 changes: 54 additions & 2 deletions system/Validation/StrictRules/Rules.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,34 @@ public function greater_than_equal_to($str, string $min): bool
*/
public function is_not_unique($str, string $field, array $data): bool
{
return $this->nonStrictRules->is_not_unique($str, $field, $data);
if (is_object($str) || is_array($str)) {
return false;
}

// Grab any data for exclusion of a single row.
[$field, $whereField, $whereValue] = array_pad(
explode(',', $field),
3,
null
);

// Break the table and field apart
sscanf($field, '%[^.].%[^.]', $table, $field);

$row = Database::connect($data['DBGroup'] ?? null)
->table($table)
->select('1')
->where($field, $str)
->limit(1);

if (
! empty($whereField) && ! empty($whereValue)
&& ! preg_match('/^\{(\w+)\}$/', $whereValue)
) {
$row = $row->where($whereField, $whereValue);
}

return $row->get()->getRow() !== null;
}

/**
Expand DownExpand Up@@ -151,7 +178,32 @@ public function in_list($value, string $list): bool
*/
public function is_unique($str, string $field, array $data): bool
{
return $this->nonStrictRules->is_unique($str, $field, $data);
if (is_object($str) || is_array($str)) {
return false;
}

[$field, $ignoreField, $ignoreValue] = array_pad(
explode(',', $field),
3,
null
);

sscanf($field, '%[^.].%[^.]', $table, $field);

$row = Database::connect($data['DBGroup'] ?? null)
->table($table)
->select('1')
->where($field, $str)
->limit(1);

if (
! empty($ignoreField) && ! empty($ignoreValue)
&& ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
) {
$row = $row->where("{$ignoreField} !=", $ignoreValue);
}

return $row->get()->getRow() === null;
}

/**
Expand Down
181 changes: 5 additions & 176 deletions tests/system/Validation/DatabaseRelatedRulesTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,17 @@

namespace CodeIgniter\Validation;

use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\DatabaseTestTrait;
use Config\Database;
use Config\Services;
use CodeIgniter\Validation\StrictRules\DatabaseRelatedRulesTest as StrictDatabaseRelatedRulesTest;
use Tests\Support\Validation\TestRules;

/**
* @internal
*
* @group DatabaseLive
*/
final class DatabaseRelatedRulesTest extends CIUnitTestCase
final class DatabaseRelatedRulesTest extends StrictDatabaseRelatedRulesTest
{
use DatabaseTestTrait;

private Validation $validation;
private array $config = [
protected array $config = [
'ruleSets' => [
Rules::class,
FormatRules::class,
Expand All@@ -45,173 +39,8 @@ final class DatabaseRelatedRulesTest extends CIUnitTestCase
],
];

protected function setUp(): void
{
parent::setUp();
$this->validation = new Validation((object) $this->config, Services::renderer());
$this->validation->reset();
}

public function testIsUniqueFalse(): void
{
Database::connect()
->table('user')
->insert([
'name' => 'Derek Travis',
'email' => 'derek@world.com',
'country' => 'Elbonia',
]);

$data = ['email' => 'derek@world.com'];
$this->validation->setRules(['email' => 'is_unique[user.email]']);
$this->assertFalse($this->validation->run($data));
}

public function testIsUniqueTrue(): void
{
$data = ['email' => 'derek@world.co.uk'];
$this->validation->setRules(['email' => 'is_unique[user.email]']);
$this->assertTrue($this->validation->run($data));
}

public function testIsUniqueIgnoresParams(): void
{
$db = Database::connect();
$db
->table('user')
->insert([
'name' => 'Developer A',
'email' => 'deva@example.com',
'country' => 'Elbonia',
]);
$row = $db->table('user')
->limit(1)
->get()
->getRow();

$data = ['email' => 'derek@world.co.uk'];
$this->validation->setRules(['email' => "is_unique[user.email,id,{$row->id}]"]);
$this->assertTrue($this->validation->run($data));
}

public function testIsUniqueIgnoresParamsPlaceholders(): void
{
$this->hasInDatabase('user', [
'name' => 'Derek',
'email' => 'derek@world.co.uk',
'country' => 'GB',
]);

$row = Database::connect()
->table('user')
->limit(1)
->get()
->getRow();

$data = [
'id' => $row->id,
'email' => 'derek@world.co.uk',
];

$this->validation->setRules(['email' => 'is_unique[user.email,id,{id}]']);
$this->assertTrue($this->validation->run($data));
}

public function testIsUniqueByManualRun(): void
{
Database::connect()
->table('user')
->insert([
'name' => 'Developer A',
'email' => 'deva@example.com',
'country' => 'Elbonia',
]);

$this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
}

public function testIsNotUniqueFalse(): void
{
Database::connect()
->table('user')
->insert([
'name' => 'Derek Travis',
'email' => 'derek@world.com',
'country' => 'Elbonia',
]);

$data = ['email' => 'derek1@world.com'];
$this->validation->setRules(['email' => 'is_not_unique[user.email]']);
$this->assertFalse($this->validation->run($data));
}

public function testIsNotUniqueTrue(): void
{
Database::connect()
->table('user')
->insert([
'name' => 'Derek Travis',
'email' => 'derek@world.com',
'country' => 'Elbonia',
]);

$data = ['email' => 'derek@world.com'];
$this->validation->setRules(['email' => 'is_not_unique[user.email]']);
$this->assertTrue($this->validation->run($data));
}

public function testIsNotUniqueIgnoresParams(): void
protected function createRules()
{
$db = Database::connect();
$db->table('user')
->insert([
'name' => 'Developer A',
'email' => 'deva@example.com',
'country' => 'Elbonia',
]);

$row = $db->table('user')
->limit(1)
->get()
->getRow();

$data = ['email' => 'derek@world.co.uk'];
$this->validation->setRules(['email' => "is_not_unique[user.email,id,{$row->id}]"]);
$this->assertFalse($this->validation->run($data));
}

public function testIsNotUniqueIgnoresParamsPlaceholders(): void
{
$this->hasInDatabase('user', [
'name' => 'Derek',
'email' => 'derek@world.co.uk',
'country' => 'GB',
]);

$row = Database::connect()
->table('user')
->limit(1)
->get()
->getRow();

$data = [
'id' => $row->id,
'email' => 'derek@world.co.uk',
];
$this->validation->setRules(['email' => 'is_not_unique[user.email,id,{id}]']);
$this->assertTrue($this->validation->run($data));
}

public function testIsNotUniqueByManualRun(): void
{
Database::connect()
->table('user')
->insert([
'name' => 'Developer A',
'email' => 'deva@example.com',
'country' => 'Elbonia',
]);

$this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
return new Rules();
}
}
32 changes: 27 additions & 5 deletions tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,16 @@
/**
* @internal
*
* @no-final
*
* @group DatabaseLive
*/
final class DatabaseRelatedRulesTest extends CIUnitTestCase
class DatabaseRelatedRulesTest extends CIUnitTestCase
{
use DatabaseTestTrait;

private Validation $validation;
private array $config = [
protected Validation $validation;
protected array $config = [
'ruleSets' => [
Rules::class,
FormatRules::class,
Expand All@@ -53,6 +55,11 @@ protected function setUp(): void
$this->validation->reset();
}

protected function createRules()
{
return new Rules();
}

public function testIsUniqueFalse(): void
{
Database::connect()
Expand DownExpand Up@@ -128,7 +135,22 @@ public function testIsUniqueByManualRun(): void
'country' => 'Elbonia',
]);

$this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
$this->assertFalse($this->createRules()->is_unique('deva@example.com', 'user.email,id,{id}', []));
}

public function testIsUniqueIntValueByManualRun(): void
{
Database::connect()
->table('user')
->insert([
'name' => 'Developer A',
'email' => 'deva@example.com',
'country' => 'Elbonia',
]);

$result = $this->createRules()->is_unique(1, 'user.id', []);

$this->assertFalse($result);
}

public function testIsNotUniqueFalse(): void
Expand DownExpand Up@@ -213,6 +235,6 @@ public function testIsNotUniqueByManualRun(): void
'country' => 'Elbonia',
]);

$this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
$this->assertTrue($this->createRules()->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: TypeError in Validation is_unique/is_not_unique#7085

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.

 Sign up for GitHub

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

 Merged

kenjis
merged 8 commits into

from

Jan 12, 2023
 Merged


fix: TypeError in Validation is_unique/is_not_unique
#7085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
7d195e3

test: refactor: remove duplicate code


kenjis Jan 11, 2023
7f789ac

test: fix wrong Rules instance


kenjis Jan 11, 2023
5ab8487

test: add test for is_unique and int value


kenjis Jan 11, 2023
d7099cc

fix: TypeError in Rules::is_unique()


kenjis Jan 11, 2023
5722ab0

fix: TypeError in Rules::is_not_unique()


kenjis Jan 11, 2023
7b405d1

fix: add type check


kenjis Jan 11, 2023
7d4e0eb

fix: revert Traditional is_unique() is_not_unique() implementation


kenjis Jan 11, 2023
76c8997

style: break long lines


kenjis Jan 11, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 18 additions & 4 deletions
system/Validation/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,11 @@ public function greater_than_equal_to(?string $str, string $min): bool
 public function is_not_unique(?string $str, string $field, array $data): bool
@jlopes90jlopes90Jan 11, 2023•

edited

Loading

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yesterday I was trying something else, I removed "?string" and it worked.
 {
 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);
Expand All@@ -97,7 +101,10 @@ public function is_not_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue)) {
 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

Expand DownExpand Up@@ -125,7 +132,11 @@ public function in_list(?string $value, string $list): bool
 */
 public function is_unique(?string $str, string $field, array $data): bool
 {
 [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

Expand All@@ -135,7 +146,10 @@ public function is_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

Expand Down

56 changes: 54 additions & 2 deletions
system/Validation/StrictRules/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,34 @@ public function greater_than_equal_to($str, string $min): bool
 */
 public function is_not_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_not_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

 return $row->get()->getRow() !== null;
 }

 /**
Expand DownExpand Up@@ -151,7 +178,32 @@ public function in_list($value, string $list): bool
 */
 public function is_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

 return $row->get()->getRow() === null;
 }

 /**
Expand Down

181 changes: 5 additions & 176 deletions
tests/system/Validation/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,17 @@

namespace CodeIgniter\Validation;

use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\DatabaseTestTrait;
use Config\Database;
use Config\Services;
use CodeIgniter\Validation\StrictRules\DatabaseRelatedRulesTest as StrictDatabaseRelatedRulesTest;
use Tests\Support\Validation\TestRules;

/**
 * @internal
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
final class DatabaseRelatedRulesTest extends StrictDatabaseRelatedRulesTest
{
 use DatabaseTestTrait;

 private Validation $validation;
 private array $config = [
 protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -45,173 +39,8 @@ final class DatabaseRelatedRulesTest extends CIUnitTestCase
 ],
 ];

 protected function setUp(): void
 {
 parent::setUp();
 $this->validation = new Validation((object) $this->config, Services::renderer());
 $this->validation->reset();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsUniqueTrue(): void
 {
 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParams(): void
 {
 $db = Database::connect();
 $db
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);
 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_unique[user.email,id,{$row->id}]"]);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];

 $this->validation->setRules(['email' => 'is_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsNotUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek1@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueTrue(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParams(): void
 protected function createRules()
 {
 $db = Database::connect();
 $db->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_not_unique[user.email,id,{$row->id}]"]);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];
 $this->validation->setRules(['email' => 'is_not_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 return new Rules();
 }
}

32 changes: 27 additions & 5 deletions
tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,16 @@
/**
 * @internal
 *
 * @no-final
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
class DatabaseRelatedRulesTest extends CIUnitTestCase
{
 use DatabaseTestTrait;

private Validation $validation;
private array $config = [
protected Validation $validation;
protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -53,6 +55,11 @@ protected function setUp(): void
 $this->validation->reset();
 }

 protected function createRules()
 {
 return new Rules();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
Expand DownExpand Up@@ -128,7 +135,22 @@ public function testIsUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertFalse($this->createRules()->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsUniqueIntValueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $result = $this->createRules()->is_unique(1, 'user.id', []);

 $this->assertFalse($result);
 }

 public function testIsNotUniqueFalse(): void
Expand DownExpand Up@@ -213,6 +235,6 @@ public function testIsNotUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertTrue($this->createRules()->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: TypeError in Validation is_unique/is_not_unique#7085

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.

 Sign up for GitHub

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

 Merged

kenjis
merged 8 commits into

from

Jan 12, 2023
 Merged


fix: TypeError in Validation is_unique/is_not_unique
#7085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
7d195e3

test: refactor: remove duplicate code


kenjis Jan 11, 2023
7f789ac

test: fix wrong Rules instance


kenjis Jan 11, 2023
5ab8487

test: add test for is_unique and int value


kenjis Jan 11, 2023
d7099cc

fix: TypeError in Rules::is_unique()


kenjis Jan 11, 2023
5722ab0

fix: TypeError in Rules::is_not_unique()


kenjis Jan 11, 2023
7b405d1

fix: add type check


kenjis Jan 11, 2023
7d4e0eb

fix: revert Traditional is_unique() is_not_unique() implementation


kenjis Jan 11, 2023
76c8997

style: break long lines


kenjis Jan 11, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 18 additions & 4 deletions
system/Validation/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,11 @@ public function greater_than_equal_to(?string $str, string $min): bool
 public function is_not_unique(?string $str, string $field, array $data): bool
@jlopes90jlopes90Jan 11, 2023•

edited

Loading

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yesterday I was trying something else, I removed "?string" and it worked.
 {
 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);
Expand All@@ -97,7 +101,10 @@ public function is_not_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue)) {
 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

Expand DownExpand Up@@ -125,7 +132,11 @@ public function in_list(?string $value, string $list): bool
 */
 public function is_unique(?string $str, string $field, array $data): bool
 {
 [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

Expand All@@ -135,7 +146,10 @@ public function is_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

Expand Down

56 changes: 54 additions & 2 deletions
system/Validation/StrictRules/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,34 @@ public function greater_than_equal_to($str, string $min): bool
 */
 public function is_not_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_not_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

 return $row->get()->getRow() !== null;
 }

 /**
Expand DownExpand Up@@ -151,7 +178,32 @@ public function in_list($value, string $list): bool
 */
 public function is_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

 return $row->get()->getRow() === null;
 }

 /**
Expand Down

181 changes: 5 additions & 176 deletions
tests/system/Validation/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,17 @@

namespace CodeIgniter\Validation;

use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\DatabaseTestTrait;
use Config\Database;
use Config\Services;
use CodeIgniter\Validation\StrictRules\DatabaseRelatedRulesTest as StrictDatabaseRelatedRulesTest;
use Tests\Support\Validation\TestRules;

/**
 * @internal
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
final class DatabaseRelatedRulesTest extends StrictDatabaseRelatedRulesTest
{
 use DatabaseTestTrait;

 private Validation $validation;
 private array $config = [
 protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -45,173 +39,8 @@ final class DatabaseRelatedRulesTest extends CIUnitTestCase
 ],
 ];

 protected function setUp(): void
 {
 parent::setUp();
 $this->validation = new Validation((object) $this->config, Services::renderer());
 $this->validation->reset();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsUniqueTrue(): void
 {
 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParams(): void
 {
 $db = Database::connect();
 $db
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);
 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_unique[user.email,id,{$row->id}]"]);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];

 $this->validation->setRules(['email' => 'is_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsNotUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek1@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueTrue(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParams(): void
 protected function createRules()
 {
 $db = Database::connect();
 $db->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_not_unique[user.email,id,{$row->id}]"]);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];
 $this->validation->setRules(['email' => 'is_not_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 return new Rules();
 }
}

32 changes: 27 additions & 5 deletions
tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,16 @@
/**
 * @internal
 *
 * @no-final
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
class DatabaseRelatedRulesTest extends CIUnitTestCase
{
 use DatabaseTestTrait;

private Validation $validation;
private array $config = [
protected Validation $validation;
protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -53,6 +55,11 @@ protected function setUp(): void
 $this->validation->reset();
 }

 protected function createRules()
 {
 return new Rules();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
Expand DownExpand Up@@ -128,7 +135,22 @@ public function testIsUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertFalse($this->createRules()->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsUniqueIntValueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $result = $this->createRules()->is_unique(1, 'user.id', []);

 $this->assertFalse($result);
 }

 public function testIsNotUniqueFalse(): void
Expand DownExpand Up@@ -213,6 +235,6 @@ public function testIsNotUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertTrue($this->createRules()->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: TypeError in Validation is_unique/is_not_unique#7085

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.

 Sign up for GitHub

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

 Merged

kenjis
merged 8 commits into

from

Jan 12, 2023
 Merged


fix: TypeError in Validation is_unique/is_not_unique
#7085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
7d195e3

test: refactor: remove duplicate code


kenjis Jan 11, 2023
7f789ac

test: fix wrong Rules instance


kenjis Jan 11, 2023
5ab8487

test: add test for is_unique and int value


kenjis Jan 11, 2023
d7099cc

fix: TypeError in Rules::is_unique()


kenjis Jan 11, 2023
5722ab0

fix: TypeError in Rules::is_not_unique()


kenjis Jan 11, 2023
7b405d1

fix: add type check


kenjis Jan 11, 2023
7d4e0eb

fix: revert Traditional is_unique() is_not_unique() implementation


kenjis Jan 11, 2023
76c8997

style: break long lines


kenjis Jan 11, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 18 additions & 4 deletions
system/Validation/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,11 @@ public function greater_than_equal_to(?string $str, string $min): bool
 public function is_not_unique(?string $str, string $field, array $data): bool
@jlopes90jlopes90Jan 11, 2023•

edited

Loading

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yesterday I was trying something else, I removed "?string" and it worked.
 {
 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);
Expand All@@ -97,7 +101,10 @@ public function is_not_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue)) {
 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

Expand DownExpand Up@@ -125,7 +132,11 @@ public function in_list(?string $value, string $list): bool
 */
 public function is_unique(?string $str, string $field, array $data): bool
 {
 [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

Expand All@@ -135,7 +146,10 @@ public function is_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

Expand Down

56 changes: 54 additions & 2 deletions
system/Validation/StrictRules/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,34 @@ public function greater_than_equal_to($str, string $min): bool
 */
 public function is_not_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_not_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

 return $row->get()->getRow() !== null;
 }

 /**
Expand DownExpand Up@@ -151,7 +178,32 @@ public function in_list($value, string $list): bool
 */
 public function is_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

 return $row->get()->getRow() === null;
 }

 /**
Expand Down

181 changes: 5 additions & 176 deletions
tests/system/Validation/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,17 @@

namespace CodeIgniter\Validation;

use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\DatabaseTestTrait;
use Config\Database;
use Config\Services;
use CodeIgniter\Validation\StrictRules\DatabaseRelatedRulesTest as StrictDatabaseRelatedRulesTest;
use Tests\Support\Validation\TestRules;

/**
 * @internal
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
final class DatabaseRelatedRulesTest extends StrictDatabaseRelatedRulesTest
{
 use DatabaseTestTrait;

 private Validation $validation;
 private array $config = [
 protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -45,173 +39,8 @@ final class DatabaseRelatedRulesTest extends CIUnitTestCase
 ],
 ];

 protected function setUp(): void
 {
 parent::setUp();
 $this->validation = new Validation((object) $this->config, Services::renderer());
 $this->validation->reset();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsUniqueTrue(): void
 {
 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParams(): void
 {
 $db = Database::connect();
 $db
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);
 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_unique[user.email,id,{$row->id}]"]);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];

 $this->validation->setRules(['email' => 'is_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsNotUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek1@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueTrue(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParams(): void
 protected function createRules()
 {
 $db = Database::connect();
 $db->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_not_unique[user.email,id,{$row->id}]"]);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];
 $this->validation->setRules(['email' => 'is_not_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 return new Rules();
 }
}

32 changes: 27 additions & 5 deletions
tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,16 @@
/**
 * @internal
 *
 * @no-final
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
class DatabaseRelatedRulesTest extends CIUnitTestCase
{
 use DatabaseTestTrait;

private Validation $validation;
private array $config = [
protected Validation $validation;
protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -53,6 +55,11 @@ protected function setUp(): void
 $this->validation->reset();
 }

 protected function createRules()
 {
 return new Rules();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
Expand DownExpand Up@@ -128,7 +135,22 @@ public function testIsUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertFalse($this->createRules()->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsUniqueIntValueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $result = $this->createRules()->is_unique(1, 'user.id', []);

 $this->assertFalse($result);
 }

 public function testIsNotUniqueFalse(): void
Expand DownExpand Up@@ -213,6 +235,6 @@ public function testIsNotUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertTrue($this->createRules()->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: TypeError in Validation is_unique/is_not_unique#7085

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.

 Sign up for GitHub

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

 Merged

kenjis
merged 8 commits into

from

Jan 12, 2023
 Merged


fix: TypeError in Validation is_unique/is_not_unique
#7085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
7d195e3

test: refactor: remove duplicate code


kenjis Jan 11, 2023
7f789ac

test: fix wrong Rules instance


kenjis Jan 11, 2023
5ab8487

test: add test for is_unique and int value


kenjis Jan 11, 2023
d7099cc

fix: TypeError in Rules::is_unique()


kenjis Jan 11, 2023
5722ab0

fix: TypeError in Rules::is_not_unique()


kenjis Jan 11, 2023
7b405d1

fix: add type check


kenjis Jan 11, 2023
7d4e0eb

fix: revert Traditional is_unique() is_not_unique() implementation


kenjis Jan 11, 2023
76c8997

style: break long lines


kenjis Jan 11, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 18 additions & 4 deletions
system/Validation/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,11 @@ public function greater_than_equal_to(?string $str, string $min): bool
 public function is_not_unique(?string $str, string $field, array $data): bool
@jlopes90jlopes90Jan 11, 2023•

edited

Loading

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yesterday I was trying something else, I removed "?string" and it worked.
 {
 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);
Expand All@@ -97,7 +101,10 @@ public function is_not_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue)) {
 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

Expand DownExpand Up@@ -125,7 +132,11 @@ public function in_list(?string $value, string $list): bool
 */
 public function is_unique(?string $str, string $field, array $data): bool
 {
 [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

Expand All@@ -135,7 +146,10 @@ public function is_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

Expand Down

56 changes: 54 additions & 2 deletions
system/Validation/StrictRules/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,34 @@ public function greater_than_equal_to($str, string $min): bool
 */
 public function is_not_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_not_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

 return $row->get()->getRow() !== null;
 }

 /**
Expand DownExpand Up@@ -151,7 +178,32 @@ public function in_list($value, string $list): bool
 */
 public function is_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

 return $row->get()->getRow() === null;
 }

 /**
Expand Down

181 changes: 5 additions & 176 deletions
tests/system/Validation/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,17 @@

namespace CodeIgniter\Validation;

use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\DatabaseTestTrait;
use Config\Database;
use Config\Services;
use CodeIgniter\Validation\StrictRules\DatabaseRelatedRulesTest as StrictDatabaseRelatedRulesTest;
use Tests\Support\Validation\TestRules;

/**
 * @internal
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
final class DatabaseRelatedRulesTest extends StrictDatabaseRelatedRulesTest
{
 use DatabaseTestTrait;

 private Validation $validation;
 private array $config = [
 protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -45,173 +39,8 @@ final class DatabaseRelatedRulesTest extends CIUnitTestCase
 ],
 ];

 protected function setUp(): void
 {
 parent::setUp();
 $this->validation = new Validation((object) $this->config, Services::renderer());
 $this->validation->reset();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsUniqueTrue(): void
 {
 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParams(): void
 {
 $db = Database::connect();
 $db
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);
 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_unique[user.email,id,{$row->id}]"]);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];

 $this->validation->setRules(['email' => 'is_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsNotUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek1@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueTrue(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParams(): void
 protected function createRules()
 {
 $db = Database::connect();
 $db->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_not_unique[user.email,id,{$row->id}]"]);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];
 $this->validation->setRules(['email' => 'is_not_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 return new Rules();
 }
}

32 changes: 27 additions & 5 deletions
tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,16 @@
/**
 * @internal
 *
 * @no-final
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
class DatabaseRelatedRulesTest extends CIUnitTestCase
{
 use DatabaseTestTrait;

private Validation $validation;
private array $config = [
protected Validation $validation;
protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -53,6 +55,11 @@ protected function setUp(): void
 $this->validation->reset();
 }

 protected function createRules()
 {
 return new Rules();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
Expand DownExpand Up@@ -128,7 +135,22 @@ public function testIsUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertFalse($this->createRules()->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsUniqueIntValueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $result = $this->createRules()->is_unique(1, 'user.id', []);

 $this->assertFalse($result);
 }

 public function testIsNotUniqueFalse(): void
Expand DownExpand Up@@ -213,6 +235,6 @@ public function testIsNotUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertTrue($this->createRules()->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: TypeError in Validation is_unique/is_not_unique#7085

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.

 Sign up for GitHub

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

 Merged

kenjis
merged 8 commits into

from

Jan 12, 2023
 Merged


fix: TypeError in Validation is_unique/is_not_unique
#7085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
7d195e3

test: refactor: remove duplicate code


kenjis Jan 11, 2023
7f789ac

test: fix wrong Rules instance


kenjis Jan 11, 2023
5ab8487

test: add test for is_unique and int value


kenjis Jan 11, 2023
d7099cc

fix: TypeError in Rules::is_unique()


kenjis Jan 11, 2023
5722ab0

fix: TypeError in Rules::is_not_unique()


kenjis Jan 11, 2023
7b405d1

fix: add type check


kenjis Jan 11, 2023
7d4e0eb

fix: revert Traditional is_unique() is_not_unique() implementation


kenjis Jan 11, 2023
76c8997

style: break long lines


kenjis Jan 11, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 18 additions & 4 deletions
system/Validation/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,11 @@ public function greater_than_equal_to(?string $str, string $min): bool
 public function is_not_unique(?string $str, string $field, array $data): bool
@jlopes90jlopes90Jan 11, 2023•

edited

Loading

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yesterday I was trying something else, I removed "?string" and it worked.
 {
 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);
Expand All@@ -97,7 +101,10 @@ public function is_not_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue)) {
 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

Expand DownExpand Up@@ -125,7 +132,11 @@ public function in_list(?string $value, string $list): bool
 */
 public function is_unique(?string $str, string $field, array $data): bool
 {
 [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

Expand All@@ -135,7 +146,10 @@ public function is_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

Expand Down

56 changes: 54 additions & 2 deletions
system/Validation/StrictRules/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,34 @@ public function greater_than_equal_to($str, string $min): bool
 */
 public function is_not_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_not_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

 return $row->get()->getRow() !== null;
 }

 /**
Expand DownExpand Up@@ -151,7 +178,32 @@ public function in_list($value, string $list): bool
 */
 public function is_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

 return $row->get()->getRow() === null;
 }

 /**
Expand Down

181 changes: 5 additions & 176 deletions
tests/system/Validation/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,17 @@

namespace CodeIgniter\Validation;

use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\DatabaseTestTrait;
use Config\Database;
use Config\Services;
use CodeIgniter\Validation\StrictRules\DatabaseRelatedRulesTest as StrictDatabaseRelatedRulesTest;
use Tests\Support\Validation\TestRules;

/**
 * @internal
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
final class DatabaseRelatedRulesTest extends StrictDatabaseRelatedRulesTest
{
 use DatabaseTestTrait;

 private Validation $validation;
 private array $config = [
 protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -45,173 +39,8 @@ final class DatabaseRelatedRulesTest extends CIUnitTestCase
 ],
 ];

 protected function setUp(): void
 {
 parent::setUp();
 $this->validation = new Validation((object) $this->config, Services::renderer());
 $this->validation->reset();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsUniqueTrue(): void
 {
 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParams(): void
 {
 $db = Database::connect();
 $db
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);
 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_unique[user.email,id,{$row->id}]"]);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];

 $this->validation->setRules(['email' => 'is_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsNotUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek1@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueTrue(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParams(): void
 protected function createRules()
 {
 $db = Database::connect();
 $db->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_not_unique[user.email,id,{$row->id}]"]);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];
 $this->validation->setRules(['email' => 'is_not_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 return new Rules();
 }
}

32 changes: 27 additions & 5 deletions
tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,16 @@
/**
 * @internal
 *
 * @no-final
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
class DatabaseRelatedRulesTest extends CIUnitTestCase
{
 use DatabaseTestTrait;

private Validation $validation;
private array $config = [
protected Validation $validation;
protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -53,6 +55,11 @@ protected function setUp(): void
 $this->validation->reset();
 }

 protected function createRules()
 {
 return new Rules();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
Expand DownExpand Up@@ -128,7 +135,22 @@ public function testIsUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertFalse($this->createRules()->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsUniqueIntValueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $result = $this->createRules()->is_unique(1, 'user.id', []);

 $this->assertFalse($result);
 }

 public function testIsNotUniqueFalse(): void
Expand DownExpand Up@@ -213,6 +235,6 @@ public function testIsNotUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertTrue($this->createRules()->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: TypeError in Validation is_unique/is_not_unique#7085

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.

 Sign up for GitHub

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

 Merged

kenjis
merged 8 commits into

from

Jan 12, 2023
 Merged


fix: TypeError in Validation is_unique/is_not_unique
#7085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
7d195e3

test: refactor: remove duplicate code


kenjis Jan 11, 2023
7f789ac

test: fix wrong Rules instance


kenjis Jan 11, 2023
5ab8487

test: add test for is_unique and int value


kenjis Jan 11, 2023
d7099cc

fix: TypeError in Rules::is_unique()


kenjis Jan 11, 2023
5722ab0

fix: TypeError in Rules::is_not_unique()


kenjis Jan 11, 2023
7b405d1

fix: add type check


kenjis Jan 11, 2023
7d4e0eb

fix: revert Traditional is_unique() is_not_unique() implementation


kenjis Jan 11, 2023
76c8997

style: break long lines


kenjis Jan 11, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 18 additions & 4 deletions
system/Validation/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,11 @@ public function greater_than_equal_to(?string $str, string $min): bool
 public function is_not_unique(?string $str, string $field, array $data): bool
@jlopes90jlopes90Jan 11, 2023•

edited

Loading

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yesterday I was trying something else, I removed "?string" and it worked.
 {
 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);
Expand All@@ -97,7 +101,10 @@ public function is_not_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue)) {
 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

Expand DownExpand Up@@ -125,7 +132,11 @@ public function in_list(?string $value, string $list): bool
 */
 public function is_unique(?string $str, string $field, array $data): bool
 {
 [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

Expand All@@ -135,7 +146,10 @@ public function is_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

Expand Down

56 changes: 54 additions & 2 deletions
system/Validation/StrictRules/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,34 @@ public function greater_than_equal_to($str, string $min): bool
 */
 public function is_not_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_not_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

 return $row->get()->getRow() !== null;
 }

 /**
Expand DownExpand Up@@ -151,7 +178,32 @@ public function in_list($value, string $list): bool
 */
 public function is_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

 return $row->get()->getRow() === null;
 }

 /**
Expand Down

181 changes: 5 additions & 176 deletions
tests/system/Validation/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,17 @@

namespace CodeIgniter\Validation;

use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\DatabaseTestTrait;
use Config\Database;
use Config\Services;
use CodeIgniter\Validation\StrictRules\DatabaseRelatedRulesTest as StrictDatabaseRelatedRulesTest;
use Tests\Support\Validation\TestRules;

/**
 * @internal
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
final class DatabaseRelatedRulesTest extends StrictDatabaseRelatedRulesTest
{
 use DatabaseTestTrait;

 private Validation $validation;
 private array $config = [
 protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -45,173 +39,8 @@ final class DatabaseRelatedRulesTest extends CIUnitTestCase
 ],
 ];

 protected function setUp(): void
 {
 parent::setUp();
 $this->validation = new Validation((object) $this->config, Services::renderer());
 $this->validation->reset();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsUniqueTrue(): void
 {
 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParams(): void
 {
 $db = Database::connect();
 $db
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);
 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_unique[user.email,id,{$row->id}]"]);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];

 $this->validation->setRules(['email' => 'is_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsNotUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek1@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueTrue(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParams(): void
 protected function createRules()
 {
 $db = Database::connect();
 $db->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_not_unique[user.email,id,{$row->id}]"]);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];
 $this->validation->setRules(['email' => 'is_not_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 return new Rules();
 }
}

32 changes: 27 additions & 5 deletions
tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,16 @@
/**
 * @internal
 *
 * @no-final
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
class DatabaseRelatedRulesTest extends CIUnitTestCase
{
 use DatabaseTestTrait;

private Validation $validation;
private array $config = [
protected Validation $validation;
protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -53,6 +55,11 @@ protected function setUp(): void
 $this->validation->reset();
 }

 protected function createRules()
 {
 return new Rules();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
Expand DownExpand Up@@ -128,7 +135,22 @@ public function testIsUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertFalse($this->createRules()->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsUniqueIntValueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $result = $this->createRules()->is_unique(1, 'user.id', []);

 $this->assertFalse($result);
 }

 public function testIsNotUniqueFalse(): void
Expand DownExpand Up@@ -213,6 +235,6 @@ public function testIsNotUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertTrue($this->createRules()->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: TypeError in Validation is_unique/is_not_unique#7085

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.

 Sign up for GitHub

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

 Merged

kenjis
merged 8 commits into

from

Jan 12, 2023
 Merged


fix: TypeError in Validation is_unique/is_not_unique
#7085
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
7d195e3

test: refactor: remove duplicate code


kenjis Jan 11, 2023
7f789ac

test: fix wrong Rules instance


kenjis Jan 11, 2023
5ab8487

test: add test for is_unique and int value


kenjis Jan 11, 2023
d7099cc

fix: TypeError in Rules::is_unique()


kenjis Jan 11, 2023
5722ab0

fix: TypeError in Rules::is_not_unique()


kenjis Jan 11, 2023
7b405d1

fix: add type check


kenjis Jan 11, 2023
7d4e0eb

fix: revert Traditional is_unique() is_not_unique() implementation


kenjis Jan 11, 2023
76c8997

style: break long lines


kenjis Jan 11, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 18 additions & 4 deletions
system/Validation/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,11 @@ public function greater_than_equal_to(?string $str, string $min): bool
 public function is_not_unique(?string $str, string $field, array $data): bool
@jlopes90jlopes90Jan 11, 2023•

edited

Loading

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yesterday I was trying something else, I removed "?string" and it worked.
 {
 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);
Expand All@@ -97,7 +101,10 @@ public function is_not_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue)) {
 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

Expand DownExpand Up@@ -125,7 +132,11 @@ public function in_list(?string $value, string $list): bool
 */
 public function is_unique(?string $str, string $field, array $data): bool
 {
 [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

Expand All@@ -135,7 +146,10 @@ public function is_unique(?string $str, string $field, array $data): bool
 ->where($field, $str)
 ->limit(1);

 if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

Expand Down

56 changes: 54 additions & 2 deletions
system/Validation/StrictRules/Rules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,34 @@ public function greater_than_equal_to($str, string $min): bool
 */
 public function is_not_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_not_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 // Grab any data for exclusion of a single row.
 [$field, $whereField, $whereValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 // Break the table and field apart
 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($whereField) && ! empty($whereValue)
 && ! preg_match('/^\{(\w+)\}$/', $whereValue)
 ) {
 $row = $row->where($whereField, $whereValue);
 }

 return $row->get()->getRow() !== null;
 }

 /**
Expand DownExpand Up@@ -151,7 +178,32 @@ public function in_list($value, string $list): bool
 */
 public function is_unique($str, string $field, array $data): bool
 {
 return $this->nonStrictRules->is_unique($str, $field, $data);
 if (is_object($str) || is_array($str)) {
 return false;
 }

 [$field, $ignoreField, $ignoreValue] = array_pad(
 explode(',', $field),
 3,
 null
 );

 sscanf($field, '%[^.].%[^.]', $table, $field);

 $row = Database::connect($data['DBGroup'] ?? null)
 ->table($table)
 ->select('1')
 ->where($field, $str)
 ->limit(1);

 if (
 ! empty($ignoreField) && ! empty($ignoreValue)
 && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)
 ) {
 $row = $row->where("{$ignoreField} !=", $ignoreValue);
 }

 return $row->get()->getRow() === null;
 }

 /**
Expand Down

181 changes: 5 additions & 176 deletions
tests/system/Validation/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,17 @@

namespace CodeIgniter\Validation;

use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\DatabaseTestTrait;
use Config\Database;
use Config\Services;
use CodeIgniter\Validation\StrictRules\DatabaseRelatedRulesTest as StrictDatabaseRelatedRulesTest;
use Tests\Support\Validation\TestRules;

/**
 * @internal
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
final class DatabaseRelatedRulesTest extends StrictDatabaseRelatedRulesTest
{
 use DatabaseTestTrait;

 private Validation $validation;
 private array $config = [
 protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -45,173 +39,8 @@ final class DatabaseRelatedRulesTest extends CIUnitTestCase
 ],
 ];

 protected function setUp(): void
 {
 parent::setUp();
 $this->validation = new Validation((object) $this->config, Services::renderer());
 $this->validation->reset();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsUniqueTrue(): void
 {
 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => 'is_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParams(): void
 {
 $db = Database::connect();
 $db
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);
 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_unique[user.email,id,{$row->id}]"]);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];

 $this->validation->setRules(['email' => 'is_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsNotUniqueFalse(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek1@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueTrue(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Derek Travis',
 'email' => 'derek@world.com',
 'country' => 'Elbonia',
 ]);

 $data = ['email' => 'derek@world.com'];
 $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParams(): void
 protected function createRules()
 {
 $db = Database::connect();
 $db->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $row = $db->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = ['email' => 'derek@world.co.uk'];
 $this->validation->setRules(['email' => "is_not_unique[user.email,id,{$row->id}]"]);
 $this->assertFalse($this->validation->run($data));
 }

 public function testIsNotUniqueIgnoresParamsPlaceholders(): void
 {
 $this->hasInDatabase('user', [
 'name' => 'Derek',
 'email' => 'derek@world.co.uk',
 'country' => 'GB',
 ]);

 $row = Database::connect()
 ->table('user')
 ->limit(1)
 ->get()
 ->getRow();

 $data = [
 'id' => $row->id,
 'email' => 'derek@world.co.uk',
 ];
 $this->validation->setRules(['email' => 'is_not_unique[user.email,id,{id}]']);
 $this->assertTrue($this->validation->run($data));
 }

 public function testIsNotUniqueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 return new Rules();
 }
}

32 changes: 27 additions & 5 deletions
tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,16 @@
/**
 * @internal
 *
 * @no-final
 *
 * @group DatabaseLive
 */
final class DatabaseRelatedRulesTest extends CIUnitTestCase
class DatabaseRelatedRulesTest extends CIUnitTestCase
{
 use DatabaseTestTrait;

private Validation $validation;
private array $config = [
protected Validation $validation;
protected array $config = [
 'ruleSets' => [
 Rules::class,
 FormatRules::class,
Expand All@@ -53,6 +55,11 @@ protected function setUp(): void
 $this->validation->reset();
 }

 protected function createRules()
 {
 return new Rules();
 }

 public function testIsUniqueFalse(): void
 {
 Database::connect()
Expand DownExpand Up@@ -128,7 +135,22 @@ public function testIsUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertFalse($this->createRules()->is_unique('deva@example.com', 'user.email,id,{id}', []));
 }

 public function testIsUniqueIntValueByManualRun(): void
 {
 Database::connect()
 ->table('user')
 ->insert([
 'name' => 'Developer A',
 'email' => 'deva@example.com',
 'country' => 'Elbonia',
 ]);

 $result = $this->createRules()->is_unique(1, 'user.id', []);

 $this->assertFalse($result);
 }

 public function testIsNotUniqueFalse(): void
Expand DownExpand Up@@ -213,6 +235,6 @@ public function testIsNotUniqueByManualRun(): void
 'country' => 'Elbonia',
 ]);

 $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 $this->assertTrue($this->createRules()->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
 }
}