Fix psalm

lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php

@@ -12,6 +12,7 @@
 
 use function array_keys;
 use function array_search;
+use function assert;
 use function count;
 use function in_array;
 use function key;
@@ -79,7 +80,9 @@ protected function hydrateRowData(array $row, array &$result)
 
         // We need to find the correct entity class name if we have inheritance in resultset
         if ($this->class->inheritanceType !== ClassMetadata::INHERITANCE_TYPE_NONE) {
-            $discrColumnName = $this->getSQLResultCasing($this->_platform, $this->class->discriminatorColumn['name']);
+            $discrColumn = $this->class->discriminatorColumn;
+            assert($discrColumn !== null);
+            $discrColumnName = $this->getSQLResultCasing($this->_platform, $discrColumn['name']);
 
             // Find mapped discriminator column from the result set.
             $metaMappingDiscrColumnName = array_search($discrColumnName, $this->resultSetMapping()->metaMappings, true);

lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php

@@ -24,9 +24,11 @@ protected function prepareInsertData($entity)
         $data = parent::prepareInsertData($entity);
 
         // Populate the discriminator column
-        $discColumn                                                          = $this->class->discriminatorColumn;
-        $this->columnTypes[$discColumn['name']]                              = $discColumn['type'];
-        $data[$this->getDiscriminatorColumnTableName()][$discColumn['name']] = $this->class->discriminatorValue;
+        $discColumn = $this->class->discriminatorColumn;
+        if ($discColumn !== null) {
+            $this->columnTypes[$discColumn['name']]                              = $discColumn['type'];
+            $data[$this->getDiscriminatorColumnTableName()][$discColumn['name']] = $this->class->discriminatorValue;
+        }
 
         return $data;
     }

lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php

@@ -12,6 +12,7 @@
 use Doctrine\ORM\Utility\PersisterHelper;
 
 use function array_combine;
+use function assert;
 use function implode;
 use function is_array;
 
@@ -411,15 +412,18 @@ protected function getSelectColumnsSQL()
             return $this->currentPersisterContext->selectColumnListSql;
         }
 
+        $discrColumn = $this->class->discriminatorColumn;
+        assert($discrColumn !== null);
+
         $columnList       = [];
-        $discrColumn      = $this->class->discriminatorColumn['name'];
-        $discrColumnType  = $this->class->discriminatorColumn['type'];
+        $discrColumnName  = $discrColumn['name'];
+        $discrColumnType  = $discrColumn['type'];
         $baseTableAlias   = $this->getSQLTableAlias($this->class->name);
-        $resultColumnName = $this->getSQLResultCasing($this->platform, $discrColumn);
+        $resultColumnName = $this->getSQLResultCasing($this->platform, $discrColumnName);
 
         $this->currentPersisterContext->rsm->addEntityResult($this->class->name, 'r');
         $this->currentPersisterContext->rsm->setDiscriminatorColumn('r', $resultColumnName);
-        $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumn, false, $discrColumnType);
+        $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumnName, false, $discrColumnType);
 
         // Add regular columns
         foreach ($this->class->fieldMappings as $fieldName => $mapping) {
@@ -457,7 +461,7 @@ protected function getSelectColumnsSQL()
             ? $baseTableAlias
             : $this->getSQLTableAlias($this->class->rootEntityName);
 
-        $columnList[] = $tableAlias . '.' . $discrColumn;
+        $columnList[] = $tableAlias . '.' . $discrColumnName;
 
         // sub tables
         foreach ($this->class->subClasses as $subClassName) {
@@ -540,7 +544,10 @@ protected function getInsertColumnList()
 
         // Add discriminator column if it is the topmost class.
         if ($this->class->name === $this->class->rootEntityName) {
-            $columns[] = $this->class->discriminatorColumn['name'];
+            $discrColumn = $this->class->discriminatorColumn;
+            assert($discrColumn !== null);
+
+            $columns[] = $discrColumn['name'];
         }
 
         return $columns;

lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php

@@ -10,6 +10,7 @@
 use Doctrine\ORM\Utility\PersisterHelper;
 
 use function array_flip;
+use function assert;
 use function implode;
 
 /**
@@ -44,16 +45,19 @@ protected function getSelectColumnsSQL()
         $rootClass  = $this->em->getClassMetadata($this->class->rootEntityName);
         $tableAlias = $this->getSQLTableAlias($rootClass->name);
 
+        $discrColumn = $this->class->discriminatorColumn;
+        assert($discrColumn !== null);
+
          // Append discriminator column
-        $discrColumn     = $this->class->discriminatorColumn['name'];
-        $discrColumnType = $this->class->discriminatorColumn['type'];
+        $discrColumnName = $discrColumn['name'];
+        $discrColumnType = $discrColumn['type'];
 
-        $columnList[] = $tableAlias . '.' . $discrColumn;
+        $columnList[] = $tableAlias . '.' . $discrColumnName;
 
-        $resultColumnName = $this->getSQLResultCasing($this->platform, $discrColumn);
+        $resultColumnName = $this->getSQLResultCasing($this->platform, $discrColumnName);
 
         $this->currentPersisterContext->rsm->setDiscriminatorColumn('r', $resultColumnName);
-        $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumn, false, $discrColumnType);
+        $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumnName, false, $discrColumnType);
 
         // Append subclass columns
         foreach ($this->class->subClasses as $subClassName) {
@@ -99,8 +103,11 @@ protected function getInsertColumnList()
     {
         $columns = parent::getInsertColumnList();
 
+        $discrColumn = $this->class->discriminatorColumn;
+        assert($discrColumn !== null);
+
         // Add discriminator column to the INSERT SQL
-        $columns[] = $this->class->discriminatorColumn['name'];
+        $columns[] = $discrColumn['name'];
 
         return $columns;
     }
@@ -158,11 +165,14 @@ protected function getSelectConditionDiscriminatorValueSQL()
             $values[] = $this->conn->quote($discrValues[$subclassName]);
         }
 
+        $discrColumn = $this->class->discriminatorColumn;
+        assert($discrColumn !== null);
+        $discColumnName = $discrColumn['name'];
+
         $values     = implode(', ', $values);
-        $discColumn = $this->class->discriminatorColumn['name'];
         $tableAlias = $this->getSQLTableAlias($this->class->name);
 
-        return $tableAlias . '.' . $discColumn . ' IN (' . $values . ')';
+        return $tableAlias . '.' . $discColumnName . ' IN (' . $values . ')';
     }
 
     /**

lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php

@@ -11,6 +11,7 @@
 use Doctrine\ORM\Utility\PersisterHelper;
 use InvalidArgumentException;
 
+use function assert;
 use function explode;
 use function in_array;
 use function sprintf;
@@ -369,7 +370,10 @@ public function addNamedNativeQueryEntityResultMapping(ClassMetadataInfo $classM
     {
         if (isset($entityMapping['discriminatorColumn']) && $entityMapping['discriminatorColumn']) {
             $discriminatorColumn = $entityMapping['discriminatorColumn'];
-            $discriminatorType   = $classMetadata->discriminatorColumn['type'];
+
+            $classMetadataDiscrColumn = $classMetadata->discriminatorColumn;
+            assert($classMetadataDiscrColumn !== null);
+            $discriminatorType = $classMetadataDiscrColumn['type'];
 
             $this->setDiscriminatorColumn($alias, $discriminatorColumn);
             $this->addMetaResult($alias, $discriminatorColumn, $discriminatorColumn, false, $discriminatorType);

lib/Doctrine/ORM/Query/SqlWalker.php

@@ -23,6 +23,7 @@
 use function array_keys;
 use function array_map;
 use function array_merge;
+use function assert;
 use function count;
 use function implode;
 use function in_array;
@@ -465,7 +466,10 @@ private function generateDiscriminatorColumnConditionSQL(array $dqlAliases): str
                 ? $this->getSQLTableAlias($class->getTableName(), $dqlAlias) . '.'
                 : '';
 
-            $sqlParts[] = $sqlTableAlias . $class->discriminatorColumn['name'] . ' IN (' . implode(', ', $values) . ')';
+            $discrColumn = $class->discriminatorColumn;
+            assert($discrColumn !== null);
+
+            $sqlParts[] = $sqlTableAlias . $discrColumn['name'] . ' IN (' . implode(', ', $values) . ')';
         }
 
         $sql = implode(' AND ', $sqlParts);
@@ -740,6 +744,7 @@ public function walkSelectClause($selectClause)
                 $rootClass   = $this->em->getClassMetadata($class->rootEntityName);
                 $tblAlias    = $this->getSQLTableAlias($rootClass->getTableName(), $dqlAlias);
                 $discrColumn = $rootClass->discriminatorColumn;
+                assert($discrColumn !== null);
                 $columnAlias = $this->getSQLColumnAlias($discrColumn['name']);
 
                 $sqlSelectExpressions[] = $tblAlias . '.' . $discrColumn['name'] . ' AS ' . $columnAlias;
@@ -2091,7 +2096,10 @@ public function walkInstanceOfExpression($instanceOfExpr)
             $sql .= $this->getSQLTableAlias($discrClass->getTableName(), $dqlAlias) . '.';
         }
 
-        $sql .= $class->discriminatorColumn['name'] . ($instanceOfExpr->not ? ' NOT IN ' : ' IN ');
+        $discrColumn = $class->discriminatorColumn;
+        assert($discrColumn !== null);
+
+        $sql .= $discrColumn['name'] . ($instanceOfExpr->not ? ' NOT IN ' : ' IN ');
         $sql .= $this->getChildDiscriminatorsFromClassMetadata($discrClass, $instanceOfExpr);
 
         return $sql;

lib/Doctrine/ORM/Tools/EntityGenerator.php

@@ -1140,7 +1140,11 @@ protected function generateDiscriminatorColumnAnnotation(ClassMetadataInfo $meta
             return '';
         }
 
-        $discrColumn      = $metadata->discriminatorColumn;
+        $discrColumn = $metadata->discriminatorColumn;
+        if ($discrColumn === null) {
+            return '';
+        }
+
         $columnDefinition = 'name="' . $discrColumn['name']
             . '", type="' . $discrColumn['type']
             . '", length=' . $discrColumn['length'];