dazzle-php / mysql

src/MySQL/Protocol/ProtocolParser.php

Doc Comments +25 added lines

@@ -84,6 +84,9 @@ 
 
     protected $queue;
 
+    /**
+     * @param \Dazzle\MySQL\Executor $executor
+     */
     public function __construct($stream, $executor)
     {
         $this->stream   = $stream;
@@ -106,6 +109,9 @@ 
         }
     }
 
+    /**
+     * @param string $message
+     */
     public function debug($message)
     {
         if ($this->debug)
@@ -380,6 +386,9 @@ 
         $this->buffer .= $str;
     }
 
+    /**
+     * @param string $str
+     */
     public function prepend($str)
     {
         $this->buffer = $str . substr($this->buffer, $this->bufferPos);
@@ -402,11 +411,17 @@ 
         return $buffer;
     }
 
+    /**
+     * @param integer $len
+     */
     public function skip($len)
     {
         $this->bufferPos += $len;
     }
 
+    /**
+     * @param double $len
+     */
     public function restBuffer($len)
     {
         if(strlen($this->buffer) === ($this->bufferPos+$len))
@@ -425,6 +440,9 @@ 
         return strlen($this->buffer) - $this->bufferPos;
     }
 
+    /**
+     * @param string $what
+     */
     public function search($what)
     {
         if (($p = strpos($this->buffer, $what, $this->bufferPos)) !== false)
@@ -466,6 +484,9 @@ 
         $this->debug('Auth packet sent');
     }
 
+    /**
+     * @param string $scramble
+     */
     public function getAuthToken($scramble, $password = '')
     {
         if ($password === '')
@@ -480,6 +501,7 @@ 
     /**
      * Builds length-encoded BinarySupport string
      * @param string String
+     * @param string $s
      * @return string Resulting BinarySupport string
      */
     public function buildLenEncodedBinarySupport($s)
@@ -555,6 +577,9 @@ 
         return $this->read($l);
     }
 
+    /**
+     * @param string $packet
+     */
     public function sendPacket($packet)
     {
         return $this->stream->write(BinarySupport::int2bytes(3, strlen($packet), true) . chr($this->seq++) . $packet);

Spacing +5 added lines, -5 removed lines

@@ -94,8 +94,8 @@ 
 
     public function start()
     {
-        $this->stream->on('data', [ $this, 'handleData' ]);
-        $this->stream->on('close', [ $this, 'handleClose' ]);
+        $this->stream->on('data', [$this, 'handleData']);
+        $this->stream->on('close', [$this, 'handleClose']);
     }
 
     public function handleNewCommand()
@@ -256,7 +256,7 @@ 
                 }
                 else
                 {
-                    ++ $this->rsState;
+                    ++$this->rsState;
                 }
             }
             //Data packet
@@ -409,13 +409,13 @@ 
 
     public function restBuffer($len)
     {
-        if(strlen($this->buffer) === ($this->bufferPos+$len))
+        if (strlen($this->buffer) === ($this->bufferPos + $len))
         {
             $this->buffer = '';
         }
         else
         {
-            $this->buffer = substr($this->buffer,$this->bufferPos+$len);
+            $this->buffer = substr($this->buffer, $this->bufferPos + $len);
         }
         $this->bufferPos = 0;
     }

src/MySQL/Database.php

Spacing +15 added lines, -15 removed lines

@@ -105,12 +105,12 @@ 
             $options = $this->config;
             $streamRef = $this->stream;
 
-            $errorHandler = function ($reason) use ($reject) {
+            $errorHandler = function($reason) use ($reject) {
                 $this->state = self::STATE_AUTH_FAILED;
                 return $reject($reason);
             };
 
-            $connectedHandler = function ($serverOptions) use ($resolve) {
+            $connectedHandler = function($serverOptions) use ($resolve) {
                 $this->state = self::STATE_AUTH_SUCCEEDED;
                 $this->serverOptions = $serverOptions;
                 return $resolve($serverOptions);
@@ -118,11 +118,11 @@ 
 
             $this
                 ->connect()
-                ->then(function ($stream) use (&$streamRef, $options, $errorHandler, $connectedHandler) {
+                ->then(function($stream) use (&$streamRef, $options, $errorHandler, $connectedHandler) {
                     $streamRef = $stream;
 
-                    $stream->on('error', [ $this, 'handleConnectionError' ]);
-                    $stream->on('close', [ $this, 'handleConnectionClosed' ]);
+                    $stream->on('error', [$this, 'handleConnectionError']);
+                    $stream->on('close', [$this, 'handleConnectionClosed']);
 
                     $parser = $this->parser = new ProtocolParser($stream, $this->executor);
 
@@ -135,7 +135,7 @@ 
                     //$parser->on('close', $closeHandler);
                     $parser->start();
 
-                }, [ $this, 'handleConnectionError' ]);
+                }, [$this, 'handleConnectionError']);
         });
     }
 
@@ -150,8 +150,8 @@ 
                 ->doCommand(new QuitCommand($this))
                 ->on('success', function() use($resolve) {
                     $this->state = self::STATE_STOPPED;
-                    $this->emit('end', [ $this ]);
-                    $this->emit('close', [ $this ]);
+                    $this->emit('end', [$this]);
+                    $this->emit('close', [$this]);
                     $resolve($this);
                 });
             $this->state = self::STATE_CLOSEING;
@@ -175,13 +175,13 @@ 
         $query->bindParamsFromArray($sqlParams);
         $this->doCommand($command);
 
-        $command->on('results', function ($rows, $command) use ($promise) {
+        $command->on('results', function($rows, $command) use ($promise) {
             return $promise->resolve($command);
         });
-        $command->on('error', function ($err, $command) use ($promise) {
+        $command->on('error', function($err, $command) use ($promise) {
             return $promise->reject($err);
         });
-        $command->on('success', function ($command) use ($promise) {
+        $command->on('success', function($command) use ($promise) {
             return $promise->resolve($command);
         });
 
@@ -193,10 +193,10 @@ 
         $promise = new Promise();
 
         $this->doCommand(new PingCommand($this))
-            ->on('error', function ($reason) use ($promise) {
+            ->on('error', function($reason) use ($promise) {
                 return $promise->reject($reason);
             })
-            ->on('success', function () use ($promise) {
+            ->on('success', function() use ($promise) {
                 return $promise->resolve();
             });
     }
@@ -230,7 +230,7 @@ 
 
     public function handleConnectionError($err)
     {
-        $this->emit('error', [ $err, $this ]);
+        $this->emit('error', [$err, $this]);
     }
 
     public function handleConnectionClosed()
@@ -238,7 +238,7 @@ 
         if ($this->state < self::STATE_CLOSEING)
         {
             $this->state = self::STATE_STOPPED;
-            $this->emit('error', [ new RuntimeException('mysql server has gone away'), $this ]);
+            $this->emit('error', [new RuntimeException('mysql server has gone away'), $this]);
         }
     }