Added temporary exception for warning users of the change from login …

…=> username
cakephp · Nov 1, 2014 · b552692 · b552692
1 parent c760a0f
commit b552692
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Cache/Engine/MemcachedEngine.php b/src/Cache/Engine/MemcachedEngine.php
@@ -147,7 +147,7 @@ public function init(array $config = []) {
 			}
 		}
 
-		if (empty($this->_config['username']) && !empty($config['login'])) {
+		if (empty($this->_config['username']) && !empty($this->_config['login'])) {
 			throw new InvalidArgumentException(
 				'Please pass "username" instead of "login" for connecting to Memcached'
 			);

diff --git a/src/Database/Driver/PDODriverTrait.php b/src/Database/Driver/PDODriverTrait.php
@@ -15,6 +15,7 @@
 namespace Cake\Database\Driver;
 
 use Cake\Database\Statement\PDOStatement;
+use InvalidArgumentException;
 use PDO;
 
 /**
@@ -35,8 +36,14 @@ trait PDODriverTrait {
  * @param string $dsn A Driver-specific PDO-DSN
  * @param array $config configuration to be used for creating connection
  * @return bool true on success
+ * @throws InvalidArgumentException
  */
 	protected function _connect($dsn, array $config) {
+		if (empty($config['username']) && !empty($config['login'])) {
+			throw new InvalidArgumentException(
+				'Please pass "username" instead of "login" for connecting to the database'
+			);
+		}
 		$connection = new PDO(
 			$dsn,
 			$config['username'],