8000 Merge branch 'symfony:6.4' into profiler-improvments · symfony/symfony@66c38df · GitHub
[go: up one dir, main page]
Skip to content
Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 66c38df

Browse files
smnandresmnandre
authored
Merge branch 'symfony:6.4' into profiler-improvments
2 parents f427bfe + ca1eb17 commit 66c38df

File tree

4 files changed

+31
-27
lines changed

4 files changed

+31
-27
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/LegacyManagerRegistryTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ class LegacyManagerRegistryTest extends TestCase
2828
{
2929
public static function setUpBeforeClass(): void
3030
{
31-
$test = new PhpDumperTest();
32-
$test->testDumpContainerWithProxyServiceWillShareProxies();
31+
if (!class_exists(\LazyServiceProjectServiceContainer::class, false)) {
32+
eval('?>'.PhpDumperTest::dumpLazyServiceProjectServiceContainer());
33+
}
3334
}
3435

3536
public function testResetService()

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"symfony/messenger": "^5.4|^6.0|^7.0",
3737
"symfony/property-access": "^5.4|^6.0|^7.0",
3838
"symfony/property-info": "^5.4|^6.0|^7.0",
39-
"symfony/proxy-manager-bridge": "^5.4|^6.0|^7.0",
39+
"symfony/proxy-manager-bridge": "^6.4",
4040
"symfony/security-core": "^6.4|^7.0",
4141
"symfony/stopwatch": "^5.4|^6.0|^7.0",
4242
"symfony/translation": "^5.4|^6.0|^7.0",

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testDumpContainerWithProxyService()
4242
public function testDumpContainerWithProxyServiceWillShareProxies()
4343
{
4444
if (!class_exists(\LazyServiceProjectServiceContainer::class, false)) {
45-
eval('?>'.$this->dumpLazyServiceProjectServiceContainer());
45+
eval('?>'.self::dumpLazyServiceProjectServiceContainer());
4646
}
4747

4848
$container = new \LazyServiceProjectServiceContainer();
@@ -60,7 +60,7 @@ public function testDumpContainerWithProxyServiceWillShareProxies()
6060
$this->assertSame($proxy, $container->get('foo'));
6161
}
6262

63-
private function dumpLazyServiceProjectServiceContainer()
63+
public static function dumpLazyServiceProjectServiceContainer(): string
6464
{
6565
$container = new ContainerBuilder();
6666

‎src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ public function testGetArguments()
5050
{
5151
$request = Request::create('/');
5252
$request->attributes->set('foo', 'foo');
53-
$controller = [new self(), 'controllerWithFoo'];
53+
$controller = [new ArgumentResolverTestController(), 'controllerWithFoo'];
5454

5555
$this->assertEquals(['foo'], self::getResolver()->getArguments($request, $controller), '->getArguments() returns an array of arguments for the controller method');
5656
}
5757

5858
public function testGetArgumentsReturnsEmptyArrayWhenNoArguments()
5959
{
6060
$request = Request::create('/');
61-
$controller = [new self(), 'controllerWithoutArguments'];
61+
$controller = [new ArgumentResolverTestController(), 'controllerWithoutArguments'];
6262

6363
$this->assertEquals([], self::getResolver()->getArguments($request, $controller), '->getArguments() returns an empty array if the method takes no arguments');
6464
}
@@ -67,7 +67,7 @@ public function testGetArgumentsUsesDefaultValue()
6767
{
6868
$request = Request::create('/');
6969
$request->attributes->set('foo', 'foo');
70-
$controller = [new self(), 'controllerWithFooAndDefaultBar'];
70+
$controller = [new ArgumentResolverTestController(), 'controllerWithFooAndDefaultBar'];
7171

7272
$this->assertEquals(['foo', null], self::getResolver()->getArguments($request, $controller), '->getArguments() uses default values if present');
7373
}
@@ -77,7 +77,7 @@ public function testGetArgumentsOverrideDefaultValueByRequestAttribute()
7777
$request = Request::create('/');
7878
$request->attributes->set('foo', 'foo');
7979
$request->attributes->set('bar', 'bar');
80-
$controller = [new self(), 'controllerWithFooAndDefaultBar'];
80+
$controller = [new ArgumentResolverTestController(), 'controllerWithFooAndDefaultBar'];
8181

8282
$this->assertEquals(['foo', 'bar'], self::getResolver()->getArguments($request, $controller), '->getArguments() overrides default values if provided in the request attributes');
8383
}
@@ -104,7 +104,7 @@ public function testGetArgumentsFromInvokableObject()
104104
{
105105
$request = Request::create('/');
106106
$request->attributes->set('foo', 'foo');
107-
$controller = new self();
107+
$controller = new ArgumentResolverTestController();
108108

109109
$this->assertEquals(['foo', null], self::getResolver()->getArguments($request, $controller));
110110

@@ -129,7 +129,7 @@ public function testGetArgumentsFailsOnUnresolvedValue()
129129
$request = Request::create('/');
130130
$request->attributes->set('foo', 'foo');
131131
$request->attributes->set('foobar', 'foobar');
132-
$controller = [new self(), 'controllerWithFooBarFoobar'];
132+
$controller = [new ArgumentResolverTestController(), 'controllerWithFooBarFoobar'];
133133

134134
try {
135135
self::getResolver()->getArguments($request, $controller);
@@ -142,15 +142,15 @@ public function testGetArgumentsFailsOnUnresolvedValue()
142142
public function testGetArgumentsInjectsRequest()
143143
{
144144
$request = Request::create('/');
145-
$controller = [new self(), 'controllerWithRequest'];
145+
$controller = [new ArgumentResolverTestController(), 'controllerWithRequest'];
146146

147147
$this->assertEquals([$request], self::getResolver()->getArguments($request, $controller), '->getArguments() injects the request');
148148
}
149149

150150
public function testGetArgumentsInjectsExtendingRequest()
151151
{
152152
$request = ExtendingRequest::create('/');
153-
$controller = [new self(), 'controllerWithExtendingRequest'];
153+
$controller = [new ArgumentResolverTestController(), 'controllerWithExtendingRequest'];
154154

155155
$this->assertEquals([$request], self::getResolver()->getArguments($request, $controller), '->getArguments() injects the request when extended');
156156
}
@@ -191,15 +191,15 @@ public function testGetArgumentWithoutArray()
191191
$request = Request::create('/');
192192
$request->attributes->set('foo', 'foo');
193193
$request->attributes->set('bar', 'foo');
194-
$controller = $this->controllerWithFooAndDefaultBar(...);
194+
$controller = (new ArgumentResolverTestController())->controllerWithFooAndDefaultBar(...);
195195
$resolver->getArguments($request, $controller);
196196
}
197197

198198
public function testIfExceptionIsThrownWhenMissingAnArgument()
199199
{
200200
$this->expectException(\RuntimeException::class);
201201
$request = Request::create('/');
202-
$controller = $this->controllerWithFoo(...);
202+
$controller = (new ArgumentResolverTestController())->controllerWithFoo(...);
203203

204204
self::getResolver()->getArguments($request, $controller);
205205
}
@@ -229,7 +229,7 @@ public function testGetSessionArguments()
229229
$session = new Session(new MockArraySessionStorage());
230230
$request = Request::create('/');
231231
$request->setSession($session);
232-
$controller = $this->controllerWithSession(...);
232+
$controller = (new ArgumentResolverTestController())->controllerWithSession(...);
233233

234234
$this->assertEquals([$session], self::getResolver()->getArguments($request, $controller));
235235
}
@@ -239,7 +239,7 @@ public function testGetSessionArgumentsWithExtendedSession()
239239
$session = new ExtendingSession(new MockArraySessionStorage());
240240
$request = Request::create('/');
241241
$request->setSession($session);
242-
$controller = $this->controllerWithExtendingSession(...);
242+
$controller = (new ArgumentResolverTestController())->controllerWithExtendingSession(...);
243243

244244
$this->assertEquals([$session], self::getResolver()->getArguments($request, $controller));
245245
}
@@ -249,7 +249,7 @@ public function testGetSessionArgumentsWithInterface()
249249
$session = $this->createMock(SessionInterface::class);
250250
$request = Request::create('/');
251251
$request->setSession($session);
252-
$controller = $this->controllerWithSessionInterface(...);
252+
$controller = (new ArgumentResolverTestController())->controllerWithSessionInterface(...);
253253

254254
$this->assertEquals([$session], self::getResolver()->getArguments($request, $controller));
255255
}
@@ -260,7 +260,7 @@ public function testGetSessionMissMatchWithInterface()
260260
$session = $this->createMock(SessionInterface::class);
261261
$request = Request::create('/');
262262
$request->setSession($session);
263-
$controller = $this->controllerWithExtendingSession(...);
263+
$controller = (new ArgumentResolverTestController())->controllerWithExtendingSession(...);
264264

265265
self::getResolver()->getArguments($request, $controller);
266266
}
@@ -271,7 +271,7 @@ public function testGetSessionMissMatchWithImplementation()
271271
$session = new Session(new MockArraySessionStorage());
272272
$request = Request::create('/');
273273
$request->setSession($session);
274-
$controller = $this->controllerWithExtendingSession(...);
274+
$controller = (new ArgumentResolverTestController())->controllerWithExtendingSession(...);
275275

276276
self::getResolver()->getArguments($request, $controller);
277277
}
@@ -280,7 +280,7 @@ public function testGetSessionMissMatchOnNull()
280280
{
281281
$this->expectException(\RuntimeException::class);
282282
$request = Request::create('/');
283-
1241 $controller = $this->controllerWithExtendingSession(...);
283+
$controller = (new ArgumentResolverTestController())->controllerWithExtendingSession(...);
284284

285285
self::getResolver()->getArguments($request, $controller);
286286
}
@@ -291,7 +291,7 @@ public function testTargetedResolver()
291291

292292
$request = Request::create('/');
293293
$request->attributes->set('foo', 'bar');
294-
$controller = $this->controllerTargetingResolver(...);
294+
$controller = (new ArgumentResolverTestController())->controllerTargetingResolver(...);
295295

296296
$this->assertSame([1], $resolver->getArguments($request, $controller));
297297
}
@@ -301,7 +301,7 @@ public function testTargetedResolverWithDefaultValue()
301301
$resolver = self::getResolver([], [RequestAttributeValueResolver::class => new RequestAttributeValueResolver()]);
302302

303303
$request = Request::create('/');
304-
$controller = $this->controllerTargetingResolverWithDefaultValue(...);
304+
$controller = (new ArgumentResolverTestController())->controllerTargetingResolverWithDefaultValue(...);
305305

306306
$this->assertSame([2], $resolver->getArguments($request, $controller));
307307
}
@@ -311,7 +311,7 @@ public function testTargetedResolverWithNullableValue()
311311
$resolver = self::getResolver([], [RequestAttributeValueResolver::class => new RequestAttributeValueResolver()]);
312312

313313
$request = Request::create('/');
314-
$controller = $this->controllerTargetingResolverWithNullableValue(...);
314+
$controller = (new ArgumentResolverTestController())->controllerTargetingResolverWithNullableValue(...);
315315

316316
$this->assertSame([null], $resolver->getArguments($request, $controller));
317317
}
@@ -322,7 +322,7 @@ public function testDisabledResolver()
322322

323323
$request = Request::create('/');
324324
$request->attributes->set('foo', 'bar');
325-
$controller = $this->controllerDisablingResolver(...);
325+
$controller = (new ArgumentResolverTestController())->controllerDisablingResolver(...);
326326

327327
$this->assertSame([1], $resolver->getArguments($request, $controller));
328328
}
@@ -332,7 +332,7 @@ public function testManyTargetedResolvers()
332332
$resolver = self::getResolver(namedResolvers: []);
333333

334334
$request = Request::create('/');
335-
$controller = $this->controllerTargetingManyResolvers(...);
335+
$controller = (new ArgumentResolverTestController())->controllerTargetingManyResolvers(...);
336336

337337
$this->expectException(\LogicException::class);
338338
$resolver->getArguments($request, $controller);
@@ -343,12 +343,15 @@ public function testUnknownTargetedResolver()
343343
$resolver = self::getResolver(namedResolvers: []);
344344

345345
$request = Request::create('/');
346-
$controller = $this->controllerTargetingUnknownResolver(...);
346+
$controller = (new ArgumentResolverTestController())->controllerTargetingUnknownResolver(...);
347347

348348
$this->expectException(ResolverNotFoundException::class);
349349
$resolver->getArguments($request, $controller);
350350
}
351+
}
351352

353+
class ArgumentResolverTestController
354+
{
352355
public function __invoke($foo, $bar = null)
353356
{
354357
}

0 commit comments

Comments
 (0)
0