From b35b75d9c79275f3c11622734398ae05bccfc581 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Thu, 7 Sep 2017 20:45:46 +0200 Subject: [PATCH] MySqliDriver: removed deprecated stuff --- src/Dibi/Drivers/MySqliDriver.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php index aa045374..dd07230b 100644 --- a/src/Dibi/Drivers/MySqliDriver.php +++ b/src/Dibi/Drivers/MySqliDriver.php @@ -99,13 +99,8 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver $this->connection = mysqli_init(); if (isset($config['options'])) { - if (is_scalar($config['options'])) { - $config['flags'] = $config['options']; // back compatibility - trigger_error(__CLASS__ . ": configuration item 'options' must be array; for constants MYSQLI_CLIENT_* use 'flags'.", E_USER_NOTICE); - } else { - foreach ((array) $config['options'] as $key => $value) { - mysqli_options($this->connection, $key, $value); - } + foreach ($config['options'] as $key => $value) { + mysqli_options($this->connection, $key, $value); } } @mysqli_real_connect($this->connection, (empty($config['persistent']) ? '' : 'p:') . $config['host'], $config['username'], $config['password'], $config['database'] ?? '', $config['port'] ?? 0, $config['socket'], $config['flags'] ?? 0); // intentionally @