Skip to content

Commit b74ef39

Browse files
Merge branch '4.4' into 5.3
* 4.4: [Cache] Fix saving items with no expiration through ProxyAdapter CS fixes [Cache] disable lock on CLI [VarDumper] add more "transient-on-macos" groups
2 parents 06fbb1f + 5fa7d1d commit b74ef39

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Messenger/DoctrinePingConnectionMiddleware.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private function pingConnection(EntityManagerInterface $entityManager)
4040

4141
try {
4242
$connection->executeQuery($connection->getDatabasePlatform()->getDummySelectSQL());
43-
} catch (DBALException | Exception $e) {
43+
} catch (DBALException|Exception $e) {
4444
$connection->close();
4545
$connection->connect();
4646
}

PropertyInfo/DoctrineExtractor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ private function getMetadata(string $class): ?ClassMetadata
208208
{
209209
try {
210210
return $this->entityManager ? $this->entityManager->getClassMetadata($class) : $this->classMetadataFactory->getMetadataFor($class);
211-
} catch (MappingException | OrmMappingException $exception) {
211+
} catch (MappingException|OrmMappingException $exception) {
212212
return null;
213213
}
214214
}

Validator/DoctrineLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
4949
$className = $metadata->getClassName();
5050
try {
5151
$doctrineMetadata = $this->entityManager->getClassMetadata($className);
52-
} catch (MappingException | OrmMappingException $exception) {
52+
} catch (MappingException|OrmMappingException $exception) {
5353
return false;
5454
}
5555

0 commit comments

Comments
 (0)