Skip to content

Commit 164342e

Browse files
binaryfirebinaryfire
committed
Replace container get() with make() in validation package
1 parent 08b063a commit 164342e

13 files changed

+79
-79
lines changed

‎src/validation/src/Concerns/ValidatesAttributes.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,8 +459,8 @@ public function validateDoesntContain(string $attribute, mixed $value, mixed $pa
459459
*/
460460
protected function validateCurrentPassword(string $attribute, mixed $value, mixed $parameters): bool
461461
{
462-
$auth = $this->container->get(\Hypervel\Contracts\Auth\Factory::class);
463-
$hasher = $this->container->get(\Hypervel\Contracts\Hashing\Hasher::class);
462+
$auth = $this->container->make(\Hypervel\Contracts\Auth\Factory::class);
463+
$hasher = $this->container->make(\Hypervel\Contracts\Hashing\Hasher::class);
464464

465465
$guard = $auth->guard(Arr::first($parameters));
466466

‎src/validation/src/PresenceVerifierFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class PresenceVerifierFactory
1212
public function __invoke(Container $container): DatabasePresenceVerifier
1313
{
1414
return new DatabasePresenceVerifier(
15-
$container->get(ConnectionResolverInterface::class)
15+
$container->make(ConnectionResolverInterface::class)
1616
);
1717
}
1818
}

‎src/validation/src/UncompromisedVerifierFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class UncompromisedVerifierFactory
1212
public function __invoke(Container $container): NotPwnedVerifier
1313
{
1414
return new NotPwnedVerifier(
15-
$container->get(HttpFactory::class)
15+
$container->make(HttpFactory::class)
1616
);
1717
}
1818
}

‎src/validation/src/ValidatorFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ class ValidatorFactory
1313
public function __invoke(Container $container): Factory
1414
{
1515
$validator = new Factory(
16-
$container->get(Translator::class),
16+
$container->make(Translator::class),
1717
$container
1818
);
1919

2020
// The validation presence verifier is responsible for determining the existence of
2121
// values in a given data collection which is typically a relational database or
2222
// other persistent data stores. It is used to check for "uniqueness" as well.
2323
if ($container->has(ConnectionResolverInterface::class) && $container->has(DatabasePresenceVerifierInterface::class)) {
24-
$presenceVerifier = $container->get(DatabasePresenceVerifierInterface::class);
24+
$presenceVerifier = $container->make(DatabasePresenceVerifierInterface::class);
2525
$validator->setPresenceVerifier($presenceVerifier);
2626
}
2727

‎tests/Validation/ValidationAnyOfRuleTest.php‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -53,39 +53,39 @@ public function testBasicValidation()
5353
$idRule = ['id' => $rule];
5454
$requiredIdRule = ['id' => ['required', $rule]];
5555

56-
$validator = new Validator($this->app->get(TranslatorContract::class), [
56+
$validator = new Validator($this->app->make(TranslatorContract::class), [
5757
'id' => 'taylor@laravel.com',
5858
], $idRule);
5959

6060
$this->assertTrue($validator->passes());
6161

62-
$validator = new Validator($this->app->get(TranslatorContract::class), [], $idRule);
62+
$validator = new Validator($this->app->make(TranslatorContract::class), [], $idRule);
6363
$this->assertTrue($validator->passes());
6464

65-
$validator = new Validator($this->app->get(TranslatorContract::class), [], $requiredIdRule);
65+
$validator = new Validator($this->app->make(TranslatorContract::class), [], $requiredIdRule);
6666
$this->assertFalse($validator->passes());
6767

68-
$validator = new Validator($this->app->get(TranslatorContract::class), [
68+
$validator = new Validator($this->app->make(TranslatorContract::class), [
6969
'id' => '3c8ff5cb-4bc1-457b-a477-1833c477b254',
7070
], $idRule);
7171
$this->assertTrue($validator->passes());
7272

73-
$validator = new Validator($this->app->get(TranslatorContract::class), [
73+
$validator = new Validator($this->app->make(TranslatorContract::class), [
7474
'id' => null,
7575
], $idRule);
7676
$this->assertFalse($validator->passes());
7777

78-
$validator = new Validator($this->app->get(TranslatorContract::class), [
78+
$validator = new Validator($this->app->make(TranslatorContract::class), [
7979
'id' => '',
8080
], $idRule);
8181
$this->assertTrue($validator->passes());
8282

83-
$validator = new Validator($this->app->get(TranslatorContract::class), [
83+
$validator = new Validator($this->app->make(TranslatorContract::class), [
8484
'id' => '',
8585
], $requiredIdRule);
8686
$this->assertFalse($validator->passes());
8787

88-
$validator = new Validator($this->app->get(TranslatorContract::class), [
88+
$validator = new Validator($this->app->make(TranslatorContract::class), [
8989
'id' => 'abc',
9090
], $idRule);
9191
$this->assertFalse($validator->passes());
@@ -100,86 +100,86 @@ public function testBasicStringValidation()
100100
$idRule = ['id' => $rule];
101101
$requiredIdRule = ['id' => ['required', $rule]];
102102

103-
$validator = new Validator($this->app->get(TranslatorContract::class), [
103+
$validator = new Validator($this->app->make(TranslatorContract::class), [
104104
'id' => 'test@example.com',
105105
], $idRule);
106106
$this->assertTrue($validator->passes());
107107

108-
$validator = new Validator($this->app->get(TranslatorContract::class), [], $idRule);
108+
$validator = new Validator($this->app->make(TranslatorContract::class), [], $idRule);
109109
$this->assertTrue($validator->passes());
110110

111-
$validator = new Validator($this->app->get(TranslatorContract::class), [], $requiredIdRule);
111+
$validator = new Validator($this->app->make(TranslatorContract::class), [], $requiredIdRule);
112112
$this->assertFalse($validator->passes());
113113

114-
$validator = new Validator($this->app->get(TranslatorContract::class), [
114+
$validator = new Validator($this->app->make(TranslatorContract::class), [
115115
'id' => '3c8ff5cb-4bc1-457b-a477-1833c477b254',
116116
], $idRule);
117117
$this->assertTrue($validator->passes());
118118

119-
$validator = new Validator($this->app->get(TranslatorContract::class), [
119+
$validator = new Validator($this->app->make(TranslatorContract::class), [
120120
'id' => null,
121121
], $idRule);
122122
$this->assertFalse($validator->passes());
123123

124-
$validator = new Validator($this->app->get(TranslatorContract::class), [
124+
$validator = new Validator($this->app->make(TranslatorContract::class), [
125125
'id' => '',
126126
], $idRule);
127127
$this->assertTrue($validator->passes());
128128

129-
$validator = new Validator($this->app->get(TranslatorContract::class), [
129+
$validator = new Validator($this->app->make(TranslatorContract::class), [
130130
'id' => '',
131131
], $requiredIdRule);
132132
$this->assertFalse($validator->passes());
133133

134-
$validator = new Validator($this->app->get(TranslatorContract::class), [
134+
$validator = new Validator($this->app->make(TranslatorContract::class), [
135135
'id' => 'abc',
136136
], $idRule);
137137
$this->assertFalse($validator->passes());
138138
}
139139

140140
public function testTaggedUnionObjects()
141141
{
142-
$validator = new Validator($this->app->get(TranslatorContract::class), [
142+
$validator = new Validator($this->app->make(TranslatorContract::class), [
143143
'data' => [
144144
'type' => TaggedUnionDiscriminatorType::EMAIL->value,
145145
'email' => 'taylor@laravel.com',
146146
],
147147
], ['data' => Rule::anyOf($this->taggedUnionRules)]);
148148
$this->assertTrue($validator->passes());
149149

150-
$validator = new Validator($this->app->get(TranslatorContract::class), [
150+
$validator = new Validator($this->app->make(TranslatorContract::class), [
151151
'data' => [
152152
'type' => TaggedUnionDiscriminatorType::EMAIL->value,
153153
'email' => 'invalid-email',
154154
],
155155
], ['data' => Rule::anyOf($this->taggedUnionRules)]);
156156
$this->assertFalse($validator->passes());
157157

158-
$validator = new Validator($this->app->get(TranslatorContract::class), [
158+
$validator = new Validator($this->app->make(TranslatorContract::class), [
159159
'data' => [
160160
'type' => TaggedUnionDiscriminatorType::URL->value,
161161
'url' => 'http://laravel.com',
162162
],
163163
], ['data' => Rule::anyOf($this->taggedUnionRules)]);
164164
$this->assertTrue($validator->passes());
165165

166-
$validator = new Validator($this->app->get(TranslatorContract::class), [
166+
$validator = new Validator($this->app->make(TranslatorContract::class), [
167167
'data' => [
168168
'type' => TaggedUnionDiscriminatorType::URL->value,
169169
'url' => 'not-a-url',
170170
],
171171
], ['data' => Rule::anyOf($this->taggedUnionRules)]);
172172
$this->assertFalse($validator->passes());
173173

174-
$validator = new Validator($this->app->get(TranslatorContract::class), [
174+
$validator = new Validator($this->app->make(TranslatorContract::class), [
175175
'data' => [
176176
'type' => TaggedUnionDiscriminatorType::EMAIL->value,
177177
'url' => 'url-should-not-be-present-with-email-discriminator',
178178
],
179179
], ['data' => Rule::anyOf($this->taggedUnionRules)]);
180180
$this->assertFalse($validator->passes());
181181

182-
$validator = new Validator($this->app->get(TranslatorContract::class), [
182+
$validator = new Validator($this->app->make(TranslatorContract::class), [
183183
'data' => [
184184
'type' => 'doesnt-exist',
185185
'email' => 'taylor@laravel.com',
@@ -190,7 +190,7 @@ public function testTaggedUnionObjects()
190190

191191
public function testNestedValidation()
192192
{
193-
$validator = new Validator($this->app->get(TranslatorContract::class), [
193+
$validator = new Validator($this->app->make(TranslatorContract::class), [
194194
'user' => [
195195
'identifier' => 1,
196196
'properties' => [
@@ -203,7 +203,7 @@ public function testNestedValidation()
203203
$validator->setRules($this->dotNotationNestedRules);
204204
$this->assertTrue($validator->passes());
205205

206-
$validator = new Validator($this->app->get(TranslatorContract::class), [
206+
$validator = new Validator($this->app->make(TranslatorContract::class), [
207207
'user' => [
208208
'identifier' => 'taylor@laravel.com',
209209
'properties' => [
@@ -217,7 +217,7 @@ public function testNestedValidation()
217217
$validator->setRules($this->dotNotationNestedRules);
218218
$this->assertTrue($validator->passes());
219219

220-
$validator = new Validator($this->app->get(TranslatorContract::class), [
220+
$validator = new Validator($this->app->make(TranslatorContract::class), [
221221
'user' => [
222222
'identifier' => 'taylor@laravel.com',
223223
'properties' => [
@@ -230,7 +230,7 @@ public function testNestedValidation()
230230
$validator->setRules($this->dotNotationNestedRules);
231231
$this->assertFalse($validator->passes());
232232

233-
$validator = new Validator($this->app->get(TranslatorContract::class), [
233+
$validator = new Validator($this->app->make(TranslatorContract::class), [
234234
'user' => [
235235
'properties' => [
236236
'name' => 'Taylor',
@@ -252,23 +252,23 @@ public function testStarRuleSimple()
252252
])],
253253
];
254254

255-
$validator = new Validator($this->app->get(TranslatorContract::class), [
255+
$validator = new Validator($this->app->make(TranslatorContract::class), [
256256
'persons' => [
257257
['age' => 12],
258258
['age' => 'foobar'],
259259
],
260260
], $rule);
261261
$this->assertFalse($validator->passes());
262262

263-
$validator = new Validator($this->app->get(TranslatorContract::class), [
263+
$validator = new Validator($this->app->make(TranslatorContract::class), [
264264
'persons' => [
265265
['age' => 'foobarbazqux'],
266266
['month' => 12],
267267
],
268268
], $rule);
269269
$this->assertFalse($validator->passes());
270270

271-
$validator = new Validator($this->app->get(TranslatorContract::class), [
271+
$validator = new Validator($this->app->make(TranslatorContract::class), [
272272
'persons' => [
273273
['age' => 12],
274274
['age' => 'foobarbazqux'],
@@ -286,28 +286,28 @@ public function testStarRuleNested()
286286
])],
287287
];
288288

289-
$validator = new Validator($this->app->get(TranslatorContract::class), [
289+
$validator = new Validator($this->app->make(TranslatorContract::class), [
290290
'persons' => [
291291
['age' => ['year' => 12]],
292292
],
293293
], $rule);
294294
$this->assertFalse($validator->passes());
295295

296-
$validator = new Validator($this->app->get(TranslatorContract::class), [
296+
$validator = new Validator($this->app->make(TranslatorContract::class), [
297297
'persons' => [
298298
['birth' => ['month' => 12]],
299299
],
300300
], $rule);
301301
$this->assertFalse($validator->passes());
302302

303-
$validator = new Validator($this->app->get(TranslatorContract::class), [
303+
$validator = new Validator($this->app->make(TranslatorContract::class), [
304304
'persons' => [
305305
['birth' => ['year' => 12]],
306306
],
307307
], $rule);
308308
$this->assertTrue($validator->passes());
309309

310-
$validator = new Validator($this->app->get(TranslatorContract::class), [
310+
$validator = new Validator($this->app->make(TranslatorContract::class), [
311311
'persons' => [
312312
['birth' => 'foobarbazqux'],
313313
['birth' => [
@@ -317,7 +317,7 @@ public function testStarRuleNested()
317317
], $rule);
318318
$this->assertTrue($validator->passes());
319319

320-
$validator = new Validator($this->app->get(TranslatorContract::class), [
320+
$validator = new Validator($this->app->make(TranslatorContract::class), [
321321
'persons' => [
322322
['birth' => 'foobar'],
323323
['birth' => [

0 commit comments

Comments
 (0)