@@ -44,7 +44,6 @@ |
||
44 | 44 | /** |
45 | 45 | * Binding params for the query, mutiple arguments support. |
46 | 46 | * |
47 | - * @param mixed $param |
|
48 | 47 | * @return Query |
49 | 48 | */ |
50 | 49 | public function bindParams() |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | public function bindParams() |
51 | 51 | { |
52 | 52 | $this->sqlPrepared = null; |
53 | - $this->params = func_get_args(); |
|
53 | + $this->params = func_get_args(); |
|
54 | 54 | |
55 | 55 | return $this; |
56 | 56 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | public function bindParamsFromArray(array $params) |
59 | 59 | { |
60 | 60 | $this->sqlPrepared = null; |
61 | - $this->params = $params; |
|
61 | + $this->params = $params; |
|
62 | 62 | |
63 | 63 | return $this; |
64 | 64 | } |
@@ -89,7 +89,8 @@ |
||
89 | 89 | break; |
90 | 90 | case 'array': |
91 | 91 | $nvalue = []; |
92 | - foreach ($value as $v) { |
|
92 | + foreach ($value as $v) |
|
93 | + { |
|
93 | 94 | $nvalue[] = $this->resolveValueForSql($v); |
94 | 95 | } |
95 | 96 | $value = implode(',', $nvalue); |
@@ -12,7 +12,8 @@ |
||
12 | 12 | } |
13 | 13 | |
14 | 14 | public function buildPacket() |
15 | - {} |
|
15 | + { |
|
16 | +} |
|
16 | 17 | |
17 | 18 | public function getSql() |
18 | 19 | { |
@@ -20,5 +20,6 @@ |
||
20 | 20 | * @inheritDoc |
21 | 21 | */ |
22 | 22 | public function buildPacket() |
23 | - {} |
|
23 | + { |
|
24 | +} |
|
24 | 25 | } |
@@ -20,7 +20,8 @@ |
||
20 | 20 | * @inheritDoc |
21 | 21 | */ |
22 | 22 | public function buildPacket() |
23 | - {} |
|
23 | + { |
|
24 | +} |
|
24 | 25 | |
25 | 26 | /** |
26 | 27 | * @override |
@@ -24,7 +24,7 @@ |
||
24 | 24 | |
25 | 25 | public function setQuery($query) |
26 | 26 | { |
27 | - if (! $query instanceof Query) |
|
27 | + if (!$query instanceof Query) |
|
28 | 28 | { |
29 | 29 | $query = new Query($query); |
30 | 30 | } |
@@ -43,5 +43,6 @@ |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | public function buildPacket() |
46 | - {} |
|
46 | + { |
|
47 | +} |
|
47 | 48 | } |
@@ -94,8 +94,8 @@ discard block |
||
94 | 94 | |
95 | 95 | public function start() |
96 | 96 | { |
97 | - $this->stream->on('data', [ $this, 'handleData' ]); |
|
98 | - $this->stream->on('close', [ $this, 'handleClose' ]); |
|
97 | + $this->stream->on('data', [$this, 'handleData']); |
|
98 | + $this->stream->on('close', [$this, 'handleClose']); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | public function handleNewCommand() |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | } |
257 | 257 | else |
258 | 258 | { |
259 | - ++ $this->rsState; |
|
259 | + ++$this->rsState; |
|
260 | 260 | } |
261 | 261 | } |
262 | 262 | //Data packet |
@@ -409,13 +409,13 @@ discard block |
||
409 | 409 | |
410 | 410 | public function restBuffer($len) |
411 | 411 | { |
412 | - if(strlen($this->buffer) === ($this->bufferPos+$len)) |
|
412 | + if (strlen($this->buffer) === ($this->bufferPos + $len)) |
|
413 | 413 | { |
414 | 414 | $this->buffer = ''; |
415 | 415 | } |
416 | 416 | else |
417 | 417 | { |
418 | - $this->buffer = substr($this->buffer,$this->bufferPos+$len); |
|
418 | + $this->buffer = substr($this->buffer, $this->bufferPos + $len); |
|
419 | 419 | } |
420 | 420 | $this->bufferPos = 0; |
421 | 421 | } |
@@ -84,6 +84,9 @@ discard block |
||
84 | 84 | |
85 | 85 | protected $queue; |
86 | 86 | |
87 | + /** |
|
88 | + * @param \Dazzle\MySQL\Executor $executor |
|
89 | + */ |
|
87 | 90 | public function __construct($stream, $executor) |
88 | 91 | { |
89 | 92 | $this->stream = $stream; |
@@ -106,6 +109,9 @@ discard block |
||
106 | 109 | } |
107 | 110 | } |
108 | 111 | |
112 | + /** |
|
113 | + * @param string $message |
|
114 | + */ |
|
109 | 115 | public function debug($message) |
110 | 116 | { |
111 | 117 | if ($this->debug) |
@@ -380,6 +386,9 @@ discard block |
||
380 | 386 | $this->buffer .= $str; |
381 | 387 | } |
382 | 388 | |
389 | + /** |
|
390 | + * @param string $str |
|
391 | + */ |
|
383 | 392 | public function prepend($str) |
384 | 393 | { |
385 | 394 | $this->buffer = $str . substr($this->buffer, $this->bufferPos); |
@@ -402,11 +411,17 @@ discard block |
||
402 | 411 | return $buffer; |
403 | 412 | } |
404 | 413 | |
414 | + /** |
|
415 | + * @param integer $len |
|
416 | + */ |
|
405 | 417 | public function skip($len) |
406 | 418 | { |
407 | 419 | $this->bufferPos += $len; |
408 | 420 | } |
409 | 421 | |
422 | + /** |
|
423 | + * @param double $len |
|
424 | + */ |
|
410 | 425 | public function restBuffer($len) |
411 | 426 | { |
412 | 427 | if(strlen($this->buffer) === ($this->bufferPos+$len)) |
@@ -425,6 +440,9 @@ discard block |
||
425 | 440 | return strlen($this->buffer) - $this->bufferPos; |
426 | 441 | } |
427 | 442 | |
443 | + /** |
|
444 | + * @param string $what |
|
445 | + */ |
|
428 | 446 | public function search($what) |
429 | 447 | { |
430 | 448 | if (($p = strpos($this->buffer, $what, $this->bufferPos)) !== false) |
@@ -466,6 +484,9 @@ discard block |
||
466 | 484 | $this->debug('Auth packet sent'); |
467 | 485 | } |
468 | 486 | |
487 | + /** |
|
488 | + * @param string $scramble |
|
489 | + */ |
|
469 | 490 | public function getAuthToken($scramble, $password = '') |
470 | 491 | { |
471 | 492 | if ($password === '') |
@@ -480,6 +501,7 @@ discard block |
||
480 | 501 | /** |
481 | 502 | * Builds length-encoded BinSupport string |
482 | 503 | * @param string String |
504 | + * @param string $s |
|
483 | 505 | * @return string Resulting BinSupport string |
484 | 506 | */ |
485 | 507 | public function buildLenEncodedBinSupport($s) |
@@ -555,6 +577,9 @@ discard block |
||
555 | 577 | return $this->read($l); |
556 | 578 | } |
557 | 579 | |
580 | + /** |
|
581 | + * @param string $packet |
|
582 | + */ |
|
558 | 583 | public function sendPacket($packet) |
559 | 584 | { |
560 | 585 | return $this->stream->write(BinSupport::int2bytes(3, strlen($packet), true) . chr($this->seq++) . $packet); |
@@ -105,12 +105,12 @@ discard block |
||
105 | 105 | $options = $this->config; |
106 | 106 | $streamRef = $this->stream; |
107 | 107 | |
108 | - $errorHandler = function ($reason) use ($reject) { |
|
108 | + $errorHandler = function($reason) use ($reject) { |
|
109 | 109 | $this->state = self::STATE_AUTH_FAILED; |
110 | 110 | return $reject($reason); |
111 | 111 | }; |
112 | 112 | |
113 | - $connectedHandler = function ($serverOptions) use ($resolve) { |
|
113 | + $connectedHandler = function($serverOptions) use ($resolve) { |
|
114 | 114 | $this->state = self::STATE_AUTH_SUCCEEDED; |
115 | 115 | $this->serverOptions = $serverOptions; |
116 | 116 | return $resolve($serverOptions); |
@@ -118,11 +118,11 @@ discard block |
||
118 | 118 | |
119 | 119 | $this |
120 | 120 | ->connect() |
121 | - ->then(function ($stream) use (&$streamRef, $options, $errorHandler, $connectedHandler) { |
|
121 | + ->then(function($stream) use (&$streamRef, $options, $errorHandler, $connectedHandler) { |
|
122 | 122 | $streamRef = $stream; |
123 | 123 | |
124 | - $stream->on('error', [ $this, 'handleConnectionError' ]); |
|
125 | - $stream->on('close', [ $this, 'handleConnectionClosed' ]); |
|
124 | + $stream->on('error', [$this, 'handleConnectionError']); |
|
125 | + $stream->on('close', [$this, 'handleConnectionClosed']); |
|
126 | 126 | |
127 | 127 | $parser = $this->parser = new ProtocolParser($stream, $this->executor); |
128 | 128 | |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | //$parser->on('close', $closeHandler); |
136 | 136 | $parser->start(); |
137 | 137 | |
138 | - }, [ $this, 'handleConnectionError' ]); |
|
138 | + }, [$this, 'handleConnectionError']); |
|
139 | 139 | }); |
140 | 140 | } |
141 | 141 | |
@@ -150,8 +150,8 @@ discard block |
||
150 | 150 | ->doCommand(new QuitCommand($this)) |
151 | 151 | ->on('success', function() use($resolve) { |
152 | 152 | $this->state = self::STATE_STOPPED; |
153 | - $this->emit('end', [ $this ]); |
|
154 | - $this->emit('close', [ $this ]); |
|
153 | + $this->emit('end', [$this]); |
|
154 | + $this->emit('close', [$this]); |
|
155 | 155 | $resolve($this); |
156 | 156 | }); |
157 | 157 | $this->state = self::STATE_CLOSEING; |
@@ -175,15 +175,15 @@ discard block |
||
175 | 175 | $query->bindParamsFromArray($sqlParams); |
176 | 176 | $this->doCommand($command); |
177 | 177 | |
178 | - $command->on('results', function ($rows, $command) use ($promise) { |
|
178 | + $command->on('results', function($rows, $command) use ($promise) { |
|
179 | 179 | return $command->hasError() |
180 | 180 | ? $promise->reject($command->getError()) |
181 | 181 | : $promise->resolve($command); |
182 | 182 | }); |
183 | - $command->on('error', function ($err, $command) use ($promise) { |
|
183 | + $command->on('error', function($err, $command) use ($promise) { |
|
184 | 184 | return $promise->reject($err); |
185 | 185 | }); |
186 | - $command->on('success', function ($command) use ($promise) { |
|
186 | + $command->on('success', function($command) use ($promise) { |
|
187 | 187 | return $command->hasError() |
188 | 188 | ? $promise->reject($command->getError()) |
189 | 189 | : $promise->resolve($command); |
@@ -197,10 +197,10 @@ discard block |
||
197 | 197 | $promise = new Promise(); |
198 | 198 | |
199 | 199 | $this->doCommand(new PingCommand($this)) |
200 | - ->on('error', function ($reason) use ($promise) { |
|
200 | + ->on('error', function($reason) use ($promise) { |
|
201 | 201 | return $promise->reject($reason); |
202 | 202 | }) |
203 | - ->on('success', function () use ($promise) { |
|
203 | + ->on('success', function() use ($promise) { |
|
204 | 204 | return $promise->resolve(); |
205 | 205 | }); |
206 | 206 | } |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | |
235 | 235 | public function handleConnectionError($err) |
236 | 236 | { |
237 | - $this->emit('error', [ $err, $this ]); |
|
237 | + $this->emit('error', [$err, $this]); |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | public function handleConnectionClosed() |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | if ($this->state < self::STATE_CLOSEING) |
243 | 243 | { |
244 | 244 | $this->state = self::STATE_STOPPED; |
245 | - $this->emit('error', [ new RuntimeException('mysql server has gone away'), $this ]); |
|
245 | + $this->emit('error', [new RuntimeException('mysql server has gone away'), $this]); |
|
246 | 246 | } |
247 | 247 | } |
248 | 248 |