kakserpom / phpdaemon

lib/WebSocketProtocol.php

Spacing +5 added lines, -5 removed lines

@@ -23,11 +23,11 @@ 
 		if ($type === null) {
 			$type = 'STRING';
 		}
-	    $frametype = @constant($a = get_class($this) .'::' . $type) ;
+	    $frametype = @constant($a = get_class($this) . '::' . $type);
 	    if ($frametype === null) {
-	        Daemon::log(__METHOD__ . ' : Undefined frametype "' . $type . '"') ;
+	        Daemon::log(__METHOD__ . ' : Undefined frametype "' . $type . '"');
 	    }
-	    return $frametype ; 
+	    return $frametype; 
 	}
 	
 	public function onHandshake() {
@@ -35,11 +35,11 @@ 
 	}
 
 	public function sendFrame($data, $type) {
-		$this->connection->write($this->encodeFrame($data, $type)) ;
+		$this->connection->write($this->encodeFrame($data, $type));
 	}
 
 	public function onRead() {
-		$this->connection->buf = "" ;
+		$this->connection->buf = "";
 	}
 	
     /**

lib/Thread.php

Spacing +2 added lines, -2 removed lines

@@ -92,9 +92,9 @@
 			) {
 				continue;
 			}
-			$ev = Event::signal($this->eventBase, $no, array($this,'eventSighandler'), array($no));
+			$ev = Event::signal($this->eventBase, $no, array($this, 'eventSighandler'), array($no));
 			if (!$ev) {
-				$this->log('Cannot event_set for '.$name.' signal');
+				$this->log('Cannot event_set for ' . $name . ' signal');
 			}
 			$ev->add();
 			$this->sigEvents[$no] = $ev;

lib/HTTPServerConnection.php

Spacing +5 added lines, -5 removed lines

@@ -8,8 +8,8 @@ 
  */
 
 class HTTPServerConnection extends Connection {
-	protected $initialLowMark  = 1;         // initial value of the minimal amout of bytes in buffer
-	protected $initialHighMark = 0xFFFFFF;  // initial value of the maximum amout of bytes in buffer
+	protected $initialLowMark  = 1; // initial value of the minimal amout of bytes in buffer
+	protected $initialHighMark = 0xFFFFFF; // initial value of the maximum amout of bytes in buffer
 	public $timeout = 45;
 
 	public $req;
@@ -79,7 +79,7 @@ 
 		} else {
 			if (!$this->req) {
 				if ($buf !== '') {
-					Daemon::log('Unexpected input (HTTP request): '.Debug::dump($buf));
+					Daemon::log('Unexpected input (HTTP request): ' . Debug::dump($buf));
 				}
 				return;
 			}
@@ -157,11 +157,11 @@ 
 				if ($req instanceof stdClass) {
 					$this->endRequest($req, 0, 0);
 				} else {
-					if ($this->pool->config->sendfile->value && (!$this->pool->config->sendfileonlybycommand->value	|| isset($req->attrs->server['USE_SENDFILE'])) 
+					if ($this->pool->config->sendfile->value && (!$this->pool->config->sendfileonlybycommand->value || isset($req->attrs->server['USE_SENDFILE'])) 
 						&& !isset($req->attrs->server['DONT_USE_SENDFILE'])
 					) {
 						$fn = FS::tempnam($this->pool->config->sendfiledir->value, $this->pool->config->sendfileprefix->value);
-						FS::open($fn, 'wb', function ($file) use ($req) {
+						FS::open($fn, 'wb', function($file) use ($req) {
 							$req->sendfp = $file;
 						});
 						$req->header('X-Sendfile: ' . $fn);

lib/FastCGIServerConnection.php

Spacing +10 added lines, -11 removed lines

@@ -7,8 +7,8 @@ 
  * @author Zorin Vasily <kak.serpom.po.yaitsam@gmail.com>
  */
 class FastCGIServerConnection extends Connection {
-	protected $lowMark  = 8;         // initial value of the minimal amout of bytes in buffer
-	protected $highMark = 0xFFFFFF;  // initial value of the maximum amout of bytes in buffer
+	protected $lowMark  = 8; // initial value of the minimal amout of bytes in buffer
+	protected $highMark = 0xFFFFFF; // initial value of the maximum amout of bytes in buffer
 	public $timeout = 180;
 
 	protected $requests = array();
@@ -117,8 +117,7 @@ 
 				. ' (' . strlen($pad) . ')');
 		
 
-		if ($type == self::FCGI_BEGIN_REQUEST) {
-			++Daemon::$process->reqCounter;
+		if ($type == self::FCGI_BEGIN_REQUEST) {++Daemon::$process->reqCounter;
 			$u = unpack('nrole/Cflags', $this->content);
 
 			$req = new stdClass();
@@ -130,7 +129,7 @@ 
 			$req->attrs->server      = array();
 			$req->attrs->files       = array();
 			$req->attrs->session     = null;
-			$req->attrs->role       = self::$roles[$u['role']];
+			$req->attrs->role = self::$roles[$u['role']];
 			$req->attrs->flags       = $u['flags'];
 			$req->attrs->id          = $this->header['reqid'];
 			$req->attrs->params_done = false;
@@ -264,7 +263,7 @@ 
 		*/ 
 		// string bytes counter 
 		$d = 0; 
-		while($d < $outlen){ 
+		while ($d < $outlen) { 
 		  
 		  $ord_var_c = ord($output{$d}); 
 		  
@@ -277,31 +276,31 @@ 
 			  case (($ord_var_c & 0xE0) == 0xC0): 
 				  // characters U-00000080 - U-000007FF, mask 110XXXXX 
 				  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 
-				  $d+=2; 
+				  $d += 2; 
 				  break; 
 
 			  case (($ord_var_c & 0xF0) == 0xE0): 
 				  // characters U-00000800 - U-0000FFFF, mask 1110XXXX 
 				  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 
-				  $d+=3; 
+				  $d += 3; 
 				  break; 
 
 			  case (($ord_var_c & 0xF8) == 0xF0): 
 				  // characters U-00010000 - U-001FFFFF, mask 11110XXX 
 				  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 
-				  $d+=4; 
+				  $d += 4; 
 				  break; 
 
 			  case (($ord_var_c & 0xFC) == 0xF8): 
 				  // characters U-00200000 - U-03FFFFFF, mask 111110XX 
 				  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 
-				  $d+=5; 
+				  $d += 5; 
 				  break; 
 
 			  case (($ord_var_c & 0xFE) == 0xFC): 
 				  // characters U-04000000 - U-7FFFFFFF, mask 1111110X 
 				  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 
-				  $d+=6; 
+				  $d += 6; 
 				  break; 
 			  default: 
 				$d++;    

lib/Encoding.php

Spacing +28 added lines, -28 removed lines

@@ -114,7 +114,7 @@ 
        "\xc5\xb8"     => "\x9f"

     );

 

-  static function toUTF8($text){

+  static function toUTF8($text) {

   /**

    * Function Encoding::toUTF8

    *

@@ -140,25 +140,25 @@ 
    *

    */

 

-    if(is_array($text))

+    if (is_array($text))

     {

-      foreach($text as $k => $v)

+      foreach ($text as $k => $v)

       {

         $text[$k] = self::toUTF8($v);

       }

       return $text;

-    } elseif(is_string($text)) {

+    } elseif (is_string($text)) {

     

       $max = strlen($text);

       $buf = "";

-      for($i = 0; $i < $max; $i++){

+      for ($i = 0; $i < $max; $i++) {

           $c1 = $text{$i};

-          if($c1>="\xc0"){ //Should be converted to UTF8, if it's not UTF8 already

-            $c2 = $i+1 >= $max? "\x00" : $text{$i+1};

-            $c3 = $i+2 >= $max? "\x00" : $text{$i+2};

-            $c4 = $i+3 >= $max? "\x00" : $text{$i+3};

-              if($c1 >= "\xc0" & $c1 <= "\xdf"){ //looks like 2 bytes UTF8

-                  if($c2 >= "\x80" && $c2 <= "\xbf"){ //yeah, almost sure it's UTF8 already

+          if ($c1 >= "\xc0") { //Should be converted to UTF8, if it's not UTF8 already

+            $c2 = $i + 1 >= $max ? "\x00" : $text{$i + 1};

+            $c3 = $i + 2 >= $max ? "\x00" : $text{$i + 2};

+            $c4 = $i + 3 >= $max ? "\x00" : $text{$i + 3};

+              if ($c1 >= "\xc0" & $c1 <= "\xdf") { //looks like 2 bytes UTF8

+                  if ($c2 >= "\x80" && $c2 <= "\xbf") { //yeah, almost sure it's UTF8 already

                       $buf .= $c1 . $c2;

                       $i++;

                   } else { //not valid UTF8.  Convert it.

@@ -166,8 +166,8 @@ 
                       $cc2 = ($c1 & "\x3f") | "\x80";

                       $buf .= $cc1 . $cc2;

                   }

-              } elseif($c1 >= "\xe0" & $c1 <= "\xef"){ //looks like 3 bytes UTF8

-                  if($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf"){ //yeah, almost sure it's UTF8 already

+              } elseif ($c1 >= "\xe0" & $c1 <= "\xef") { //looks like 3 bytes UTF8

+                  if ($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf") { //yeah, almost sure it's UTF8 already

                       $buf .= $c1 . $c2 . $c3;

                       $i = $i + 2;

                   } else { //not valid UTF8.  Convert it.

@@ -175,8 +175,8 @@ 
                       $cc2 = ($c1 & "\x3f") | "\x80";

                       $buf .= $cc1 . $cc2;

                   }

-              } elseif($c1 >= "\xf0" & $c1 <= "\xf7"){ //looks like 4 bytes UTF8

-                  if($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf" && $c4 >= "\x80" && $c4 <= "\xbf"){ //yeah, almost sure it's UTF8 already

+              } elseif ($c1 >= "\xf0" & $c1 <= "\xf7") { //looks like 4 bytes UTF8

+                  if ($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf" && $c4 >= "\x80" && $c4 <= "\xbf") { //yeah, almost sure it's UTF8 already

                       $buf .= $c1 . $c2 . $c3;

                       $i = $i + 2;

                   } else { //not valid UTF8.  Convert it.

@@ -189,8 +189,8 @@ 
                       $cc2 = (($c1 & "\x3f") | "\x80");

                       $buf .= $cc1 . $cc2;

               }

-          } elseif(($c1 & "\xc0") == "\x80"){ // needs conversion

-                if(isset(self::$win1252ToUtf8[ord($c1)])) { //found in Windows-1252 special cases

+          } elseif (($c1 & "\xc0") == "\x80") { // needs conversion

+                if (isset(self::$win1252ToUtf8[ord($c1)])) { //found in Windows-1252 special cases

                     $buf .= self::$win1252ToUtf8[ord($c1)];

                 } else {

                   $cc1 = (chr(ord($c1) / 64) | "\xc0");

@@ -208,12 +208,12 @@ 
   }

 

   static function toWin1252($text) {

-    if(is_array($text)) {

-      foreach($text as $k => $v) {

+    if (is_array($text)) {

+      foreach ($text as $k => $v) {

         $text[$k] = self::toWin1252($v);

       }

       return $text;

-    } elseif(is_string($text)) {

+    } elseif (is_string($text)) {

       return utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), self::toUTF8($text)));

     } else {

       return $text;

@@ -228,16 +228,16 @@ 
     return self::toWin1252($text);

   }

 

-  static function fixUTF8($text){

-    if(is_array($text)) {

-      foreach($text as $k => $v) {

+  static function fixUTF8($text) {

+    if (is_array($text)) {

+      foreach ($text as $k => $v) {

         $text[$k] = self::fixUTF8($v);

       }

       return $text;

     }

 

     $last = "";

-    while($last <> $text){

+    while ($last <> $text) {

       $last = $text;

       $text = self::toUTF8(utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), $text)));

     }

@@ -245,7 +245,7 @@ 
     return $text;

   }

   

-  static function UTF8FixWin1252Chars($text){

+  static function UTF8FixWin1252Chars($text) {

     // If you received an UTF-8 string that was converted from Windows-1252 as it was ISO8859-1 

     // (ignoring Windows-1252 chars from 80 to 9F) use this function to fix it.

     // See: http://en.wikipedia.org/wiki/Windows-1252

@@ -253,9 +253,9 @@ 
     return str_replace(array_keys(self::$brokenUtf8ToUtf8), array_values(self::$brokenUtf8ToUtf8), $text);

   }

   

-  static function removeBOM($str=""){

-    if(substr($str, 0,3) == pack("CCC",0xef,0xbb,0xbf)) {

-      $str=substr($str, 3);

+  static function removeBOM($str = "") {

+    if (substr($str, 0, 3) == pack("CCC", 0xef, 0xbb, 0xbf)) {

+      $str = substr($str, 3);

     }

     return $str;

   }

lib/Daemon_MasterThread.php

Spacing +2 added lines, -2 removed lines

@@ -151,7 +151,7 @@ 
 	 * @return void
 	 */
 	public function prepareSystemEnv() {
-		register_shutdown_function(array($this,'onShutdown'));
+		register_shutdown_function(array($this, 'onShutdown'));
 		posix_setsid();
 		proc_nice(Daemon::$config->masterpriority->value);
 		if (!Daemon::$config->verbosetty->value) {
@@ -291,7 +291,7 @@ 
 		$this->shutdown = true;
 		$this->waitAll(true);
 		Daemon::$shm_wstate->delete();		
-		file_put_contents(Daemon::$config->pidfile->value,'');
+		file_put_contents(Daemon::$config->pidfile->value, '');
 		exit(0);
 	}
 	

lib/MySQLClientConnection.php

Spacing +25 added lines, -25 removed lines

@@ -1,28 +1,28 @@ 
 <?php
 class MySQLClientConnection extends NetworkClientConnection {
 
-	public $url;                        // Connection's URL.
-	public $seq           = 0;          // Pointer of packet sequence.
-	public $clientFlags   = 239237;     // Flags of this MySQL client.
-	public $maxPacketSize = 0x1000000;  // Maximum packet size.
-	public $charsetNumber = 0x21;       // Charset number.
-	public $path        = ''; 	        // Default database name.
-	public $user          = 'root';     // Username
-	public $password      = '';         // Password
-	public $state        = 0;          // Connection's state. 0 - start, 1 - got initial packet, 2 - auth. packet sent, 3 - auth. error, 4 - handshaked OK
+	public $url; // Connection's URL.
+	public $seq           = 0; // Pointer of packet sequence.
+	public $clientFlags   = 239237; // Flags of this MySQL client.
+	public $maxPacketSize = 0x1000000; // Maximum packet size.
+	public $charsetNumber = 0x21; // Charset number.
+	public $path = ''; // Default database name.
+	public $user          = 'root'; // Username
+	public $password      = ''; // Password
+	public $state        = 0; // Connection's state. 0 - start, 1 - got initial packet, 2 - auth. packet sent, 3 - auth. error, 4 - handshaked OK
 	const STATE_GOT_INIT = 1;
 	const STATE_AUTH_SENT = 2;
 	const STATE_AUTH_ERR = 3;
 	const STATE_HANDSHAKED = 4;
-	public $instate       = 0;          // State of pointer of incoming data. 0 - Result Set Header Packet, 1 - Field Packet, 2 - Row Packet
+	public $instate       = 0; // State of pointer of incoming data. 0 - Result Set Header Packet, 1 - Field Packet, 2 - Row Packet
 	const INSTATE_HEADER = 0;
 	const INSTATE_FIELD = 1;
 	const INSTATE_ROW = 2;
-	public $resultRows    = array();    // Resulting rows
-	public $resultFields  = array();    // Resulting fields
-	public $context;                    // Property holds a reference to user's object
-	public $insertId;                   // INSERT_ID()
-	public $affectedRows;               // Affected rows number
+	public $resultRows    = array(); // Resulting rows
+	public $resultFields  = array(); // Resulting fields
+	public $context; // Property holds a reference to user's object
+	public $insertId; // INSERT_ID()
+	public $affectedRows; // Affected rows number
 	public $protover = 0;
 	public $timeout = 120;
 	public $errno = 0;
@@ -70,7 +70,7 @@ 
 		$dec = 0;
 		$len = strlen($str);
 		
-		for($i = 0; $i < $len; ++$i) {
+		for ($i = 0; $i < $len; ++$i) {
 			$dec += ord(binarySubstr($str, $i, 1)) * pow(0x100, $len - $i - 1);
 		}
 		
@@ -89,7 +89,7 @@ 
 
 		if ($len === NULL) {
 			if (strlen($hexstr) % 2) {
-				$hexstr = "0".$hexstr;
+				$hexstr = "0" . $hexstr;
 			}
 		} else {
 			$hexstr = str_repeat('0', $len * 2 - strlen($hexstr)) . $hexstr;
@@ -98,7 +98,7 @@ 
 		$bytes = strlen($hexstr) / 2;
 		$bin = '';
 		
-		for($i = 0; $i < $bytes; ++$i) {
+		for ($i = 0; $i < $bytes; ++$i) {
 			$bin .= chr(hexdec(substr($hexstr, $i * 2, 2)));
 		}
 		
@@ -112,7 +112,7 @@ 
 	 */
 	public function sendPacket($packet) { 
 		//Daemon::log('Client --> Server: ' . Debug::exportBytes($packet) . "\n\n");
-		return $this->write($this->int2bytes(3, strlen($packet)) . chr($this->seq++) . $packet);;
+		return $this->write($this->int2bytes(3, strlen($packet)) . chr($this->seq++) . $packet); ;
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 		}
 		
 		$o = $p;
-		$p =+ 8;
+		$p = + 8;
 		
 		return $this->bytes2int(binarySubstr($s, $o, 8));
 	}
@@ -189,7 +189,7 @@ 
 	 * @param integer Reference to pointer
 	 * @return integer Result
 	 */
-	public function parseEncodedString(&$s,&$p) {
+	public function parseEncodedString(&$s, &$p) {
 		$l = $this->parseEncodedBinary($s, $p);
 
 		if (
@@ -295,7 +295,7 @@ 
 		
 		$this->onResponse->push($callback);
 		$this->seq = 0;
-		$this->sendPacket(chr($cmd).$q);
+		$this->sendPacket(chr($cmd) . $q);
 		
 		return TRUE;
 	}
@@ -395,7 +395,7 @@ 
 				
 				$this->errno = $u[1];
 				$state = binarySubstr($this->buf, $p, 6);
-				$p =+ 6;
+				$p = + 6;
 
 				$this->errmsg = binarySubstr($this->buf, $p, $packet[0] + 4 - $p);
 				$this->onError();
@@ -421,7 +421,7 @@ 
 				
 				$this->serverStatus = $u[1];
 
-				$u = unpack('v',binarySubstr($this->buf, $p, 2));
+				$u = unpack('v', binarySubstr($this->buf, $p, 2));
 				$p += 2;
 				
 				$this->warnCount = $u[1];
@@ -483,7 +483,7 @@ 
 					// Row Packet
 					$row = array();
 
-					for ($i = 0,$nf = sizeof($this->resultFields); $i < $nf; ++$i) {
+					for ($i = 0, $nf = sizeof($this->resultFields); $i < $nf; ++$i) {
 						$row[$this->resultFields[$i]['name']] = $this->parseEncodedString($this->buf, $p);
 					}
 		

lib/Terminal.php

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	public function setStyle($c) {
 		if ($this->enable_color) {
-			echo "\033[".$c.'m';
+			echo "\033[" . $c . 'm';
 		}
 	}
 
@@ -96,13 +96,13 @@ 
 
 		$leftcolumn = array();
 
-		$valstr = is_array($values) ? implode('|', array_keys($values)): $values;
+		$valstr = is_array($values) ? implode('|', array_keys($values)) : $values;
 
 		if ('' !== $valstr) {
 			$valstr = '=[' . $valstr . ']';
 		}
 
-		$paramstr = "  \033[1m--" . $name . $valstr. "\033[0m";
+		$paramstr = "  \033[1m--" . $name . $valstr . "\033[0m";
 
 		$pl = strlen($paramstr);
 		if ($pl + 2 >= $paramw) {
@@ -114,7 +114,7 @@ 
 		$leftcolumn[] = $paramstr;
 
 		if (is_array($values)) {
-			foreach($values as $key => $value) {
+			foreach ($values as $key => $value) {
 				$leftcolumn[] = '    ' . $key . ' - ' . $value; 
 			}
 		}

lib/MongoClientAsyncConnection.php

Spacing +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 class MongoClientAsyncConnection extends NetworkClientConnection {
-	public $url;               // url
-	public $user;              // Username
-	public $password;          // Password
-	public $dbname;            // Database name
-	public $busy = false;      // Is this session busy?
+	public $url; // url
+	public $user; // Username
+	public $password; // Password
+	public $dbname; // Database name
+	public $busy = false; // Is this session busy?
 
 	public function onReady() {
 		$conn = $this;
@@ -62,7 +62,7 @@ 
 			$r['cursorId'] = binarySubstr($this->buf, 20, 8);
 			$id = (int) $h['responseTo'];
 			$flagBits = str_pad(strrev(decbin($r['flag'])), 8, '0', STR_PAD_LEFT);
-			$cur = ($r['cursorId'] !== "\x00\x00\x00\x00\x00\x00\x00\x00"?'c' . $r['cursorId'] : 'r' . $h['responseTo']);
+			$cur = ($r['cursorId'] !== "\x00\x00\x00\x00\x00\x00\x00\x00" ? 'c' . $r['cursorId'] : 'r' . $h['responseTo']);
 
 			if (
 				isset($this->pool->requests[$id][2])