@@ -31,15 +31,17 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | public function __construct($options) |
| 33 | 33 | { |
| 34 | - if (!array_key_exists("dbchar", $options)) |
|
| 35 | - $options["dbchar"] = "UTF-8"; |
|
| 34 | + if (!array_key_exists("dbchar", $options)) { |
|
| 35 | + $options["dbchar"] = "UTF-8"; |
|
| 36 | + } |
|
| 36 | 37 | |
| 37 | 38 | parent::__construct($options); |
| 38 | 39 | |
| 39 | 40 | $auto_connect = array_key_exists('auto_connect', $options) ? $options["auto_connect"] : true; |
| 40 | 41 | |
| 41 | - if ($auto_connect) |
|
| 42 | - $this->connect(); |
|
| 42 | + if ($auto_connect) { |
|
| 43 | + $this->connect(); |
|
| 44 | + } |
|
| 43 | 45 | } |
| 44 | 46 | |
| 45 | 47 | /** |
@@ -52,11 +54,13 @@ discard block |
||
| 52 | 54 | */ |
| 53 | 55 | public function connect() |
| 54 | 56 | { |
| 55 | - if (!extension_loaded('sqlsrv')) |
|
| 56 | - throw new \RuntimeException("The Sqlsrv extension is not loaded"); |
|
| 57 | + if (!extension_loaded('sqlsrv')) { |
|
| 58 | + throw new \RuntimeException("The Sqlsrv extension is not loaded"); |
|
| 59 | + } |
|
| 57 | 60 | |
| 58 | - if (!is_null($this->dbport) && !empty($this->dbport)) |
|
| 59 | - $this->dbhost .= ', ' . $this->dbport; |
|
| 61 | + if (!is_null($this->dbport) && !empty($this->dbport)) { |
|
| 62 | + $this->dbhost .= ', ' . $this->dbport; |
|
| 63 | + } |
|
| 60 | 64 | |
| 61 | 65 | $db_info = array("Database" => $this->dbname, "UID" => $this->dbuser, "PWD" => $this->dbpass, "CharacterSet" => $this->dbchar); |
| 62 | 66 | $this->dbconn = sqlsrv_connect($this->dbhost, $db_info); |
@@ -114,9 +118,9 @@ discard block |
||
| 114 | 118 | } |
| 115 | 119 | |
| 116 | 120 | $exec = sqlsrv_execute($stmt); |
| 121 | + } else { |
|
| 122 | + $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params, array( "Scrollable" => SQLSRV_CURSOR_KEYSET )); |
|
| 117 | 123 | } |
| 118 | - else |
|
| 119 | - $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params, array( "Scrollable" => SQLSRV_CURSOR_KEYSET )); |
|
| 120 | 124 | |
| 121 | 125 | if ($exec === false) |
| 122 | 126 | { |
@@ -136,8 +140,9 @@ discard block |
||
| 136 | 140 | $this->numFields = sqlsrv_num_fields($this->result); |
| 137 | 141 | $this->rowsAffected = sqlsrv_rows_affected($this->result); |
| 138 | 142 | |
| 139 | - if ($this->transac_mode) |
|
| 140 | - $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result; |
|
| 143 | + if ($this->transac_mode) { |
|
| 144 | + $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result; |
|
| 145 | + } |
|
| 141 | 146 | |
| 142 | 147 | return $this->result; |
| 143 | 148 | } |
@@ -204,9 +209,8 @@ discard block |
||
| 204 | 209 | { |
| 205 | 210 | $data[] = $row; |
| 206 | 211 | } |
| 207 | - } |
|
| 208 | - else |
|
| 209 | - /* |
|
| 212 | + } else { |
|
| 213 | + /* |
|
| 210 | 214 | * "This kind of exception should lead directly to a fix in your code" |
| 211 | 215 | * So much production tests tell us this error is throwed because developers |
| 212 | 216 | * execute toArray() before execute(). |
@@ -214,6 +218,7 @@ discard block |
||
| 214 | 218 | * Ref: http://php.net/manual/en/class.logicexception.php |
| 215 | 219 | */ |
| 216 | 220 | throw new \LogicException('There are not data in the buffer!'); |
| 221 | + } |
|
| 217 | 222 | |
| 218 | 223 | $this->arrayResult = $data; |
| 219 | 224 | |
@@ -227,7 +232,8 @@ discard block |
||
| 227 | 232 | */ |
| 228 | 233 | public function __destruct() |
| 229 | 234 | { |
| 230 | - if ($this->dbconn) |
|
| 231 | - sqlsrv_close($this->dbconn); |
|
| 235 | + if ($this->dbconn) { |
|
| 236 | + sqlsrv_close($this->dbconn); |
|
| 237 | + } |
|
| 232 | 238 | } |
| 233 | 239 | } |
| 234 | 240 | \ No newline at end of file |