Skip to content

Commit 16247b6

Browse files
Merge branch '4.4' into 5.4
* 4.4: CS fixes Bump Symfony version to 4.4.44 Update VERSION for 4.4.43 Update CONTRIBUTORS for 4.4.43 Update CHANGELOG for 4.4.43
2 parents bb76331 + 81a439b commit 16247b6

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ protected function loadCacheDriver(string $cacheName, string $objectManagerName,
362362
$container->setDefinition($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManagerName)), $memcachedInstance);
363363
$cacheDef->addMethodCall('setMemcached', [new Reference($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManagerName)))]);
364364
break;
365-
case 'redis':
365+
case 'redis':
366366
$redisClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.redis.class').'%';
367367
$redisInstanceClass = !empty($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%'.$this->getObjectManagerElementName('cache.redis_instance.class').'%';
368368
$redisHost = !empty($cacheDriver['host']) ? $cacheDriver['host'] : '%'.$this->getObjectManagerElementName('cache.redis_host').'%';

PropertyInfo/DoctrineExtractor.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,16 @@ public function getTypes(string $class, string $property, array $context = [])
9797
$fieldName = $associationMapping['indexBy'];
9898
if (null === ($typeOfField = $subMetadata->getTypeOfField($fieldName))) {
9999
$fieldName = $subMetadata->getFieldForColumn($associationMapping['indexBy']);
100-
//Not a property, maybe a column name?
100+
// Not a property, maybe a column name?
101101
if (null === ($typeOfField = $subMetadata->getTypeOfField($fieldName))) {
102-
//Maybe the column name is the association join column?
102+
// Maybe the column name is the association join column?
103103
$associationMapping = $subMetadata->getAssociationMapping($fieldName);
104104

105105
/** @var ClassMetadataInfo $subMetadata */
106106
$indexProperty = $subMetadata->getSingleAssociationReferencedJoinColumnName($fieldName);
107107
$subMetadata = $this->entityManager->getClassMetadata($associationMapping['targetEntity']);
108108

109-
//Not a property, maybe a column name?
109+
// Not a property, maybe a column name?
110110
if (null === ($typeOfField = $subMetadata->getTypeOfField($indexProperty))) {
111111
$fieldName = $subMetadata->getFieldForColumn($indexProperty);
112112
$typeOfField = $subMetadata->getTypeOfField($fieldName);

Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ public function testExtractEnum()
138138
}
139139
$this->assertEquals([new Type(Type::BUILTIN_TYPE_OBJECT, false, EnumString::class)], $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumString', []));
140140
$this->assertEquals([new Type(Type::BUILTIN_TYPE_OBJECT, false, EnumInt::class)], $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumInt', []));
141-
$this->assertEquals(null, $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumStringArray', []));
141+
$this->assertNull($this->createExtractor()->getTypes(DoctrineEnum::class, 'enumStringArray', []));
142142
$this->assertEquals([new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, EnumInt::class))], $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumIntArray', []));
143-
$this->assertEquals(null, $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumCustom', []));
143+
$this->assertNull($this->createExtractor()->getTypes(DoctrineEnum::class, 'enumCustom', []));
144144
}
145145

146146
public function typesProvider()

0 commit comments

Comments
 (0)