4
4
5
5
class ConnectionInfo {
6
6
7
+ /**
8
+ * The adapter to use for this connection
9
+ *
10
+ * @var string
11
+ */
7
12
public $ adapter = null ;
13
+
14
+ /**
15
+ * The host to use for this connection.
16
+ *
17
+ * @var string
18
+ */
8
19
public $ host = null ;
20
+
21
+ /**
22
+ * The port to use for this connection.
23
+ *
24
+ * @var int
25
+ */
9
26
public $ port = null ;
27
+
28
+ /**
29
+ * The database to use for this connection.
30
+ *
31
+ * @var string
32
+ */
10
33
public $ database = null ;
11
34
35
+ /**
36
+ * The username to use for this connection.
37
+ *
38
+ * @var string
39
+ */
12
40
public $ username = null ;
41
+
42
+ /**
43
+ * The password to use for this connection.
44
+ *
45
+ * @var string
46
+ */
13
47
public $ password = null ;
14
48
49
+ /**
50
+ * The charset to use for this connection.
51
+ *
52
+ * @var string
53
+ */
15
54
public $ charset = null ;
16
55
17
- public $ decode = false ;
18
-
19
56
public function __construct ($ input = array ())
20
57
{
21
58
foreach ($ input as $ prop => $ value )
@@ -62,6 +99,8 @@ public static function from_connection_url($connection_url)
62
99
$ info ->adapter = $ url ['scheme ' ];
63
100
$ info ->host = $ url ['host ' ];
64
101
102
+ $ decode = false ;
103
+
65
104
if (isset ($ url ['query ' ]))
66
105
{
67
106
parse_str ($ url ['query ' ], $ params );
@@ -70,7 +109,7 @@ public static function from_connection_url($connection_url)
70
109
$ info ->charset = $ params ['charset ' ];
71
110
72
111
if (isset ($ params ['decode ' ]))
73
- $ info -> decode = ($ params ['decode ' ] == 'true ' );
112
+ $ decode = ($ params ['decode ' ] == 'true ' );
74
113
}
75
114
76
115
if (isset ($ url ['path ' ]))
@@ -102,10 +141,10 @@ public static function from_connection_url($connection_url)
102
141
$ info ->port = $ url ['port ' ];
103
142
104
143
if (isset ($ url ['user ' ]))
105
- $ info ->username = $ info -> decode ? urldecode ($ url ['user ' ]) : $ url ['user ' ];
144
+ $ info ->username = $ decode ? urldecode ($ url ['user ' ]) : $ url ['user ' ];
106
145
107
146
if (isset ($ url ['pass ' ]))
108
- $ info ->password = $ info -> decode ? urldecode ($ url ['pass ' ]) : $ url ['pass ' ];
147
+ $ info ->password = $ decode ? urldecode ($ url ['pass ' ]) : $ url ['pass ' ];
109
148
110
149
return $ info ;
111
150
}
0 commit comments