Cleanup psalm-type AutogenerateMode (#10833)

nicolas-grekas · web-flow · commit 8c513a65232e · 2023-07-11T23:01:02.000+02:00
diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
@@ -62,8 +62,6 @@
  * It combines all configuration options from DBAL & ORM.
  *
  * Internal note: When adding a new configuration option just write a getter/setter pair.
- *
- * @psalm-import-type AutogenerateMode from ProxyFactory
  */
 class Configuration extends \Doctrine\DBAL\Configuration
 {
@@ -95,8 +93,7 @@ public function getProxyDir()
     /**
      * Gets the strategy for automatically generating proxy classes.
      *
-     * @return int Possible values are constants of Doctrine\ORM\Proxy\ProxyFactory.
-     * @psalm-return AutogenerateMode
+     * @return ProxyFactory::AUTOGENERATE_*
      */
     public function getAutoGenerateProxyClasses()
     {
@@ -106,9 +103,7 @@ public function getAutoGenerateProxyClasses()
     /**
      * Sets the strategy for automatically generating proxy classes.
      *
-     * @param bool|int $autoGenerate Possible values are constants of Doctrine\ORM\Proxy\ProxyFactory.
-     * @psalm-param bool|AutogenerateMode $autoGenerate
-     * True is converted to AUTOGENERATE_ALWAYS, false to AUTOGENERATE_NEVER.
+     * @param bool|ProxyFactory::AUTOGENERATE_* $autoGenerate True is converted to AUTOGENERATE_ALWAYS, false to AUTOGENERATE_NEVER.
      *
      * @return void
      */
diff --git a/lib/Doctrine/ORM/Proxy/ProxyFactory.php b/lib/Doctrine/ORM/Proxy/ProxyFactory.php
@@ -31,8 +31,6 @@
 
 /**
  * This factory is used to create proxy objects for entities at runtime.
- *
- * @psalm-type AutogenerateMode = ProxyFactory::AUTOGENERATE_NEVER|ProxyFactory::AUTOGENERATE_ALWAYS|ProxyFactory::AUTOGENERATE_FILE_NOT_EXISTS|ProxyFactory::AUTOGENERATE_EVAL|ProxyFactory::AUTOGENERATE_FILE_NOT_EXISTS_OR_CHANGED
  */
 class ProxyFactory extends AbstractProxyFactory
 {
@@ -93,12 +91,10 @@ public function __serialize(): array
      * Initializes a new instance of the <tt>ProxyFactory</tt> class that is
      * connected to the given <tt>EntityManager</tt>.
      *
-     * @param EntityManagerInterface $em           The EntityManager the new factory works for.
-     * @param string                 $proxyDir     The directory to use for the proxy classes. It must exist.
-     * @param string                 $proxyNs      The namespace to use for the proxy classes.
-     * @param bool|int               $autoGenerate The strategy for automatically generating proxy classes. Possible
-     *                                             values are constants of {@see ProxyFactory::AUTOGENERATE_*}.
-     * @psalm-param bool|AutogenerateMode $autoGenerate
+     * @param EntityManagerInterface    $em           The EntityManager the new factory works for.
+     * @param string                    $proxyDir     The directory to use for the proxy classes. It must exist.
+     * @param string                    $proxyNs      The namespace to use for the proxy classes.
+     * @param bool|self::AUTOGENERATE_* $autoGenerate The strategy for automatically generating proxy classes.
      */
     public function __construct(EntityManagerInterface $em, $proxyDir, $proxyNs, $autoGenerate = self::AUTOGENERATE_NEVER)
     {

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,6 @@`
`62`	`62`	`* It combines all configuration options from DBAL & ORM.`
`63`	`63`	`*`
`64`	`64`	`* Internal note: When adding a new configuration option just write a getter/setter pair.`
`65`		`- *`
`66`		`- * @psalm-import-type AutogenerateMode from ProxyFactory`
`67`	`65`	`*/`
`68`	`66`	`class Configuration extends \Doctrine\DBAL\Configuration`
`69`	`67`	`{`
`@@ -95,8 +93,7 @@ public function getProxyDir()`
`95`	`93`	`/**`
`96`	`94`	`* Gets the strategy for automatically generating proxy classes.`
`97`	`95`	`*`
`98`		`- * @return int Possible values are constants of Doctrine\ORM\Proxy\ProxyFactory.`
`99`		`- * @psalm-return AutogenerateMode`
	`96`	`+ * @return ProxyFactory::AUTOGENERATE_*`
`100`	`97`	`*/`
`101`	`98`	`public function getAutoGenerateProxyClasses()`
`102`	`99`	`{`
`@@ -106,9 +103,7 @@ public function getAutoGenerateProxyClasses()`
`106`	`103`	`/**`
`107`	`104`	`* Sets the strategy for automatically generating proxy classes.`
`108`	`105`	`*`
`109`		`- * @param bool\|int $autoGenerate Possible values are constants of Doctrine\ORM\Proxy\ProxyFactory.`
`110`		`- * @psalm-param bool\|AutogenerateMode $autoGenerate`
`111`		`- * True is converted to AUTOGENERATE_ALWAYS, false to AUTOGENERATE_NEVER.`
	`106`	`+ * @param bool\|ProxyFactory::AUTOGENERATE_* $autoGenerate True is converted to AUTOGENERATE_ALWAYS, false to AUTOGENERATE_NEVER.`
`112`	`107`	`*`
`113`	`108`	`* @return void`
`114`	`109`	`*/`