Merge pull request #746 from doctrine/6.0.x-merge-up-into-6.1.x_ezaW6wII

Merge release 6.0.1 into 6.1.x
doctrine · Oct 31, 2023 · f334b92 · f334b92
2 parents 7cc1cfc + bb23630
commit f334b92
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 1 deletion.
diff --git a/src/Options/DBALConfiguration.php b/src/Options/DBALConfiguration.php
@@ -8,6 +8,8 @@
 
 /**
  * Configuration options for a DBAL Connection
+ *
+ * @template-extends AbstractOptions<mixed>
  */
 class DBALConfiguration extends AbstractOptions
 {

diff --git a/src/Options/DBALConnection.php b/src/Options/DBALConnection.php
@@ -12,6 +12,8 @@
 
 /**
  * DBAL Connection options
+ *
+ * @template-extends AbstractOptions<mixed>
  */
 final class DBALConnection extends AbstractOptions
 {

diff --git a/src/Options/EntityManager.php b/src/Options/EntityManager.php
@@ -6,6 +6,9 @@
 
 use Laminas\Stdlib\AbstractOptions;
 
+/**
+ * @template-extends AbstractOptions<mixed>
+ */
 final class EntityManager extends AbstractOptions
 {
     /**

diff --git a/src/Options/EntityResolver.php b/src/Options/EntityResolver.php
@@ -10,6 +10,9 @@
 use function class_exists;
 use function sprintf;
 
+/**
+ * @template-extends AbstractOptions<mixed>
+ */
 final class EntityResolver extends AbstractOptions
 {
     /**

diff --git a/src/Options/SQLLoggerCollectorOptions.php b/src/Options/SQLLoggerCollectorOptions.php
@@ -7,7 +7,9 @@
 use Laminas\Stdlib\AbstractOptions;
 
 /**
- * Configuration options for an collector
+ * Configuration options for a collector
+ *
+ * @template-extends AbstractOptions<mixed>
  */
 final class SQLLoggerCollectorOptions extends AbstractOptions
 {

diff --git a/src/Options/SecondLevelCacheConfiguration.php b/src/Options/SecondLevelCacheConfiguration.php
@@ -8,6 +8,8 @@
 
 /**
  * Configuration options for Second Level Cache
+ *
+ * @template-extends AbstractOptions<mixed>
  */
 final class SecondLevelCacheConfiguration extends AbstractOptions
 {