diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php index 775cf64e447..ce71d761a7d 100644 --- a/tests/TestCase/ORM/TableTest.php +++ b/tests/TestCase/ORM/TableTest.php @@ -2066,7 +2066,7 @@ public function testSaveWithValidationError() { 'username' => 'superuser' ]); $table = TableRegistry::get('users'); - $table->validator()->validatePresence('password'); + $table->validator()->requirePresence('password'); $this->assertFalse($table->save($entity)); $this->assertNotEmpty($entity->errors('password')); $this->assertSame($entity, $table->validator()->provider('entity')); @@ -2083,7 +2083,7 @@ public function testSaveWithValidationErrorAndFieldList() { 'username' => 'superuser' ]); $table = TableRegistry::get('users'); - $table->validator()->validatePresence('password'); + $table->validator()->requirePresence('password'); $this->assertFalse($table->save($entity)); $this->assertNotEmpty($entity->errors('password')); } @@ -2098,7 +2098,7 @@ public function testSaveWithDifferentValidator() { 'username' => 'superuser' ]); $table = TableRegistry::get('users'); - $validator = (new Validator)->validatePresence('password'); + $validator = (new Validator)->requirePresence('password'); $table->validator('custom', $validator); $this->assertFalse($table->save($entity, ['validate' => 'custom'])); $this->assertNotEmpty($entity->errors('password')); @@ -2117,7 +2117,7 @@ public function testSaveWithValidationSuccess() { 'password' => 'hey' ]); $table = TableRegistry::get('users'); - $table->validator()->validatePresence('password'); + $table->validator()->requirePresence('password'); $this->assertSame($entity, $table->save($entity)); $this->assertEmpty($entity->errors('password')); } @@ -2136,7 +2136,7 @@ public function testBeforeValidate() { $this->assertSame($entity, $en); $this->assertTrue($opt['crazy']); $this->assertSame($ev->subject()->validator('default'), $val); - $val->validatePresence('password'); + $val->requirePresence('password'); }, 'Model.beforeValidate'); $this->assertFalse($table->save($entity, ['crazy' => true])); $this->assertNotEmpty($entity->errors('password')); @@ -2171,7 +2171,7 @@ public function testAfterValidate() { 'password' => 'hey' ]); $table = TableRegistry::get('users'); - $table->validator()->validatePresence('password'); + $table->validator()->requirePresence('password'); $table->eventManager()->attach(function ($ev, $en, $opt, $val) use ($entity) { $this->assertSame($entity, $en); $this->assertTrue($opt['crazy']); @@ -2207,10 +2207,10 @@ public function testSaveWithDifferentValidatorAndAssociations() { $table = TableRegistry::get('articles'); $table->belongsTo('authors'); $table->hasMany('ArticlesTags'); - $validator = (new Validator)->validatePresence('body'); + $validator = (new Validator)->requirePresence('body'); $table->validator('custom', $validator); - $validator2 = (new Validator)->validatePresence('thing'); + $validator2 = (new Validator)->requirePresence('thing'); $table->authors->validator('default', $validator2); $this->assertFalse($table->save($entity, ['validate' => 'custom']), 'default was not used'); $this->assertNotEmpty($entity->author->errors('thing')); @@ -2242,13 +2242,13 @@ public function testSaveValidateAllAssociations() { $table->belongsTo('Authors'); $table->hasMany('Comments'); - $validator = (new Validator)->validatePresence('body'); + $validator = (new Validator)->requirePresence('body'); $table->validator('default', $validator); - $authorValidate = (new Validator)->validatePresence('bio'); + $authorValidate = (new Validator)->requirePresence('bio'); $table->Authors->validator('default', $authorValidate); - $commentValidate = (new Validator)->validatePresence('author'); + $commentValidate = (new Validator)->requirePresence('author'); $table->Comments->validator('default', $commentValidate); $result = $table->save($entity); diff --git a/tests/TestCase/Shell/Task/ModelTaskTest.php b/tests/TestCase/Shell/Task/ModelTaskTest.php index c04a80dd510..20f3f06fc2b 100644 --- a/tests/TestCase/Shell/Task/ModelTaskTest.php +++ b/tests/TestCase/Shell/Task/ModelTaskTest.php @@ -794,7 +794,7 @@ public function testBakeTableValidation() { $result); $this->assertContains("->allowEmpty('id', 'create')", $result); $this->assertContains("->allowEmpty('email')", $result); - $this->assertContains("->validatePresence('name', 'create')", $result); + $this->assertContains("->requirePresence('name', 'create')", $result); } /** diff --git a/tests/TestCase/Validation/ValidatorTest.php b/tests/TestCase/Validation/ValidatorTest.php index cf95cf82d7c..b5d180622da 100644 --- a/tests/TestCase/Validation/ValidatorTest.php +++ b/tests/TestCase/Validation/ValidatorTest.php @@ -94,22 +94,22 @@ public function testRemove() { } /** - * Tests the validatePresence method + * Tests the requirePresence method * * @return void */ - public function testValidatePresence() { + public function testRequirePresence() { $validator = new Validator; - $this->assertSame($validator, $validator->validatePresence('title')); + $this->assertSame($validator, $validator->requirePresence('title')); $this->assertTrue($validator->field('title')->isPresenceRequired()); - $validator->validatePresence('title', false); + $validator->requirePresence('title', false); $this->assertFalse($validator->field('title')->isPresenceRequired()); - $validator->validatePresence('title', 'create'); + $validator->requirePresence('title', 'create'); $this->assertEquals('create', $validator->field('title')->isPresenceRequired()); - $validator->validatePresence('title', 'update'); + $validator->requirePresence('title', 'update'); $this->assertEquals('update', $validator->field('title')->isPresenceRequired()); } @@ -120,19 +120,19 @@ public function testValidatePresence() { */ public function testIsPresenceRequired() { $validator = new Validator; - $this->assertSame($validator, $validator->validatePresence('title')); + $this->assertSame($validator, $validator->requirePresence('title')); $this->assertTrue($validator->isPresenceRequired('title', true)); $this->assertTrue($validator->isPresenceRequired('title', false)); - $validator->validatePresence('title', false); + $validator->requirePresence('title', false); $this->assertFalse($validator->isPresenceRequired('title', true)); $this->assertFalse($validator->isPresenceRequired('title', false)); - $validator->validatePresence('title', 'create'); + $validator->requirePresence('title', 'create'); $this->assertTrue($validator->isPresenceRequired('title', true)); $this->assertFalse($validator->isPresenceRequired('title', false)); - $validator->validatePresence('title', 'update'); + $validator->requirePresence('title', 'update'); $this->assertTrue($validator->isPresenceRequired('title', false)); $this->assertFalse($validator->isPresenceRequired('title', true)); } @@ -144,14 +144,14 @@ public function testIsPresenceRequired() { */ public function testErrorsWithPresenceRequired() { $validator = new Validator; - $validator->validatePresence('title'); + $validator->requirePresence('title'); $errors = $validator->errors(['foo' => 'something']); $expected = ['title' => ['This field is required']]; $this->assertEquals($expected, $errors); $this->assertEmpty($validator->errors(['title' => 'bar'])); - $validator->validatePresence('title', false); + $validator->requirePresence('title', false); $this->assertEmpty($validator->errors(['foo' => 'bar'])); } @@ -162,7 +162,7 @@ public function testErrorsWithPresenceRequired() { */ public function testCustomErrorsWithPresenceRequired() { $validator = new Validator; - $validator->validatePresence('title', true, 'Custom message'); + $validator->requirePresence('title', true, 'Custom message'); $errors = $validator->errors(['foo' => 'something']); $expected = ['title' => ['Custom message']]; $this->assertEquals($expected, $errors);