Skip to content

Commit

Permalink
Merge branch '2.13.x' into 3.0.x
Browse files Browse the repository at this point in the history
* 2.13.x:
  Update Psalm baseline (doctrine#9751)
  Omit version number in README (doctrine#9749)
  • Loading branch information
derrabus committed May 11, 2022
2 parents 3da3bec + 31a9c9c commit 499409d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

[<h1 align="center">🇺🇦 UKRAINE NEEDS YOUR HELP NOW!</h1>](https://www.doctrine-project.org/stop-war.html)

Doctrine 2 is an object-relational mapper (ORM) for PHP 7.1+ that provides transparent persistence
Doctrine ORM is an object-relational mapper for PHP 7.1+ that provides transparent persistence
for PHP objects. It sits on top of a powerful database abstraction layer (DBAL). One of its key features
is the option to write database queries in a proprietary object oriented SQL dialect called Doctrine Query Language (DQL),
inspired by Hibernate's HQL. This provides developers with a powerful alternative to SQL that maintains flexibility
Expand Down
6 changes: 0 additions & 6 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -516,9 +516,6 @@
</PropertyTypeCoercion>
</file>
<file src="lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php">
<MissingParamType occurrences="1">
<code>$className</code>
</MissingParamType>
<PossiblyFalseOperand occurrences="1">
<code>strrpos($className, '\\')</code>
</PossiblyFalseOperand>
Expand Down Expand Up @@ -768,9 +765,6 @@
</MissingConstructor>
</file>
<file src="lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php">
<MissingParamType occurrences="1">
<code>$className</code>
</MissingParamType>
<PossiblyFalseOperand occurrences="1">
<code>strrpos($className, '\\')</code>
</PossiblyFalseOperand>
Expand Down

0 comments on commit 499409d

Please sign in to comment.