@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | * (PHP 5 >= 5.0.0)<br/> |
| 125 | 125 | * Return the key of the current element |
| 126 | 126 | * @link http://php.net/manual/en/iterator.key.php |
| 127 | - * @return mixed scalar on success, or null on failure. |
|
| 127 | + * @return integer scalar on success, or null on failure. |
|
| 128 | 128 | */ |
| 129 | 129 | public function key() |
| 130 | 130 | { |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | * (PHP 5 >= 5.0.0)<br/> |
| 181 | 181 | * Return the current element |
| 182 | 182 | * @link http://php.net/manual/en/iterator.current.php |
| 183 | - * @return mixed Can return any type. |
|
| 183 | + * @return ResultSetInterface|null Can return any type. |
|
| 184 | 184 | */ |
| 185 | 185 | public function current() |
| 186 | 186 | { |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | * @param string $query The query string |
| 29 | 29 | * |
| 30 | 30 | * @throws DatabaseException |
| 31 | - * @return array|int The result array or number of rows affected |
|
| 31 | + * @return ResultSet The result array or number of rows affected |
|
| 32 | 32 | */ |
| 33 | 33 | public function query($query) |
| 34 | 34 | { |
@@ -36,11 +36,11 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | $stm = $this->connection->prepare($query); |
| 38 | 38 | |
| 39 | - try{ |
|
| 39 | + try { |
|
| 40 | 40 | $stm->execute(); |
| 41 | 41 | } |
| 42 | - catch(\PDOException $exception){ |
|
| 43 | - throw new DatabaseException($exception->getMessage() . ' [' . $query . ']'); |
|
| 42 | + catch (\PDOException $exception) { |
|
| 43 | + throw new DatabaseException($exception->getMessage().' ['.$query.']'); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | return ResultSet::make($stm); |
@@ -56,17 +56,17 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | $dsn = 'mysql:'; |
| 58 | 58 | if (isset($params['host']) && $params['host'] != '') { |
| 59 | - $dsn .= 'host=' . $params['host'] . ';'; |
|
| 59 | + $dsn .= 'host='.$params['host'].';'; |
|
| 60 | 60 | } |
| 61 | 61 | if (isset($params['port'])) { |
| 62 | - $dsn .= 'port=' . $params['port'] . ';'; |
|
| 62 | + $dsn .= 'port='.$params['port'].';'; |
|
| 63 | 63 | } |
| 64 | 64 | if (isset($params['charset'])) { |
| 65 | - $dsn .= 'charset=' . $params['charset'] . ';'; |
|
| 65 | + $dsn .= 'charset='.$params['charset'].';'; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | if (isset($params['socket']) && $params['socket'] != '') { |
| 69 | - $dsn .= 'unix_socket=' . $params['socket'] . ';'; |
|
| 69 | + $dsn .= 'unix_socket='.$params['socket'].';'; |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | try { |
@@ -109,24 +109,24 @@ discard block |
||
| 109 | 109 | $result = array(); |
| 110 | 110 | $count = 0; |
| 111 | 111 | |
| 112 | - if(version_compare(PHP_VERSION, '5.4.0', '>=')) |
|
| 112 | + if (version_compare(PHP_VERSION, '5.4.0', '>=')) |
|
| 113 | 113 | { |
| 114 | 114 | try { |
| 115 | 115 | $statement = $this->connection->query(implode(';', $queue)); |
| 116 | 116 | } catch (\PDOException $exception) { |
| 117 | - throw new DatabaseException($exception->getMessage() .' [ '.implode(';', $queue).']'); |
|
| 117 | + throw new DatabaseException($exception->getMessage().' [ '.implode(';', $queue).']'); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | return MultiResultSet::make($statement); |
| 121 | 121 | } |
| 122 | 122 | else |
| 123 | 123 | { |
| 124 | - foreach($queue as $sql) |
|
| 124 | + foreach ($queue as $sql) |
|
| 125 | 125 | { |
| 126 | 126 | try { |
| 127 | 127 | $statement = $this->connection->query($sql); |
| 128 | 128 | } catch (\PDOException $exception) { |
| 129 | - throw new DatabaseException($exception->getMessage() .' [ '.implode(';', $queue).']'); |
|
| 129 | + throw new DatabaseException($exception->getMessage().' [ '.implode(';', $queue).']'); |
|
| 130 | 130 | } |
| 131 | 131 | if ($statement->columnCount()) { |
| 132 | 132 | $set = ResultSet::make($statement); |
@@ -38,8 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | try{ |
| 40 | 40 | $stm->execute(); |
| 41 | - } |
|
| 42 | - catch(\PDOException $exception){ |
|
| 41 | + } catch(\PDOException $exception){ |
|
| 43 | 42 | throw new DatabaseException($exception->getMessage() . ' [' . $query . ']'); |
| 44 | 43 | } |
| 45 | 44 | |
@@ -118,8 +117,7 @@ discard block |
||
| 118 | 117 | } |
| 119 | 118 | |
| 120 | 119 | return MultiResultSet::make($statement); |
| 121 | - } |
|
| 122 | - else |
|
| 120 | + } else |
|
| 123 | 121 | { |
| 124 | 122 | foreach($queue as $sql) |
| 125 | 123 | { |
@@ -182,7 +182,7 @@ |
||
| 182 | 182 | * (PHP 5 >= 5.0.0)<br/> |
| 183 | 183 | * Return the key of the current element |
| 184 | 184 | * @link http://php.net/manual/en/iterator.key.php |
| 185 | - * @return mixed scalar on success, or null on failure. |
|
| 185 | + * @return integer scalar on success, or null on failure. |
|
| 186 | 186 | */ |
| 187 | 187 | public function key() |
| 188 | 188 | { |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | $fields = array(); |
| 47 | 47 | |
| 48 | 48 | for ($i = 0; $i < $this->statement->columnCount(); $i++) { |
| 49 | - $fields[] = (object)$this->statement->getColumnMeta($i); |
|
| 49 | + $fields[] = (object) $this->statement->getColumnMeta($i); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | return $fields; |