Middleware is uncountable

docs/en/reference/architecture.rst

@@ -43,8 +43,8 @@ interfaces:
 -  ``Doctrine\DBAL\Driver\Statement``
 -  ``Doctrine\DBAL\Driver\Result``
 
-Middlewares
------------
+Middleware
+----------
 
 A middleware sits in the middle between the wrapper components and the driver.
 By implementing the ``Doctrine\DBAL\Driver\Middleware``, it decorates the

src/Configuration.php

@@ -19,7 +19,7 @@
 class Configuration
 {
     /** @var Middleware[] */
-    private array $middlewares = [];
+    private array $middleware = [];
 
     /**
      * The SQL logger in use. If null, SQL logging is disabled.
@@ -68,14 +68,14 @@ public function __construct()
     /**
      * Sets the SQL logger to use. Defaults to NULL which means SQL logging is disabled.
      *
-     * @deprecated Use {@see setMiddlewares()} and {@see \Doctrine\DBAL\Logging\Middleware} instead.
+     * @deprecated Use {@see setMiddleware()} and {@see \Doctrine\DBAL\Logging\Middleware} instead.
      */
     public function setSQLLogger(?SQLLogger $logger = null): void
     {
         Deprecation::trigger(
             'doctrine/dbal',
             'https://github.com/doctrine/dbal/pull/4967',
-            '%s is deprecated, use setMiddlewares() and Logging\\Middleware instead.',
+            '%s is deprecated, use setMiddleware() and Logging\\Middleware instead.',
             __METHOD__,
         );
 
@@ -212,21 +212,57 @@ public function getAutoCommit(): bool
     }
 
     /**
-     * @param Middleware[] $middlewares
+     * @deprecated setMiddlewares is deprecated since doctrine/dbal 3.6. Use setMiddleware instead.
+     *
+     * @param Middleware[] $middleware
+     *
+     * @return $this
+     */
+    public function setMiddlewares(array $middleware): self
+    {
+        Deprecation::trigger(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/pull/6033',
+            '%s is deprecated since doctrine/dbal 3.7. Use setMiddleware instead.',
+            __METHOD__,
+        );
+
+        return $this->setMiddleware($middleware);
+    }
+
+    /**
+     * @param Middleware[] $middleware
      *
      * @return $this
      */
-    public function setMiddlewares(array $middlewares): self
+    public function setMiddleware(array $middleware): self
     {
-        $this->middlewares = $middlewares;
+        $this->middleware = $middleware;
 
         return $this;
     }
 
-    /** @return Middleware[] */
+    /**
+     * @deprecated getMiddlewares is deprecated since doctrine/dbal 3.6. Use getMiddleware instead.
+     *
+     * @return Middleware[]
+     */
     public function getMiddlewares(): array
     {
-        return $this->middlewares;
+        Deprecation::trigger(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/pull/6033',
+            '%s is deprecated since doctrine/dbal 3.7. Use getMiddleware instead.',
+            __METHOD__,
+        );
+
+        return $this->getMiddleware();
+    }
+
+    /** @return Middleware[] */
+    public function getMiddleware(): array
+    {
+        return $this->middleware;
     }
 
     public function getSchemaManagerFactory(): ?SchemaManagerFactory

src/DriverManager.php

@@ -184,7 +184,7 @@ public static function getConnection(
 
         $driver = self::createDriver($params['driver'] ?? null, $params['driverClass'] ?? null);
 
-        foreach ($config->getMiddlewares() as $middleware) {
+        foreach ($config->getMiddleware() as $middleware) {
             $driver = $middleware->wrap($driver);
         }
 

tests/Functional/PortabilityTest.php

@@ -143,9 +143,9 @@ private function connectWithPortability(int $mode, int $case): void
         $this->connection->close();
 
         $configuration = $this->connection->getConfiguration();
-        $configuration->setMiddlewares(
+        $configuration->setMiddleware(
             array_merge(
-                $configuration->getMiddlewares(),
+                $configuration->getMiddleware(),
                 [new Middleware($mode, $case)],
             ),
         );

tests/TestUtil.php

@@ -148,11 +148,11 @@ private static function createConfiguration(string $driver): Configuration
         switch ($driver) {
             case 'pdo_oci':
             case 'oci8':
-                $configuration->setMiddlewares([new InitializeSession()]);
+                $configuration->setMiddleware([new InitializeSession()]);
                 break;
             case 'pdo_sqlite':
             case 'sqlite3':
-                $configuration->setMiddlewares([new EnableForeignKeys()]);
+                $configuration->setMiddleware([new EnableForeignKeys()]);
                 break;
         }