Fix pattern for host names.

cakephp · Aug 11, 2017 · fa8c5d8 · fa8c5d8
1 parent edcb3dc
commit fa8c5d8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Core/StaticConfigTrait.php b/src/Core/StaticConfigTrait.php
@@ -250,11 +250,11 @@ public static function parseDsn($dsn)
         }
 
         $pattern = '/^(?P<scheme>[\w\\\\]+):\/\/((?P<user>.*?)(:(?P<password>.*?))?@)?' .
-            '((?P<host>[.\w\\\\]+)(:(?P<port>\d+))?)?' .
+            '((?P<host>[.\w-\\\\]+)(:(?P<port>\d+))?)?' .
             '(?P<path>\/[^?]*)?(\?(?P<query>.*))?$/';
         preg_match($pattern, $dsn, $parsed);
 
-        if (empty($parsed)) {
+        if (!$parsed) {
             throw new InvalidArgumentException("The DSN string '{$dsn}' could not be parsed.");
         }
         foreach ($parsed as $k => $v) {

diff --git a/tests/TestCase/Datasource/ConnectionManagerTest.php b/tests/TestCase/Datasource/ConnectionManagerTest.php
@@ -281,6 +281,17 @@ public function dsnProvider()
                     'scheme' => 'mysql',
                 ]
             ],
+            'subdomain host' => [
+                'mysql://my.host-name.com:3306/database',
+                [
+                    'className' => 'Cake\Database\Connection',
+                    'driver' => 'Cake\Database\Driver\Mysql',
+                    'host' => 'my.host-name.com',
+                    'database' => 'database',
+                    'port' => 3306,
+                    'scheme' => 'mysql',
+                ]
+            ],
             'user & pass' => [
                 'mysql://root:secret@localhost:3306/database?log=1',
                 [