Skip to content

Commit eb203f1

Browse files
Merge branch '7.2' into 7.3
* 7.2: [DoctrineBridge] Prevent idle connection listener from running on subrequests [Routing] Add test to validate that default value is allowed to not match requirement fix handling required options Fix @var phpdoc [Lock] [MongoDB] Enforce readPreference=primary and writeConcern=majority [FrameworkBundle] fix phpdoc in `MicroKernelTrait` Fixed validator translations for Albanian
2 parents de48766 + 66cd112 commit eb203f1

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Kernel/MicroKernelTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
182182
}
183183

184184
$file = (new \ReflectionObject($this))->getFileName();
185-
/* @var ContainerPhpFileLoader $kernelLoader */
185+
/** @var ContainerPhpFileLoader $kernelLoader */
186186
$kernelLoader = $loader->getResolver()->resolve($file);
187187
$kernelLoader->setCurrentDir(\dirname($file));
188188
$instanceof = &\Closure::bind(fn &() => $this->instanceof, $kernelLoader, $kernelLoader)();
@@ -208,7 +208,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
208208
public function loadRoutes(LoaderInterface $loader): RouteCollection
209209
{
210210
$file = (new \ReflectionObject($this))->getFileName();
211-
/* @var RoutingPhpFileLoader $kernelLoader */
211+
/** @var RoutingPhpFileLoader $kernelLoader */
212212
$kernelLoader = $loader->getResolver()->resolve($file, 'php');
213213
$kernelLoader->setCurrentDir(\dirname($file));
214214
$collection = new RouteCollection();

Tests/Controller/AbstractControllerTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public function testFile()
236236
$controller = $this->createController();
237237
$controller->setContainer($container);
238238

239-
/* @var BinaryFileResponse $response */
239+
/** @var BinaryFileResponse $response */
240240
$response = $controller->file(new File(__FILE__));
241241
$this->assertInstanceOf(BinaryFileResponse::class, $response);
242242
$this->assertSame(200, $response->getStatusCode());
@@ -251,7 +251,7 @@ public function testFileAsInline()
251251
{
252252
$controller = $this->createController();
253253

254-
/* @var BinaryFileResponse $response */
254+
/** @var BinaryFileResponse $response */
255255
$response = $controller->file(new File(__FILE__), null, ResponseHeaderBag::DISPOSITION_INLINE);
256256

257257
$this->assertInstanceOf(BinaryFileResponse::class, $response);
@@ -267,7 +267,7 @@ public function testFileWithOwnFileName()
267267
{
268268
$controller = $this->createController();
269269

270-
/* @var BinaryFileResponse $response */
270+
/** @var BinaryFileResponse $response */
271271
$fileName = 'test.php';
272272
$response = $controller->file(new File(__FILE__), $fileName);
273273

@@ -284,7 +284,7 @@ public function testFileWithOwnFileNameAsInline()
284284
{
285285
$controller = $this->createController();
286286

287-
/* @var BinaryFileResponse $response */
287+
/** @var BinaryFileResponse $response */
288288
$fileName = 'test.php';
289289
$response = $controller->file(new File(__FILE__), $fileName, ResponseHeaderBag::DISPOSITION_INLINE);
290290

@@ -301,7 +301,7 @@ public function testFileFromPath()
301301
{
302302
$controller = $this->createController();
303303

304-
/* @var BinaryFileResponse $response */
304+
/** @var BinaryFileResponse $response */
305305
$response = $controller->file(__FILE__);
306306

307307
$this->assertInstanceOf(BinaryFileResponse::class, $response);
@@ -317,7 +317,7 @@ public function testFileFromPathWithCustomizedFileName()
317317
{
318318
$controller = $this->createController();
319319

320-
/* @var BinaryFileResponse $response */
320+
/** @var BinaryFileResponse $response */
321321
$response = $controller->file(__FILE__, 'test.php');
322322

323323
$this->assertInstanceOf(BinaryFileResponse::class, $response);

0 commit comments

Comments
 (0)