Fix discriminatorColumn phpdoc

[VincentLanglet]

Hi @greg0ire, since the property is not initialized, the phpdoc should allow null.
This avoid a phpstan error if we're doing an isset check on the property.

The other solution is to initialize the value to [] but tests are failing

[VincentLanglet]

Psalm is failing because null check are not done in the ORM code.
Is the value always set ?

[greg0ire]

Hi Vincent!

Is the value always set ?

Maybe not always, but as soon as there is inheritance, it probably is:

orm/lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php

Lines 200 to 213 in 6f194ee

	if (isset($classAttributes[Mapping\DiscriminatorColumn::class])) {
	$discrColumnAttribute = $classAttributes[Mapping\DiscriminatorColumn::class];
	$metadata->setDiscriminatorColumn(
	[
	'name' => $discrColumnAttribute->name,
	'type' => $discrColumnAttribute->type ?: 'string',
	'length' => $discrColumnAttribute->length ?: 255,
	'columnDefinition' => $discrColumnAttribute->columnDefinition,
	]
	);
	} else {
	$metadata->setDiscriminatorColumn(['name' => 'dtype', 'type' => 'string', 'length' => 255]);
	}

[VincentLanglet]

I added some assert checks to fix the psalm build.
The others failing tests are not related, since it's already failing on the 2.10.x branch.

[greg0ire]

Looks like the failure is due to doctrine/dbal@317c05620 . We are asserting against the generated SQL 😬

[greg0ire]

Blocked by #9181

[VincentLanglet]

Thanks, tests are fine now @greg0ire if you find some time to review :)

[greg0ire]

All these assert calls look a bit clumsy, repetitive, and are a code smell…
How about introducing a final public function discriminatorColumn() in ClassMetadataInfo that performs the assertion, or better, throws a LogicException saying that this class probably does not have inheritance mapping?