Merge pull request #9826 from greg0ire/improve-phpdoc-configuration

Improve phpdoc for Configuration
doctrine · Jun 9, 2022 · 9efeefb · 9efeefb
2 parents 2bc0be6 + 5f12b8f
commit 9efeefb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
@@ -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
@@ -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
      */
@@ -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
      */
@@ -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
      */

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -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>