@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | /** |
| 48 | 48 | * @var array |
| 49 | 49 | */ |
| 50 | - private $parameters = []; |
|
| 50 | + private $parameters = [ ]; |
|
| 51 | 51 | |
| 52 | 52 | /** |
| 53 | 53 | * @var string; |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $column = null; |
| 102 | 102 | |
| 103 | 103 | foreach ( $Columns as $cells ) { |
| 104 | - $column[] = $cells[ 0 ]; |
|
| 104 | + $column[ ] = $cells[ 0 ]; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | return $column; |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | * @param array $parameters |
| 177 | 177 | * @throws DbException |
| 178 | 178 | */ |
| 179 | - private function queryInit( $query, $parameters = [] ) |
|
| 179 | + private function queryInit( $query, $parameters = [ ] ) |
|
| 180 | 180 | { |
| 181 | 181 | $this->lastStatement = self::getQueryStatement( $query ); |
| 182 | 182 | $this->pdo = DbConnect::getInstance()->getConnection( $this->lastStatement ); |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | $this->bindMore( $parameters ); |
| 197 | 197 | else |
| 198 | 198 | foreach ( $parameters as $key => $val ) |
| 199 | - $this->parameters[] = array( $key + 1, $val ); |
|
| 199 | + $this->parameters[ ] = array( $key + 1, $val ); |
|
| 200 | 200 | |
| 201 | 201 | if ( count( $this->parameters ) ) { |
| 202 | 202 | foreach ( $this->parameters as $param => $value ) { |
@@ -93,8 +93,9 @@ discard block |
||
| 93 | 93 | { |
| 94 | 94 | $this->queryInit( $query, $params ); |
| 95 | 95 | |
| 96 | - if ( $this->lastStatement === self::QUERY_TYPE_EXPLAIN ) |
|
| 97 | - return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC ); |
|
| 96 | + if ( $this->lastStatement === self::QUERY_TYPE_EXPLAIN ) { |
|
| 97 | + return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC ); |
|
| 98 | + } |
|
| 98 | 99 | |
| 99 | 100 | $Columns = $this->sQuery->fetchAll( \PDO::FETCH_NUM ); |
| 100 | 101 | |
@@ -117,8 +118,9 @@ discard block |
||
| 117 | 118 | { |
| 118 | 119 | $this->queryInit( $query, $params ); |
| 119 | 120 | |
| 120 | - if ( $this->lastStatement === self::QUERY_TYPE_EXPLAIN ) |
|
| 121 | - return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC ); |
|
| 121 | + if ( $this->lastStatement === self::QUERY_TYPE_EXPLAIN ) { |
|
| 122 | + return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC ); |
|
| 123 | + } |
|
| 122 | 124 | |
| 123 | 125 | $result = $this->sQuery->fetch( $fetchmode ); |
| 124 | 126 | $this->sQuery->closeCursor(); // Frees up the connection to the server so that other SQL statements may be issued, |
@@ -135,8 +137,9 @@ discard block |
||
| 135 | 137 | { |
| 136 | 138 | $this->queryInit( $query, $params ); |
| 137 | 139 | |
| 138 | - if ( $this->lastStatement === self::QUERY_TYPE_EXPLAIN ) |
|
| 139 | - return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC ); |
|
| 140 | + if ( $this->lastStatement === self::QUERY_TYPE_EXPLAIN ) { |
|
| 141 | + return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC ); |
|
| 142 | + } |
|
| 140 | 143 | |
| 141 | 144 | $result = $this->sQuery->fetchColumn(); |
| 142 | 145 | $this->sQuery->closeCursor(); // Frees up the connection to the server so that other SQL statements may be issued |
@@ -192,24 +195,22 @@ discard block |
||
| 192 | 195 | /** |
| 193 | 196 | * Add parameters to the parameter array |
| 194 | 197 | */ |
| 195 | - if ( self::isArrayAssoc( $parameters ) ) |
|
| 196 | - $this->bindMore( $parameters ); |
|
| 197 | - else |
|
| 198 | - foreach ( $parameters as $key => $val ) |
|
| 198 | + if ( self::isArrayAssoc( $parameters ) ) { |
|
| 199 | + $this->bindMore( $parameters ); |
|
| 200 | + } else { |
|
| 201 | + foreach ( $parameters as $key => $val ) |
|
| 199 | 202 | $this->parameters[] = array( $key + 1, $val ); |
| 203 | + } |
|
| 200 | 204 | |
| 201 | 205 | if ( count( $this->parameters ) ) { |
| 202 | 206 | foreach ( $this->parameters as $param => $value ) { |
| 203 | 207 | if ( is_int( $value[ 1 ] ) ) { |
| 204 | 208 | $type = \PDO::PARAM_INT; |
| 205 | - } |
|
| 206 | - elseif ( is_bool( $value[ 1 ] ) ) { |
|
| 209 | + } elseif ( is_bool( $value[ 1 ] ) ) { |
|
| 207 | 210 | $type = \PDO::PARAM_BOOL; |
| 208 | - } |
|
| 209 | - elseif ( is_null( $value[ 1 ] ) ) { |
|
| 211 | + } elseif ( is_null( $value[ 1 ] ) ) { |
|
| 210 | 212 | $type = \PDO::PARAM_NULL; |
| 211 | - } |
|
| 212 | - else { |
|
| 213 | + } else { |
|
| 213 | 214 | $type = \PDO::PARAM_STR; |
| 214 | 215 | } |
| 215 | 216 | $this->sQuery->bindValue( $value[ 0 ], $value[ 1 ], $type ); |
@@ -288,8 +289,7 @@ discard block |
||
| 288 | 289 | default: |
| 289 | 290 | return self::QUERY_TYPE_OTHER; |
| 290 | 291 | } |
| 291 | - } |
|
| 292 | - else { |
|
| 292 | + } else { |
|
| 293 | 293 | return self::QUERY_TYPE_OTHER; |
| 294 | 294 | } |
| 295 | 295 | } |
@@ -300,8 +300,9 @@ discard block |
||
| 300 | 300 | */ |
| 301 | 301 | public static function isArrayAssoc( array $arr ) |
| 302 | 302 | { |
| 303 | - if ( array() === $arr ) |
|
| 304 | - return false; |
|
| 303 | + if ( array() === $arr ) { |
|
| 304 | + return false; |
|
| 305 | + } |
|
| 305 | 306 | |
| 306 | 307 | return array_keys( $arr ) !== range( 0, count( $arr ) - 1 ); |
| 307 | 308 | } |