Skip to content

Commit

Permalink
Merge pull request #11519 from greg0ire/remove-db-driver
Browse files Browse the repository at this point in the history
Remove DatabaseDriver
  • Loading branch information
greg0ire authored Jun 22, 2024
2 parents 42a36e1 + 2c489fb commit 9b09cd0
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 892 deletions.
4 changes: 4 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Upgrade to 4.0

## Remove `DatabaseDriver`

The class `Doctrine\ORM\Mapping\Driver\DatabaseDriver` is removed.

## Remove the `NotSupported` exception

The class `Doctrine\ORM\Exception\NotSupported` has been removed without replacement.
Expand Down
17 changes: 0 additions & 17 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -449,23 +449,6 @@
<code><![CDATA[new ReflectionClass($metadata->name)]]></code>
</TypeDoesNotContainNull>
</file>
<file src="src/Mapping/Driver/DatabaseDriver.php">
<DocblockTypeContradiction>
<code><![CDATA[$metadata instanceof ClassMetadata]]></code>
</DocblockTypeContradiction>
<MoreSpecificImplementedParamType>
<code><![CDATA[$metadata]]></code>
</MoreSpecificImplementedParamType>
<PossiblyNullArrayAccess>
<code><![CDATA[$this->tables[$tableName]]]></code>
<code><![CDATA[$this->tables[$tableName]]]></code>
</PossiblyNullArrayAccess>
<PossiblyNullReference>
<code><![CDATA[getColumns]]></code>
<code><![CDATA[getColumns]]></code>
<code><![CDATA[getIndexes]]></code>
</PossiblyNullReference>
</file>
<file src="src/Mapping/Driver/SimplifiedXmlDriver.php">
<MissingParamType>
<code><![CDATA[$fileExtension]]></code>
Expand Down
12 changes: 0 additions & 12 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,6 @@
<file name="src/Mapping/ClassMetadataFactory.php"/>
</errorLevel>
</InvalidArrayAssignment>
<LessSpecificReturnStatement>
<errorLevel type="suppress">
<!-- In DBAL 4, column precision is nullable. See https://github.com/doctrine/dbal/pull/3511 -->
<file name="src/Mapping/Driver/DatabaseDriver.php"/>
</errorLevel>
</LessSpecificReturnStatement>
<MoreSpecificReturnType>
<errorLevel type="suppress">
<!-- In DBAL 4, the default column value is mixed. See https://github.com/doctrine/dbal/pull/3511 -->
<file name="src/Mapping/Driver/DatabaseDriver.php"/>
</errorLevel>
</MoreSpecificReturnType>
<InvalidReturnType>
<errorLevel type="suppress">
<!-- https://github.com/vimeo/psalm/issues/8819 -->
Expand Down
Loading

0 comments on commit 9b09cd0

Please sign in to comment.