Skip to content

Commit 1136d98

Browse files
authored
fix: Rename misleading validate() function (#1075)
Bug: T422004
1 parent 7e7c898 commit 1136d98

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

app/Helper/DomainValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function __construct(string $subDomainSuffix, array $subdomainRules) {
1515
$this->subdomainRules = $subdomainRules;
1616
}
1717

18-
public function validate($domain): \Illuminate\Validation\Validator {
18+
public function getValidator($domain): \Illuminate\Validation\Validator {
1919

2020
$isSubdomain = WikiController::isSubDomain($domain, $this->subDomainSuffix);
2121

app/Helper/ProfileValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Illuminate\Support\Facades\Validator;
66

77
class ProfileValidator {
8-
public function validate($profile): \Illuminate\Validation\Validator {
8+
public function getValidator($profile): \Illuminate\Validation\Validator {
99

1010
return Validator::make($profile, [
1111
'purpose' => 'in:data_hub,data_lab,tool_lab,test_drive,decide_later,other',

app/Http/Controllers/WikiController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function create(Request $request): \Illuminate\Http\Response {
4747
$submittedDomain = strtolower($request->input('domain'));
4848
$submittedDomain = DomainHelper::encode($submittedDomain);
4949

50-
$domainValidator = $this->domainValidator->validate($submittedDomain);
50+
$domainValidator = $this->domainValidator->getValidator($submittedDomain);
5151
$isSubdomain = $this->isSubDomain($submittedDomain);
5252

5353
$domainValidator->validateWithBag('post');
@@ -70,7 +70,7 @@ public function create(Request $request): \Illuminate\Http\Response {
7070
$rawProfile = false;
7171
if ($request->filled('profile')) {
7272
$rawProfile = json_decode($request->input('profile'), true);
73-
$profileValidator = $this->profileValidator->validate($rawProfile);
73+
$profileValidator = $this->profileValidator->getValidator($rawProfile);
7474
$profileValidator->validateWithBag('post');
7575
}
7676

app/Http/Controllers/WikiProfileController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function create(Request $request): \Illuminate\Http\JsonResponse {
2121
]);
2222

2323
$rawProfile = json_decode($validatedInput['profile'], true);
24-
$profileValidator = $this->profileValidator->validate($rawProfile);
24+
$profileValidator = $this->profileValidator->getValidator($rawProfile);
2525
$profileValidator->validateWithBag('post');
2626

2727
$profile = WikiProfile::create(['wiki_id' => $wiki->id, ...$rawProfile]);

tests/Helper/DomainValidatorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010
class DomainValidatorTest extends TestCase {
1111
public function testValidatorUsesOldValidation() {
1212
$sut = new DomainValidator('.wbaas.localhost', []);
13-
$validator = $sut->validate('derp');
13+
$validator = $sut->getValidator('derp');
1414
$this->assertCount(1, $validator->errors());
1515
}
1616

1717
public function testValidatorUsesList() {
1818
$sut = new DomainValidator('.wbaas.localhost', [
1919
new ForbiddenSubdomainRule(['long-terrible-word'], '.wbaas.localhost'),
2020
]);
21-
$validator = $sut->validate('long-terrible-word.wbaas.localhost');
21+
$validator = $sut->getValidator('long-terrible-word.wbaas.localhost');
2222
$this->assertCount(1, $validator->errors());
2323
$this->assertEquals(ForbiddenSubdomainRule::ERROR_MESSAGE, $validator->errors()->get('domain')[0]);
2424
}
2525

2626
public function testAppValidator() {
2727
Config::set('wbstack.subdomain_suffix', '.wbaas.localhost');
2828
$sut = $this->app->make(DomainValidator::class);
29-
$validator = $sut->validate('statistics.wbaas.localhost');
29+
$validator = $sut->getValidator('statistics.wbaas.localhost');
3030
$this->assertCount(1, $validator->errors());
3131
$this->assertEquals(ForbiddenSubdomainRule::ERROR_MESSAGE, $validator->errors()->get('domain')[0]);
3232
}

tests/Helper/ProfileValidatorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ProfileValidatorTest extends TestCase {
1111
*/
1212
public function testProfileValidatorWorksWithValidProfile($profile): void {
1313
$validatorFactory = new ProfileValidator;
14-
$validator = $validatorFactory->validate($profile);
14+
$validator = $validatorFactory->getValidator($profile);
1515
$this->assertTrue($validator->passes());
1616
}
1717

@@ -20,7 +20,7 @@ public function testProfileValidatorWorksWithValidProfile($profile): void {
2020
*/
2121
public function testProfileValidatorWorksWithInvalidProfile($profile): void {
2222
$validatorFactory = new ProfileValidator;
23-
$validator = $validatorFactory->validate($profile);
23+
$validator = $validatorFactory->getValidator($profile);
2424
$this->assertFalse($validator->passes());
2525
}
2626

0 commit comments

Comments
 (0)