Skip to content

Commit 54bf576

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: [Security] Add badge resolution to profiler [AssetMapper] Allow specifying packages to update with importmap:update [AssetMapper] Make importmap:install command download the same version Remove unneeded variable [PropertyInfo] Remove checking if AttributeMetadataInterface setIgnore method exist [VarDumper][FrameworkBundle] Remove checking if OutputFormatterStyle setHref method exist [HttpKernel][DebugBundle] Always call CliDumper setDisplayOptions method [DoctrineBridge][Messenger] Always use executeStatement [DoctrineBridge] Remove LazyGhost feature detection [Messenger] Fix PHPDoc template for `TransportFactoryInterface`
2 parents a23cfa0 + 2fa7efb commit 54bf576

File tree

5 files changed

+4
-14
lines changed

5 files changed

+4
-14
lines changed

Security/RememberMe/DoctrineTokenProvider.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public function updateToken(string $series, #[\SensitiveParameter] string $token
8080
'series' => ParameterType::STRING,
8181
];
8282
$updated = $this->conn->executeStatement($sql, $paramValues, $paramTypes);
83-
8483
if ($updated < 1) {
8584
throw new TokenNotFoundException('No token found.');
8685
}

Tests/DoctrineTestHelper.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ public static function createTestConfiguration(): Configuration
5959
$config->setProxyNamespace('SymfonyTests\Doctrine');
6060
$config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
6161
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
62-
63-
if (method_exists($config, 'setLazyGhostObjectEnabled')) {
64-
$config->setLazyGhostObjectEnabled(true);
65-
}
62+
$config->setLazyGhostObjectEnabled(true);
6663

6764
return $config;
6865
}

Tests/Middleware/Debug/MiddlewareTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ private function init(bool $withStopwatch = true): void
5252

5353
$config = ORMSetup::createConfiguration(true);
5454
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
55-
if (method_exists($config, 'setLazyGhostObjectEnabled')) {
56-
$config->setLazyGhostObjectEnabled(true);
57-
}
55+
$config->setLazyGhostObjectEnabled(true);
5856
$this->debugDataHolder = new DebugDataHolder();
5957
$config->setMiddlewares([new Middleware($this->debugDataHolder, $this->stopwatch)]);
6058

Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ private function createExtractor(): DoctrineExtractor
3939
$config = ORMSetup::createConfiguration(true);
4040
$config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
4141
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
42-
if (method_exists($config, 'setLazyGhostObjectEnabled')) {
43-
$config->setLazyGhostObjectEnabled(true);
44-
}
42+
$config->setLazyGhostObjectEnabled(true);
4543

4644
$eventManager = new EventManager();
4745
$entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config, $eventManager), $config, $eventManager);

Tests/Security/RememberMe/DoctrineTokenProviderTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,7 @@ private function bootstrapProvider(): DoctrineTokenProvider
122122
$config = ORMSetup::createConfiguration(true);
123123
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
124124

125-
if (method_exists($config, 'setLazyGhostObjectEnabled')) {
126-
$config->setLazyGhostObjectEnabled(true);
127-
}
125+
$config->setLazyGhostObjectEnabled(true);
128126

129127
$connection = DriverManager::getConnection([
130128
'driver' => 'pdo_sqlite',

0 commit comments

Comments
 (0)