Skip to content

Commit c69a22e

Browse files
committed
tests: fixes
1 parent a748615 commit c69a22e

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

tests/DI/Compiler.generatedFactory.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ interface Bad2
236236
Assert::exception(function () {
237237
$builder = new DI\ContainerBuilder;
238238
$builder->addDefinition('one')->setImplement('Bad2')->setFactory('Bad1');
239-
$builder->generateClasses();
239+
$builder->complete();
240240
}, Nette\InvalidStateException::class, 'Type hint for $bar in Bad2::create() doesn\'t match type hint in Bad1 constructor.');
241241

242242

@@ -256,7 +256,7 @@ interface Bad4
256256
Assert::exception(function () {
257257
$builder = new DI\ContainerBuilder;
258258
$builder->addDefinition('one')->setImplement('Bad4')->setFactory('Bad3');
259-
$builder->generateClasses();
259+
$builder->complete();
260260
}, Nette\InvalidStateException::class, 'Unused parameter $baz when implementing method Bad4::create(), did you mean $bar?');
261261

262262

@@ -276,5 +276,5 @@ interface Bad6
276276
Assert::exception(function () {
277277
$builder = new DI\ContainerBuilder;
278278
$builder->addDefinition('one')->setImplement('Bad6')->setFactory('Bad5');
279-
$builder->generateClasses();
279+
$builder->complete();
280280
}, Nette\InvalidStateException::class, 'Unused parameter $baz when implementing method Bad6::create().');

tests/DI/ContainerBuilder.error.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $builder->addDefinition('one')
1717
->addSetup('::1234');
1818

1919
Assert::exception(function () use ($builder) {
20-
$builder->generateClasses();
20+
$builder->complete();
2121
}, Nette\InvalidStateException::class, "Service 'one': Expected function, method or property name, '1234' given.");
2222

2323

@@ -27,7 +27,7 @@ $builder->addDefinition('one')
2727
->setClass('stdclass');
2828

2929
Assert::exception(function () use ($builder) {
30-
$builder->generateClasses();
30+
$builder->complete();
3131
}, Nette\InvalidStateException::class, "Case mismatch on class name 'stdclass', correct name is 'stdClass'.");
3232

3333

@@ -50,5 +50,5 @@ $builder->addDefinition('one')
5050
->addSetup('$prop[]');
5151

5252
Assert::exception(function () use ($builder) {
53-
$builder->generateClasses();
53+
$builder->complete();
5454
}, Nette\InvalidStateException::class, "Service 'one': Missing argument for \$prop[].");

tests/DI/ContainerBuilder.factory.error.phpt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,36 @@ require __DIR__ . '/../bootstrap.php';
1515
Assert::exception(function () {
1616
$builder = new DI\ContainerBuilder;
1717
$builder->addDefinition('one')->setClass('X')->setFactory('Unknown');
18-
$builder->generateClasses();
18+
$builder->complete();
1919
}, Nette\InvalidStateException::class, "Class Unknown used in service 'one' not found.");
2020

2121

2222
Assert::exception(function () {
2323
$builder = new DI\ContainerBuilder;
2424
$builder->addDefinition('one')->setFactory('@two');
2525
$builder->addDefinition('two')->setFactory('Unknown');
26-
$builder->generateClasses();
26+
$builder->complete();
2727
}, Nette\InvalidStateException::class, "Class Unknown used in service 'two' not found.");
2828

2929

3030
Assert::exception(function () {
3131
$builder = new DI\ContainerBuilder;
3232
$builder->addDefinition('one')->setFactory('stdClass::foo');
33-
$builder->generateClasses();
33+
$builder->complete();
3434
}, Nette\InvalidStateException::class, "Factory 'stdClass::foo' used in service 'one' is not callable.");
3535

3636

3737
Assert::exception(function () {
3838
$builder = new DI\ContainerBuilder;
3939
$builder->addDefinition('one')->setFactory('Nette\DI\Container::foo'); // has __magic
40-
$builder->generateClasses();
40+
$builder->complete();
4141
}, Nette\InvalidStateException::class, "Factory 'Nette\\DI\\Container::foo' used in service 'one' is not callable.");
4242

4343

4444
Assert::exception(function () {
4545
$builder = new DI\ContainerBuilder;
4646
$builder->addDefinition('one')->setImplement('Unknown')->setClass('stdClass');
47-
$builder->generateClasses();
47+
$builder->complete();
4848
}, Nette\InvalidStateException::class, "Interface Unknown used in service 'one' not found.");
4949

5050

@@ -56,7 +56,7 @@ interface Bad1
5656
Assert::exception(function () {
5757
$builder = new DI\ContainerBuilder;
5858
$builder->addDefinition('one')->setImplement('Bad1')->setFactory('stdClass');
59-
$builder->generateClasses();
59+
$builder->complete();
6060
}, Nette\InvalidStateException::class, "Interface Bad1 used in service 'one' must have just one non-static method create() or get().");
6161

6262

@@ -68,7 +68,7 @@ interface Bad2
6868
Assert::exception(function () {
6969
$builder = new DI\ContainerBuilder;
7070
$builder->addDefinition('one')->setImplement('Bad2')->setFactory('stdClass');
71-
$builder->generateClasses();
71+
$builder->complete();
7272
}, Nette\InvalidStateException::class, "Interface Bad2 used in service 'one' must have just one non-static method create() or get().");
7373

7474

@@ -81,7 +81,7 @@ interface Bad3
8181
Assert::exception(function () {
8282
$builder = new DI\ContainerBuilder;
8383
$builder->addDefinition('one')->setImplement('Bad3')->setFactory('stdClass');
84-
$builder->generateClasses();
84+
$builder->complete();
8585
}, Nette\InvalidStateException::class, "Interface Bad3 used in service 'one' must have just one non-static method create() or get().");
8686

8787

@@ -93,7 +93,7 @@ interface Bad4
9393
Assert::exception(function () {
9494
$builder = new DI\ContainerBuilder;
9595
$builder->addDefinition('one')->setImplement('Bad4');
96-
$builder->generateClasses();
96+
$builder->complete();
9797
}, Nette\InvalidStateException::class, "Method Bad4::create() used in service 'one' has no @return annotation.");
9898

9999

@@ -105,7 +105,7 @@ interface Bad5
105105
Assert::exception(function () {
106106
$builder = new DI\ContainerBuilder;
107107
$builder->addDefinition('one')->setImplement('Bad5')->setFactory('stdClass');
108-
$builder->generateClasses();
108+
$builder->complete();
109109
}, Nette\InvalidStateException::class, "Method Bad5::get() used in service 'one' must have no arguments.");
110110

111111

@@ -118,7 +118,7 @@ class Bad6
118118
Assert::exception(function () {
119119
$builder = new DI\ContainerBuilder;
120120
$builder->addDefinition('one')->setFactory('Bad6::create');
121-
$builder->generateClasses();
121+
$builder->complete();
122122
}, Nette\InvalidStateException::class, "Factory 'Bad6::create' used in service 'one' is not callable.");
123123

124124

@@ -131,7 +131,7 @@ class Bad7
131131
Assert::error(function () {
132132
$builder = new DI\ContainerBuilder;
133133
$builder->addDefinition('one')->setFactory('Bad7::create');
134-
$builder->generateClasses();
134+
$builder->complete();
135135
}, E_USER_NOTICE, "Type of service 'one' is unknown.");
136136

137137

@@ -144,7 +144,7 @@ class Bad8
144144
Assert::exception(function () {
145145
$builder = new DI\ContainerBuilder;
146146
$builder->addDefinition('one')->setClass('Bad8');
147-
$builder->generateClasses();
147+
$builder->complete();
148148
}, Nette\InvalidStateException::class, "Service 'one': Class Bad8 has private constructor.");
149149

150150

@@ -157,13 +157,13 @@ class Good
157157
Assert::exception(function () {
158158
$builder = new DI\ContainerBuilder;
159159
$builder->addDefinition('one')->setFactory('Good', [new Statement('Bad')]);
160-
$builder->generateClasses();
160+
$builder->complete();
161161
}, Nette\InvalidStateException::class, "Service 'one': Class Bad not found.");
162162

163163
Assert::exception(function () {
164164
$builder = new DI\ContainerBuilder;
165165
$builder->addDefinition('one')->setFactory('Good', [new Statement('Bad8')]);
166-
$builder->generateClasses();
166+
$builder->complete();
167167
}, Nette\InvalidStateException::class, "Service 'one': Class Bad8 has private constructor.");
168168

169169

@@ -176,5 +176,5 @@ abstract class Bad9
176176
Assert::exception(function () {
177177
$builder = new DI\ContainerBuilder;
178178
$builder->addDefinition('one')->setClass('Bad9');
179-
$builder->generateClasses();
179+
$builder->complete();
180180
}, Nette\InvalidStateException::class, "Service 'one': Class Bad9 is abstract.");

tests/DI/ContainerBuilder.factory.error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ trait Bad1
1919
Assert::exception(function () {
2020
$builder = new DI\ContainerBuilder;
2121
$builder->addDefinition('one')->setFactory('Bad1::method');
22-
$builder->generateClasses();
22+
$builder->complete();
2323
}, Nette\InvalidStateException::class, "Factory 'Bad1::method' used in service 'one' is not callable.");

0 commit comments

Comments
 (0)