updated-packages

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/ConnectionEventArgs.php

@@ -7,9 +7,10 @@ use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
+use Doctrine\Deprecations\Deprecation;
 
 /**
- * Event Arguments used when a Driver connection is established inside Doctrine\DBAL\Connection.
+ * Event Arguments used when a Driver connection is established inside {@link Connection}.
  */
 class ConnectionEventArgs extends EventArgs
 {
@@ -30,26 +31,53 @@ class ConnectionEventArgs extends EventArgs
     }
 
     /**
+     * @deprecated Use ConnectionEventArgs::getConnection() and Connection::getDriver() instead.
+     *
      * @return Driver
      */
     public function getDriver()
     {
+        Deprecation::trigger(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/issues/3580',
+            'ConnectionEventArgs::getDriver() is deprecated, ' .
+            'use ConnectionEventArgs::getConnection()->getDriver() instead.'
+        );
+
         return $this->connection->getDriver();
     }
 
     /**
+     * @deprecated Use ConnectionEventArgs::getConnection() and Connection::getDatabasePlatform() instead.
+     *
      * @return AbstractPlatform
      */
     public function getDatabasePlatform()
     {
+        Deprecation::trigger(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/issues/3580',
+            'ConnectionEventArgs::getDatabasePlatform() is deprecated, ' .
+            'use ConnectionEventArgs::getConnection()->getDatabasePlatform() instead.'
+        );
+
         return $this->connection->getDatabasePlatform();
     }
 
     /**
+     * @deprecated Use ConnectionEventArgs::getConnection() and Connection::getSchemaManager() instead.
+     *
      * @return AbstractSchemaManager
      */
     public function getSchemaManager()
     {
+        Deprecation::trigger(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/issues/3580',
+            'ConnectionEventArgs::getSchemaManager() is deprecated, ' .
+            'use ConnectionEventArgs::getConnection()->getSchemaManager() instead.'
+        );
+
         return $this->connection->getSchemaManager();
     }
 }

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/Listeners/MysqlSessionInit.php

@@ -45,7 +45,7 @@ class MysqlSessionInit implements EventSubscriber
     public function postConnect(ConnectionEventArgs $args)
     {
         $collation = $this->collation ? ' COLLATE ' . $this->collation : '';
-        $args->getConnection()->executeUpdate('SET NAMES ' . $this->charset . $collation);
+        $args->getConnection()->executeStatement('SET NAMES ' . $this->charset . $collation);
     }
 
     /**

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/Listeners/OracleSessionInit.php

@@ -5,12 +5,14 @@ namespace Doctrine\DBAL\Event\Listeners;
 use Doctrine\Common\EventSubscriber;
 use Doctrine\DBAL\Event\ConnectionEventArgs;
 use Doctrine\DBAL\Events;
-use const CASE_UPPER;
+
 use function array_change_key_case;
 use function array_merge;
 use function count;
 use function implode;
 
+use const CASE_UPPER;
+
 /**
  * Should be used when Oracle Server default environment does not match the Doctrine requirements.
  *
@@ -49,17 +51,17 @@ class OracleSessionInit implements EventSubscriber
             return;
         }
 
-        array_change_key_case($this->_defaultSessionVars, CASE_UPPER);
         $vars = [];
-        foreach ($this->_defaultSessionVars as $option => $value) {
+        foreach (array_change_key_case($this->_defaultSessionVars, CASE_UPPER) as $option => $value) {
             if ($option === 'CURRENT_SCHEMA') {
                 $vars[] = $option . ' = ' . $value;
             } else {
                 $vars[] = $option . " = '" . $value . "'";
             }
         }
+
         $sql = 'ALTER SESSION SET ' . implode(' ', $vars);
-        $args->getConnection()->executeUpdate($sql);
+        $args->getConnection()->executeStatement($sql);
     }
 
     /**

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/SchemaAlterTableAddColumnEventArgs.php

@@ -5,11 +5,14 @@ namespace Doctrine\DBAL\Event;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\TableDiff;
+use Doctrine\Deprecations\Deprecation;
+
 use function array_merge;
+use function func_get_args;
 use function is_array;
 
 /**
- * Event Arguments used when SQL queries for adding table columns are generated inside Doctrine\DBAL\Platform\*Platform.
+ * Event Arguments used when SQL queries for adding table columns are generated inside {@link AbstractPlatform}.
  */
 class SchemaAlterTableAddColumnEventArgs extends SchemaEventArgs
 {
@@ -57,18 +60,25 @@ class SchemaAlterTableAddColumnEventArgs extends SchemaEventArgs
     }
 
     /**
+     * Passing multiple SQL statements as an array is deprecated. Pass each statement as an individual argument instead.
+     *
      * @param string|string[] $sql
      *
-     * @return \Doctrine\DBAL\Event\SchemaAlterTableAddColumnEventArgs
+     * @return SchemaAlterTableAddColumnEventArgs
      */
     public function addSql($sql)
     {
         if (is_array($sql)) {
-            $this->sql = array_merge($this->sql, $sql);
-        } else {
-            $this->sql[] = $sql;
+            Deprecation::trigger(
+                'doctrine/dbal',
+                'https://github.com/doctrine/dbal/issues/3580',
+                'Passing multiple SQL statements as an array to SchemaAlterTableAddColumnEventaArrgs::addSql() ' .
+                'is deprecated. Pass each statement as an individual argument instead.'
+            );
         }
 
+        $this->sql = array_merge($this->sql, is_array($sql) ? $sql : func_get_args());
+
         return $this;
     }
 

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/SchemaAlterTableChangeColumnEventArgs.php

@@ -5,11 +5,13 @@ namespace Doctrine\DBAL\Event;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\ColumnDiff;
 use Doctrine\DBAL\Schema\TableDiff;
+
 use function array_merge;
+use function func_get_args;
 use function is_array;
 
 /**
- * Event Arguments used when SQL queries for changing table columns are generated inside Doctrine\DBAL\Platform\*Platform.
+ * Event Arguments used when SQL queries for changing table columns are generated inside {@link AbstractPlatform}.
  */
 class SchemaAlterTableChangeColumnEventArgs extends SchemaEventArgs
 {
@@ -57,17 +59,15 @@ class SchemaAlterTableChangeColumnEventArgs extends SchemaEventArgs
     }
 
     /**
+     * Passing multiple SQL statements as an array is deprecated. Pass each statement as an individual argument instead.
+     *
      * @param string|string[] $sql
      *
-     * @return \Doctrine\DBAL\Event\SchemaAlterTableChangeColumnEventArgs
+     * @return SchemaAlterTableChangeColumnEventArgs
      */
     public function addSql($sql)
     {
-        if (is_array($sql)) {
-            $this->sql = array_merge($this->sql, $sql);
-        } else {
-            $this->sql[] = $sql;
-        }
+        $this->sql = array_merge($this->sql, is_array($sql) ? $sql : func_get_args());
 
         return $this;
     }

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/SchemaAlterTableEventArgs.php

@@ -4,11 +4,13 @@ namespace Doctrine\DBAL\Event;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\TableDiff;
+
 use function array_merge;
+use function func_get_args;
 use function is_array;
 
 /**
- * Event Arguments used when SQL queries for creating tables are generated inside Doctrine\DBAL\Platform\*Platform.
+ * Event Arguments used when SQL queries for creating tables are generated inside {@link AbstractPlatform}.
  */
 class SchemaAlterTableEventArgs extends SchemaEventArgs
 {
@@ -44,17 +46,15 @@ class SchemaAlterTableEventArgs extends SchemaEventArgs
     }
 
     /**
+     * Passing multiple SQL statements as an array is deprecated. Pass each statement as an individual argument instead.
+     *
      * @param string|string[] $sql
      *
-     * @return \Doctrine\DBAL\Event\SchemaAlterTableEventArgs
+     * @return SchemaAlterTableEventArgs
      */
     public function addSql($sql)
     {
-        if (is_array($sql)) {
-            $this->sql = array_merge($this->sql, $sql);
-        } else {
-            $this->sql[] = $sql;
-        }
+        $this->sql = array_merge($this->sql, is_array($sql) ? $sql : func_get_args());
 
         return $this;
     }

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/SchemaAlterTableRemoveColumnEventArgs.php

@@ -5,11 +5,13 @@ namespace Doctrine\DBAL\Event;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\TableDiff;
+
 use function array_merge;
+use function func_get_args;
 use function is_array;
 
 /**
- * Event Arguments used when SQL queries for removing table columns are generated inside Doctrine\DBAL\Platform\*Platform.
+ * Event Arguments used when SQL queries for removing table columns are generated inside {@link AbstractPlatform}.
  */
 class SchemaAlterTableRemoveColumnEventArgs extends SchemaEventArgs
 {
@@ -57,17 +59,15 @@ class SchemaAlterTableRemoveColumnEventArgs extends SchemaEventArgs
     }
 
     /**
+     * Passing multiple SQL statements as an array is deprecated. Pass each statement as an individual argument instead.
+     *
      * @param string|string[] $sql
      *
-     * @return \Doctrine\DBAL\Event\SchemaAlterTableRemoveColumnEventArgs
+     * @return SchemaAlterTableRemoveColumnEventArgs
      */
     public function addSql($sql)
     {
-        if (is_array($sql)) {
-            $this->sql = array_merge($this->sql, $sql);
-        } else {
-            $this->sql[] = $sql;
-        }
+        $this->sql = array_merge($this->sql, is_array($sql) ? $sql : func_get_args());
 
         return $this;
     }

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/SchemaAlterTableRenameColumnEventArgs.php

@@ -5,11 +5,13 @@ namespace Doctrine\DBAL\Event;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\TableDiff;
+
 use function array_merge;
+use function func_get_args;
 use function is_array;
 
 /**
- * Event Arguments used when SQL queries for renaming table columns are generated inside Doctrine\DBAL\Platform\*Platform.
+ * Event Arguments used when SQL queries for renaming table columns are generated inside {@link AbstractPlatform}.
  */
 class SchemaAlterTableRenameColumnEventArgs extends SchemaEventArgs
 {
@@ -72,17 +74,15 @@ class SchemaAlterTableRenameColumnEventArgs extends SchemaEventArgs
     }
 
     /**
+     * Passing multiple SQL statements as an array is deprecated. Pass each statement as an individual argument instead.
+     *
      * @param string|string[] $sql
      *
-     * @return \Doctrine\DBAL\Event\SchemaAlterTableRenameColumnEventArgs
+     * @return SchemaAlterTableRenameColumnEventArgs
      */
     public function addSql($sql)
     {
-        if (is_array($sql)) {
-            $this->sql = array_merge($this->sql, $sql);
-        } else {
-            $this->sql[] = $sql;
-        }
+        $this->sql = array_merge($this->sql, is_array($sql) ? $sql : func_get_args());
 
         return $this;
     }

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/SchemaColumnDefinitionEventArgs.php

@@ -5,14 +5,15 @@ namespace Doctrine\DBAL\Event;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\Column;
+use Doctrine\Deprecations\Deprecation;
 
 /**
- * Event Arguments used when the portable column definition is generated inside Doctrine\DBAL\Schema\AbstractSchemaManager.
+ * Event Arguments used when the portable column definition is generated inside {@link AbstractPlatform}.
  */
 class SchemaColumnDefinitionEventArgs extends SchemaEventArgs
 {
     /** @var Column|null */
-    private $column = null;
+    private $column;
 
     /**
      * Raw column data as fetched from the database.
@@ -47,7 +48,7 @@ class SchemaColumnDefinitionEventArgs extends SchemaEventArgs
      * Allows to clear the column which means the column will be excluded from
      * tables column list.
      *
-     * @return \Doctrine\DBAL\Event\SchemaColumnDefinitionEventArgs
+     * @return SchemaColumnDefinitionEventArgs
      */
     public function setColumn(?Column $column = null)
     {
@@ -97,10 +98,19 @@ class SchemaColumnDefinitionEventArgs extends SchemaEventArgs
     }
 
     /**
+     * @deprecated Use SchemaColumnDefinitionEventArgs::getConnection() and Connection::getDatabasePlatform() instead.
+     *
      * @return AbstractPlatform
      */
     public function getDatabasePlatform()
     {
+        Deprecation::trigger(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/issues/3580',
+            'SchemaColumnDefinitionEventArgs::getDatabasePlatform() is deprecated, ' .
+            'use SchemaColumnDefinitionEventArgs::getConnection()->getDatabasePlatform() instead.'
+        );
+
         return $this->connection->getDatabasePlatform();
     }
 }

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/SchemaCreateTableColumnEventArgs.php

@@ -5,11 +5,13 @@ namespace Doctrine\DBAL\Event;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Table;
+
 use function array_merge;
+use function func_get_args;
 use function is_array;
 
 /**
- * Event Arguments used when SQL queries for creating table columns are generated inside Doctrine\DBAL\Platform\AbstractPlatform.
+ * Event Arguments used when SQL queries for creating table columns are generated inside {@link AbstractPlatform}.
  */
 class SchemaCreateTableColumnEventArgs extends SchemaEventArgs
 {
@@ -57,17 +59,15 @@ class SchemaCreateTableColumnEventArgs extends SchemaEventArgs
     }
 
     /**
+     * Passing multiple SQL statements as an array is deprecated. Pass each statement as an individual argument instead.
+     *
      * @param string|string[] $sql
      *
-     * @return \Doctrine\DBAL\Event\SchemaCreateTableColumnEventArgs
+     * @return SchemaCreateTableColumnEventArgs
      */
     public function addSql($sql)
     {
-        if (is_array($sql)) {
-            $this->sql = array_merge($this->sql, $sql);
-        } else {
-            $this->sql[] = $sql;
-        }
+        $this->sql = array_merge($this->sql, is_array($sql) ? $sql : func_get_args());
 
         return $this;
     }

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/SchemaCreateTableEventArgs.php

@@ -3,20 +3,21 @@
 namespace Doctrine\DBAL\Event;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Table;
+
 use function array_merge;
+use function func_get_args;
 use function is_array;
 
 /**
- * Event Arguments used when SQL queries for creating tables are generated inside Doctrine\DBAL\Platform\AbstractPlatform.
+ * Event Arguments used when SQL queries for creating tables are generated inside {@link AbstractPlatform}.
  */
 class SchemaCreateTableEventArgs extends SchemaEventArgs
 {
     /** @var Table */
     private $table;
 
-    /** @var Column[] */
+    /** @var mixed[][] */
     private $columns;
 
     /** @var mixed[] */
@@ -29,8 +30,8 @@ class SchemaCreateTableEventArgs extends SchemaEventArgs
     private $sql = [];
 
     /**
-     * @param Column[] $columns
-     * @param mixed[]  $options
+     * @param mixed[][] $columns
+     * @param mixed[]   $options
      */
     public function __construct(Table $table, array $columns, array $options, AbstractPlatform $platform)
     {
@@ -49,7 +50,7 @@ class SchemaCreateTableEventArgs extends SchemaEventArgs
     }
 
     /**
-     * @return Column[]
+     * @return mixed[][]
      */
     public function getColumns()
     {
@@ -73,17 +74,15 @@ class SchemaCreateTableEventArgs extends SchemaEventArgs
     }
 
     /**
+     * Passing multiple SQL statements as an array is deprecated. Pass each statement as an individual argument instead.
+     *
      * @param string|string[] $sql
      *
-     * @return \Doctrine\DBAL\Event\SchemaCreateTableEventArgs
+     * @return SchemaCreateTableEventArgs
      */
     public function addSql($sql)
     {
-        if (is_array($sql)) {
-            $this->sql = array_merge($this->sql, $sql);
-        } else {
-            $this->sql[] = $sql;
-        }
+        $this->sql = array_merge($this->sql, is_array($sql) ? $sql : func_get_args());
 
         return $this;
     }

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/SchemaDropTableEventArgs.php

@@ -5,10 +5,9 @@ namespace Doctrine\DBAL\Event;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\Table;
 use InvalidArgumentException;
-use function is_string;
 
 /**
- * Event Arguments used when the SQL query for dropping tables are generated inside Doctrine\DBAL\Platform\AbstractPlatform.
+ * Event Arguments used when the SQL query for dropping tables are generated inside {@link AbstractPlatform}.
  */
 class SchemaDropTableEventArgs extends SchemaEventArgs
 {
@@ -19,7 +18,7 @@ class SchemaDropTableEventArgs extends SchemaEventArgs
     private $platform;
 
     /** @var string|null */
-    private $sql = null;
+    private $sql;
 
     /**
      * @param string|Table $table
@@ -28,10 +27,6 @@ class SchemaDropTableEventArgs extends SchemaEventArgs
      */
     public function __construct($table, AbstractPlatform $platform)
     {
-        if (! $table instanceof Table && ! is_string($table)) {
-            throw new InvalidArgumentException('SchemaDropTableEventArgs expects $table parameter to be string or \Doctrine\DBAL\Schema\Table.');
-        }
-
         $this->table    = $table;
         $this->platform = $platform;
     }
@@ -55,7 +50,7 @@ class SchemaDropTableEventArgs extends SchemaEventArgs
     /**
      * @param string $sql
      *
-     * @return \Doctrine\DBAL\Event\SchemaDropTableEventArgs
+     * @return SchemaDropTableEventArgs
      */
     public function setSql($sql)
     {

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/SchemaEventArgs.php

@@ -13,7 +13,7 @@ class SchemaEventArgs extends EventArgs
     private $preventDefault = false;
 
     /**
-     * @return \Doctrine\DBAL\Event\SchemaEventArgs
+     * @return SchemaEventArgs
      */
     public function preventDefault()
     {

vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/SchemaIndexDefinitionEventArgs.php

@@ -5,14 +5,15 @@ namespace Doctrine\DBAL\Event;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\Index;
+use Doctrine\Deprecations\Deprecation;
 
 /**
- * Event Arguments used when the portable index definition is generated inside Doctrine\DBAL\Schema\AbstractSchemaManager.
+ * Event Arguments used when the portable index definition is generated inside {@link AbstractSchemaManager}.
  */
 class SchemaIndexDefinitionEventArgs extends SchemaEventArgs
 {
     /** @var Index|null */
-    private $index = null;
+    private $index;
 
     /**
      * Raw index data as fetched from the database.
@@ -83,10 +84,19 @@ class SchemaIndexDefinitionEventArgs extends SchemaEventArgs
     }
 
     /**
+     * @deprecated Use SchemaIndexDefinitionEventArgs::getConnection() and Connection::getDatabasePlatform() instead.
+     *
      * @return AbstractPlatform
      */
     public function getDatabasePlatform()
     {
+        Deprecation::trigger(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/issues/3580',
+            'SchemaIndexDefinitionEventArgs::getDatabasePlatform() is deprecated, ' .
+            'use SchemaIndexDefinitionEventArgs::getConnection()->getDatabasePlatform() instead.'
+        );
+
         return $this->connection->getDatabasePlatform();
     }
 }