dazzle-php / mysql

src/MySQL/Protocol/ProtocolParser.php

Doc Comments +19 added lines

@@ -165,6 +165,9 @@ 
         }
     }
 
+    /**
+     * @param string $message
+     */
     public function debug($message)
     {
         if ($this->debug)
@@ -426,6 +429,9 @@ 
         $this->buffer .= $str;
     }
 
+    /**
+     * @param string $str
+     */
     public function prepend($str)
     {
         $this->buffer = $str . substr($this->buffer, $this->bufferPos);
@@ -448,11 +454,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))
@@ -471,6 +483,9 @@ 
         return strlen($this->buffer) - $this->bufferPos;
     }
 
+    /**
+     * @param string $what
+     */
     public function search($what)
     {
         if (($p = strpos($this->buffer, $what, $this->bufferPos)) !== false)
@@ -512,6 +527,9 @@ 
         $this->debug('Auth packet sent');
     }
 
+    /**
+     * @param string $scramble
+     */
     public function getAuthToken($scramble, $password = '')
     {
         if ($password === '')
@@ -526,6 +544,7 @@ 
     /**
      * Builds length-encoded BinSupport string
      * @param string String
+     * @param string $s
      * @return string Resulting BinSupport string
      */
     public function buildLenEncodedBinSupport($s)

Spacing +21 added lines, -21 removed lines

@@ -18,17 +18,17 @@ 
     /**
      * @var int
      */
-    const PHASE_INIT       = 1;
+    const PHASE_INIT = 1;
 
     /**
      * @var int
      */
-    const PHASE_AUTH_SENT  = 2;
+    const PHASE_AUTH_SENT = 2;
 
     /**
      * @var int
      */
-    const PHASE_AUTH_ERR   = 3;
+    const PHASE_AUTH_ERR = 3;
 
     /**
      * @var int
@@ -38,17 +38,17 @@ 
     /**
      * @var int
      */
-    const RS_STATE_HEADER  = 0;
+    const RS_STATE_HEADER = 0;
 
     /**
      * @var int
      */
-    const RS_STATE_FIELD   = 1;
+    const RS_STATE_FIELD = 1;
 
     /**
      * @var int
      */
-    const RS_STATE_ROW     = 2;
+    const RS_STATE_ROW = 2;
 
     /**
      * @var int
@@ -58,22 +58,22 @@ 
     /**
      * @var int
      */
-    const STATE_BODY    = 1;
+    const STATE_BODY = 1;
 
     /**
      * @var string
      */
-    protected $user     = 'root';
+    protected $user = 'root';
 
     /**
      * @var string
      */
-    protected $pass     = '';
+    protected $pass = '';
 
     /**
      * @var string
      */
-    protected $dbname   = '';
+    protected $dbname = '';
 
     /**
      * @var CommandInterface
@@ -148,13 +148,13 @@ 
         $this->executor = $executor;
         $this->queue    = new SplQueue($this);
         $this->configure($config);
-        $executor->on('new', [ $this, 'handleNewCommand' ]);
+        $executor->on('new', [$this, 'handleNewCommand']);
     }
 
     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()
@@ -304,7 +304,7 @@ 
                 }
                 else
                 {
-                    ++ $this->rsState;
+                    ++$this->rsState;
                 }
             }
             //Data packet
@@ -372,7 +372,7 @@ 
         $command = $this->queue->dequeue();
         $error = new Exception($this->errmsg, $this->errno);
         $command->setError($error);
-        $command->emit('error', [ $command, $error ]);
+        $command->emit('error', [$command, $error]);
         $this->errmsg = '';
         $this->errno  = 0;
     }
@@ -384,7 +384,7 @@ 
         $command->resultRows   = $this->resultRows;
         $command->resultFields = $this->resultFields;
 
-        $command->emit('success', [ $command, $this->resultRows ]);
+        $command->emit('success', [$command, $this->resultRows]);
 
         $this->rsState      = self::RS_STATE_HEADER;
         $this->resultRows   = $this->resultFields = [];
@@ -399,13 +399,13 @@ 
         $command->warnCount    = $this->warnCount;
         $command->message      = $this->message;
 
-        $command->emit('success', [ $command ]);
+        $command->emit('success', [$command]);
     }
 
     protected function onAuthenticated()
     {
         $command = $this->queue->dequeue();
-        $command->emit('success', [ $command, $this->connectOptions ]);
+        $command->emit('success', [$command, $this->connectOptions]);
     }
 
     protected function handleClose()
@@ -416,7 +416,7 @@ 
             $command = $this->queue->dequeue();
             if ($command->equals(Command::QUIT))
             {
-                $command->emit('success', [ $command ]);
+                $command->emit('success', [$command]);
             }
         }
     }
@@ -455,13 +455,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/Protocol/Query.php

Braces +2 added lines, -1 removed lines

@@ -89,7 +89,8 @@
                 break;
             case 'array':
                 $nvalue = [];
-                foreach ($value as $v) {
+                foreach ($value as $v)
+                {
                     $nvalue[] = $this->resolveValueForSql($v);
                 }
                 $value = implode(',', $nvalue);

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
         $params = array_values($this->params);
         $size = count($params);
 
-        for ($i=0; $i<$size; $i++)
+        for ($i = 0; $i < $size; $i++)
         {
             $sql = preg_replace('#' . $keys[$i] . '#', $this->resolveValueForSql($params[$i]), $sql, 1);
         }

src/MySQL/Protocol/Command.php

Braces +2 added lines, -1 removed lines

@@ -267,7 +267,8 @@
     }
 
     public function buildPacket()
-    {}
+    {
+}
 
     public function getState($name, $default = null)
     {

src/MySQL/Transaction.php

Spacing +6 added lines, -6 removed lines

@@ -63,10 +63,10 @@ 
         $query   = new Query($sql, $sqlParams);
         $command = new QueryCommand($this->database, $query);
 
-        $this->on('error', function ($trans, $err) use ($promise) {
+        $this->on('error', function($trans, $err) use ($promise) {
             return $promise->reject($err);
         });
-        $this->on('success', function ($trans) use ($promise, $command) {
+        $this->on('success', function($trans) use ($promise, $command) {
             return $promise->resolve($command);
         });
 
@@ -97,15 +97,15 @@ 
 
         $promise = new Promise();
 
-        $this->on('error', function ($trans, $err) use ($promise) {
+        $this->on('error', function($trans, $err) use ($promise) {
             return $promise->reject($err);
         });
-        $this->on('success', function ($trans) use ($promise) {
+        $this->on('success', function($trans) use ($promise) {
             return $promise->resolve();
         });
 
         $this->open = false;
-        $this->emit('commit', [ $this, $this->queue ]);
+        $this->emit('commit', [$this, $this->queue]);
         $this->queue = [];
 
         return $promise;
@@ -123,7 +123,7 @@ 
         }
 
         $this->open = false;
-        $this->emit('rollback', [ $this ]);
+        $this->emit('rollback', [$this]);
         $this->queue = [];
 
         return Promise::doResolve();

src/MySQL/Database.php

Spacing +24 added lines, -24 removed lines

@@ -33,42 +33,42 @@ 
     /**
      * @var int
      */
-    const STATE_INIT                 = 0;
+    const STATE_INIT = 0;
 
     /**
      * @var int
      */
-    const STATE_CONNECT_PENDING      = 4;
+    const STATE_CONNECT_PENDING = 4;
 
     /**
      * @var int
      */
-    const STATE_CONNECT_FAILED       = 2;
+    const STATE_CONNECT_FAILED = 2;
 
     /**
      * @var int
      */
-    const STATE_CONNECT_SUCCEEDED    = 6;
+    const STATE_CONNECT_SUCCEEDED = 6;
 
     /**
      * @var int
      */
-    const STATE_AUTH_PENDING         = 5;
+    const STATE_AUTH_PENDING = 5;
 
     /**
      * @var int
      */
-    const STATE_AUTH_FAILED          = 3;
+    const STATE_AUTH_FAILED = 3;
 
     /**
      * @var int
      */
-    const STATE_AUTH_SUCCEEDED       = 7;
+    const STATE_AUTH_SUCCEEDED = 7;
 
     /**
      * @var int
      */
-    const STATE_DISCONNECT_PENDING   = 8;
+    const STATE_DISCONNECT_PENDING = 8;
 
     /**
      * @var int
@@ -179,12 +179,12 @@ 
         $this->state = self::STATE_CONNECT_PENDING;
         $config = $this->config;
 
-        $errorHandler = function ($command, $reason) use ($promise) {
+        $errorHandler = function($command, $reason) use ($promise) {
             $this->state = self::STATE_AUTH_FAILED;
             return $promise->reject($reason);
         };
 
-        $connectedHandler = function ($command, $info) use ($promise) {
+        $connectedHandler = function($command, $info) use ($promise) {
             $this->state = self::STATE_AUTH_SUCCEEDED;
             $this->serverInfo = $info;
             return $promise->resolve($info);
@@ -195,8 +195,8 @@ 
             ->then(function($stream) use ($config, $errorHandler, $connectedHandler) {
                 $this->stream = $stream;
 
-                $stream->on('error', [ $this, 'handleSocketError' ]);
-                $stream->on('close', [ $this, 'handleSocketClose' ]);
+                $stream->on('error', [$this, 'handleSocketError']);
+                $stream->on('close', [$this, 'handleSocketClose']);
 
                 $this->state  = self::STATE_AUTH_PENDING;
                 $this->parser = new ProtocolParser($stream, $this->queue, $config);
@@ -207,7 +207,7 @@ 
 
                 $this->parser->start();
             })
-            ->done(null, [ $this, 'handleError' ]);
+            ->done(null, [$this, 'handleError']);
 
         return $promise;
     }
@@ -227,7 +227,7 @@ 
                 ->doCommand(new QuitCommand($this))
                 ->on('success', function() use($resolve) {
                     $this->state = self::STATE_DISCONNECT_SUCCEEDED;
-                    $this->emit('stop', [ $this ]);
+                    $this->emit('stop', [$this]);
                     $resolve($this);
                 });
             $this->state = self::STATE_DISCONNECT_PENDING;
@@ -282,10 +282,10 @@ 
 
         $this->doCommand($command);
 
-        $command->on('error', function ($command, $err) use ($promise) {
+        $command->on('error', function($command, $err) use ($promise) {
             return $promise->reject($err);
         });
-        $command->on('success', function ($command) use ($promise) {
+        $command->on('success', function($command) use ($promise) {
             return $promise->resolve($command);
         });
 
@@ -312,10 +312,10 @@ 
         $promise = new Promise();
 
         $command = $this->doCommand(new PingCommand($this));
-        $command->on('error', function ($command, $reason) use ($promise) {
+        $command->on('error', function($command, $reason) use ($promise) {
             return $promise->reject($reason);
         });
-        $command->on('success', function () use ($promise) {
+        $command->on('success', function() use ($promise) {
             return $promise->resolve();
         });
 
@@ -333,10 +333,10 @@ 
         $trans->on('commit', function(TransactionInterface $trans, array $queue) {
             $this->commitTransaction($queue)->then(
                 function() use($trans) {
-                    return $trans->emit('success', [ $trans ]);
+                    return $trans->emit('success', [$trans]);
                 },
                 function($ex) use($trans) {
-                    return $trans->emit('error', [ $trans, $ex ]);
+                    return $trans->emit('error', [$trans, $ex]);
                 }
             );
             $this->transBox->remove($trans);
@@ -374,7 +374,7 @@ 
         $size = 0;
         $sizeCap = count($queue);
 
-        for ($i=0; $i<$sizeCap; $i++)
+        for ($i = 0; $i < $sizeCap; $i++)
         {
             $command = $this->doCommand($queue[$i]);
             $command->on('error', function($command, $err) use(&$ex, $promise) {
@@ -416,7 +416,7 @@ 
      */
     public function handleError($err)
     {
-        $this->emit('error', [ $this, $err ]);
+        $this->emit('error', [$this, $err]);
     }
 
     /**
@@ -424,7 +424,7 @@ 
      */
     public function handleSocketError($socket, $err)
     {
-        $this->emit('error', [ $this, $err ]);
+        $this->emit('error', [$this, $err]);
     }
 
     /**
@@ -435,7 +435,7 @@ 
         if ($this->state < self::STATE_DISCONNECT_PENDING)
         {
             $this->state = self::STATE_DISCONNECT_SUCCEEDED;
-            $this->emit('error', [ $this, new RuntimeException('MySQL server has gone away!') ]);
+            $this->emit('error', [$this, new RuntimeException('MySQL server has gone away!')]);
         }
     }