Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve phpdoc for Configuration #9826

Merged
merged 2 commits into from
Jun 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/Doctrine/ORM/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public function getAutoGenerateProxyClasses()
* Sets the strategy for automatically generating proxy classes.
*
* @param bool|int $autoGenerate Possible values are constants of Doctrine\Common\Proxy\AbstractProxyFactory.
* @psalm-param bool|AutogenerateMode $autoGenerate
* True is converted to AUTOGENERATE_ALWAYS, false to AUTOGENERATE_NEVER.
*
* @return void
Expand Down Expand Up @@ -646,8 +647,9 @@ public function setCustomStringFunctions(array $functions)
*
* DQL function names are case-insensitive.
*
* @param string $name Function name.
* @param string|callable $className Class name or a callable that returns the function.
* @param string $name Function name.
* @param class-string|callable $className Class name or a callable that returns the function.
* @psalm-param class-string<FunctionNode>|callable(string):FunctionNode $className
*
* @return void
*/
Expand Down Expand Up @@ -700,7 +702,7 @@ public function setCustomNumericFunctions(array $functions)
*
* @param string $name Function name.
* @param string|callable $className Class name or a callable that returns the function.
* @psalm-param class-string|callable $className
* @psalm-param class-string<FunctionNode>|callable(string):FunctionNode $className
*
* @return void
*/
Expand Down Expand Up @@ -733,7 +735,7 @@ public function getCustomDatetimeFunction($name)
* Any previously added date/time functions are discarded.
*
* @param array $functions The map of custom DQL date/time functions.
* @psalm-param array<string, string> $functions
* @psalm-param array<string, class-string<FunctionNode>|callable(string):FunctionNode> $functions
*
* @return void
*/
Expand Down
5 changes: 0 additions & 5 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1092,11 +1092,6 @@
<code>$entity</code>
</PossiblyInvalidArgument>
</file>
<file src="lib/Doctrine/ORM/ORMSetup.php">
<UndefinedClass occurrences="1">
<code>MemcachedAdapter::createConnection('memcached://127.0.0.1')</code>
</UndefinedClass>
</file>
<file src="lib/Doctrine/ORM/PersistentCollection.php">
<DocblockTypeContradiction occurrences="1">
<code>isset($offset)</code>
Expand Down