Merge 527f269 into 649b42a

AD7six · Nov 17, 2014 · 3a030ef · 3a030ef
2 parents 649b42a + 527f269
commit 3a030ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Wrapper/CakePHP/V3/DbDsn.php b/src/Wrapper/CakePHP/V3/DbDsn.php
@@ -46,7 +46,7 @@ class DbDsn extends Dsn
     protected $defaultOptions = [
         'keyMap' => [
             'engine' => 'driver',
-            'user' => 'login',
+            'user' => 'username',
             'pass' => 'password'
         ]
     ];

diff --git a/tests/TestCase/Wrapper/CakePHP/V3/DbDsnTest.php b/tests/TestCase/Wrapper/CakePHP/V3/DbDsnTest.php
@@ -46,7 +46,7 @@ public function defaultsProvider()
                     'driver' => 'Cake\Database\Driver\Mysql',
                     'host' => 'localhost',
                     'port' => 3306,
-                    'login' => 'user',
+                    'username' => 'user',
                     'password' => 'password',
                     'database' => 'database_name',
                 ]
@@ -58,7 +58,7 @@ public function defaultsProvider()
                     'driver' => 'Cake\Database\Driver\Mysql',
                     'host' => 'localhost',
                     'port' => 3306,
-                    'login' => 'user',
+                    'username' => 'user',
                     'password' => 'password',
                     'database' => 'test_database_name',
                 ]