dazzle-php / mysql

src/MySQL/Protocol/Support/BinarySupport.php

Doc Comments +1 added lines

@@ -382,6 +382,7 @@
 
     /**
      * @see BinarySupport::int2bytes
+     * @param integer $bytes
      */
     public static function i2b($bytes, $int = 0, $l = false)
     {

Braces +47 added lines, -21 removed lines

@@ -20,7 +20,8 @@ 
         {
             $r .= chr(strlen($e[$i])) . $e[$i];
         }
-        if (static::binarySubstr($r, -1) !== "\x00") {
+        if (static::binarySubstr($r, -1) !== "\x00")
+        {
             $r .= "\x00";
         }
         return $r;
@@ -40,7 +41,8 @@ 
         {
             $l = ord($data[0]);
 
-            if ($l >= 192) {
+            if ($l >= 192)
+            {
                 $pos  = static::bytes2int(chr($l - 192) . static::binarySubstr($data, 1, 1));
                 $data = static::binarySubstr($data, 2);
                 $ref  = static::binarySubstr($orig, $pos);
@@ -51,7 +53,8 @@ 
             $p = substr($data, 1, $l);
             $str .= $p . (($l !== 0) ? '.' : '');
             $data = substr($data, $l + 1);
-            if ($l === 0) {
+            if ($l === 0)
+            {
                 break;
             }
         }
@@ -68,7 +71,8 @@ 
     public static function LV($str, $len = 1, $lrev = false)
     {
         $l = static::i2b($len, strlen($str));
-        if ($lrev) {
+        if ($lrev)
+        {
             $l = strrev($l);
         }
         return $l . $str;
@@ -216,7 +220,8 @@ 
     {
         $r = static::binarySubstr($p, 0, 2);
         $p = static::binarySubstr($p, 2);
-        if ($l) {
+        if ($l)
+        {
             $r = strrev($r);
         }
         return $r;
@@ -262,7 +267,8 @@ 
     public static function getStrQWord(&$p, $l = false)
     {
         $r = static::binarySubstr($p, 0, 8);
-        if ($l) {
+        if ($l)
+        {
             $r = strrev($r);
         }
         $p = static::binarySubstr($p, 8);
@@ -279,7 +285,8 @@ 
     public static function getString(&$str)
     {
         $p = strpos($str, "\x00");
-        if ($p === false) {
+        if ($p === false)
+        {
             return '';
         }
         $r   = static::binarySubstr($str, 0, $p);
@@ -302,19 +309,26 @@ 
         $s = static::b2i(static::binarySubstr($p, 0, $l), !!$lrev);
         $p = static::binarySubstr($p, $l);
 
-        if ($s == 0) {
+        if ($s == 0)
+        {
             return '';
         }
 
         $r = '';
 
-        if (strlen($p) < $s) {
+        if (strlen($p) < $s)
+        {
             echo("getLV error: buf length (" . strlen($p) . "): " . Debug::exportBytes($p) . ", must be >= string length (" . $s . ")\n");
 
-        } else if ($nul) {
-            if ($p{$s - 1} != "\x00") {
+        }
+        else if ($nul)
+        {
+            if ($p{$s - 1} != "\x00")
+            {
                 echo("getLV error: Wrong end of NUL-string (" . Debug::exportBytes($p{$s - 1}) . "), len " . $s . "\n");
-            } else {
+            }
+            else
+            {
                 $d = $s - 1;
                 if ($d < 0)
                 {
@@ -324,7 +338,9 @@ 
                 $p = static::binarySubstr($p, $s);
             }
 
-        } else {
+        }
+        else
+        {
             $r = static::binarySubstr($p, 0, $s);
             $p = static::binarySubstr($p, $s);
         }
@@ -344,11 +360,15 @@ 
     {
         $hexstr = dechex($int);
 
-        if ($len === null) {
-            if (strlen($hexstr) % 2) {
+        if ($len === null)
+        {
+            if (strlen($hexstr) % 2)
+            {
                 $hexstr = "0" . $hexstr;
             }
-        } else {
+        }
+        else
+        {
             $hexstr = str_repeat('0', $len * 2 - strlen($hexstr)) . $hexstr;
         }
 
@@ -397,7 +417,8 @@ 
      */
     public static function bytes2int($str, $l = false)
     {
-        if ($l) {
+        if ($l)
+        {
             $str = strrev($str);
         }
 
@@ -437,7 +458,8 @@ 
         {
             $r .= chr((int) bindec(static::binarySubstr($bitmap, $i * 8, 8)));
         }
-        if ($checkLen && (strlen($r) != $checkLen)) {
+        if ($checkLen && (strlen($r) != $checkLen))
+        {
             throw new Exception('Warning! Bitmap incorrect.');
         }
 
@@ -465,13 +487,17 @@ 
      */
     protected static function binarySubstr($s, $p, $len = null)
     {
-        if ($len === null) {
+        if ($len === null)
+        {
             $ret = substr($s, $p);
-        } else {
+        }
+        else
+        {
             $ret = substr($s, $p, $len);
         }
 
-        if ($ret === false) {
+        if ($ret === false)
+        {
             $ret = '';
         }
 

src/MySQL/Query.php

Doc Comments -1 removed lines

@@ -44,7 +44,6 @@
     /**
      * Binding params for the query, mutiple arguments support.
      *
-     * @param  mixed              $param
      * @return Query
      */
     public function bindParams()

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     public function bindParams()
     {
         $this->sqlPrepared = null;
-        $this->params   = func_get_args();
+        $this->params = func_get_args();
 
         return $this;
     }
@@ -58,7 +58,7 @@ 
     public function bindParamsFromArray(array $params)
     {
         $this->sqlPrepared = null;
-        $this->params   = $params;
+        $this->params = $params;
 
         return $this;
     }

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);

src/MySQL/Command/Concrete/QuitCommand.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
     }
 
     public function buildPacket()
-    {}
+    {
+}
 
     public function getSql()
     {

src/MySQL/Command/Concrete/AuthCommand.php

Braces +2 added lines, -1 removed lines

@@ -20,5 +20,6 @@
      * @inheritDoc
      */
     public function buildPacket()
-    {}
+    {
+}
 }

src/MySQL/Command/Concrete/PingCommand.php

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
      * @inheritDoc
      */
     public function buildPacket()
-    {}
+    {
+}
 
     /**
      * @override

src/MySQL/Command/Concrete/QueryCommand.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
     public function setQuery($query)
     {
-        if (! $query instanceof Query)
+        if (!$query instanceof Query)
         {
             $query = new Query($query);
         }

Braces +2 added lines, -1 removed lines

@@ -43,5 +43,6 @@
     }
 
     public function buildPacket()
-    {}
+    {
+}
 }

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]);
         }
     }