pradosoft / prado

framework/IO/TTextWriter.php

Doc Comments +1 added lines

@@ -38,6 +38,7 @@
 	/**
 	 * Writes a string.
 	 * @param string string to be written
+	 * @param string $str
 	 */
 	public function write($str)
 	{

framework/Util/TLogger.php

Doc Comments +1 added lines

@@ -98,6 +98,7 @@
 	 * @param integer level filter
 	 * @param array category filter
 	 * @param array control filter
+	 * @param integer $levels
 	 * @return array list of messages. Each array elements represents one message
 	 * with the following structure:
 	 * array(

Spacing +20 added lines, -20 removed lines

@@ -63,16 +63,16 @@ 
 	 * @param string category of the message
 	 * @param string|TControl control of the message
 	 */
-	public function log($message,$level,$category='Uncategorized', $ctl=null)
+	public function log($message, $level, $category='Uncategorized', $ctl=null)
 	{
 		if($ctl) {
 			if($ctl instanceof TControl)
-				$ctl = $ctl->ClientId;
+				$ctl=$ctl->ClientId;
 			else if(!is_string($ctl))
-				$ctl = null;
+				$ctl=null;
 		} else
-			$ctl = null;
-		$this->_logs[]=array($message,$level,$category,microtime(true),memory_get_usage(),$ctl);
+			$ctl=null;
+		$this->_logs[]=array($message, $level, $category, microtime(true), memory_get_usage(), $ctl);
 	}
 
 	/**
@@ -108,7 +108,7 @@ 
 	 *   [4] => memory in bytes
 	 *   [5] => control client id
 	 */
-	public function getLogs($levels=null,$categories=null,$controls=null,$timestamp=null)
+	public function getLogs($levels=null, $categories=null, $controls=null, $timestamp=null)
 	{
 		$this->_levels=$levels;
 		$this->_categories=$categories;
@@ -116,15 +116,15 @@ 
 		$this->_timestamp=$timestamp;
 		if(empty($levels) && empty($categories) && empty($controls) && is_null($timestamp))
 			return $this->_logs;
-		$logs = $this->_logs;
+		$logs=$this->_logs;
 		if(!empty($levels))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByLevels')) ));
+			$logs=array_values(array_filter(array_filter($logs, array($this, 'filterByLevels'))));
 		if(!empty($categories))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByCategories')) ));
+			$logs=array_values(array_filter(array_filter($logs, array($this, 'filterByCategories'))));
 		if(!empty($controls))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByControl')) ));
+			$logs=array_values(array_filter(array_filter($logs, array($this, 'filterByControl'))));
 		if(!is_null($timestamp))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByTimeStamp')) ));
+			$logs=array_values(array_filter(array_filter($logs, array($this, 'filterByTimeStamp'))));
 		return $logs;
 	}
 
@@ -152,7 +152,7 @@ 
 	 * @param array category filter
 	 * @param array control filter
 	 */
-	public function deleteLogs($levels=null,$categories=null,$controls=null,$timestamp=null)
+	public function deleteLogs($levels=null, $categories=null, $controls=null, $timestamp=null)
 	{
 		$this->_levels=$levels;
 		$this->_categories=$categories;
@@ -163,16 +163,16 @@ 
 			$this->_logs=array();
 			return;
 		}
-		$logs = $this->_logs;
+		$logs=$this->_logs;
 		if(!empty($levels))
-			$logs = array_filter( array_filter($logs,array($this,'filterByLevels')) );
+			$logs=array_filter(array_filter($logs, array($this, 'filterByLevels')));
 		if(!empty($categories))
-			$logs = array_filter( array_filter($logs,array($this,'filterByCategories')) );
+			$logs=array_filter(array_filter($logs, array($this, 'filterByCategories')));
 		if(!empty($controls))
-			$logs = array_filter( array_filter($logs,array($this,'filterByControl')) );
+			$logs=array_filter(array_filter($logs, array($this, 'filterByControl')));
 		if(!is_null($timestamp))
-			$logs = array_filter( array_filter($logs,array($this,'filterByTimeStamp')) );
-		$this->_logs = array_values( array_diff_key($this->_logs, $logs) );
+			$logs=array_filter(array_filter($logs, array($this, 'filterByTimeStamp')));
+		$this->_logs=array_values(array_diff_key($this->_logs, $logs));
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 		foreach($this->_categories as $category)
 		{
 			// element 2 is the category
-			if($value[2]===$category || strpos($value[2],$category.'.')===0)
+			if($value[2]===$category || strpos($value[2], $category.'.')===0)
 				return $value;
 		}
 		return false;
@@ -212,7 +212,7 @@ 
 		// element 5 are the control client ids
 		foreach($this->_controls as $control)
 		{
-			if($value[5]===$control || strpos($value[5],$control)===0)
+			if($value[5]===$control || strpos($value[5], $control)===0)
 				return $value;
 		}
 		return false;

framework/Util/TRpcClient.php

Doc Comments +3 added lines

@@ -105,6 +105,9 @@
 	 * @param string RPC server URL
 	 * @param array payload data
 	 * @param string request mime type
+	 * @param string $serverUrl
+	 * @param string $mimeType
+	 * @return string
 	 */
 	protected function performRequest($serverUrl, $payload, $mimeType)
 	{

Spacing +9 added lines, -9 removed lines

@@ -57,7 +57,7 @@ 
 	/**
 	 * @var boolean whether the request is a notification and therefore should not care about the result (default: false)
 	 */
-	private $_isNotification = false;
+	private $_isNotification=false;
 
 	// magics
 
@@ -65,10 +65,10 @@ 
 	 * @param string url to RPC server
 	 * @param boolean whether requests are considered to be notifications (completely ignoring the response) (default: false)
 	 */
-	public function __construct($serverUrl, $isNotification = false)
+	public function __construct($serverUrl, $isNotification=false)
 	{
-		$this->_serverUrl = $serverUrl;
-		$this->_isNotification = TPropertyValue::ensureBoolean($isNotification);
+		$this->_serverUrl=$serverUrl;
+		$this->_isNotification=TPropertyValue::ensureBoolean($isNotification);
 	}
 
 	// methods
@@ -78,9 +78,9 @@ 
 	 * @return TRpcClient instance
 	 * @throws TApplicationException if an unsupported RPC client type was specified
 	 */
-	public static function create($type, $serverUrl, $isNotification = false)
+	public static function create($type, $serverUrl, $isNotification=false)
 	{
-		if(($_handler = constant('TRpcClientTypesEnumerable::'.strtoupper($type))) === null)
+		if(($_handler=constant('TRpcClientTypesEnumerable::'.strtoupper($type)))===null)
 			throw new TApplicationException('rpcclient_unsupported_handler');
 
 		return new $_handler($serverUrl, $isNotification);
@@ -110,7 +110,7 @@ 
 	 */
 	protected function performRequest($serverUrl, $payload, $mimeType)
 	{
-		if(($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false)
+		if(($_response=@file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType)))===false)
 			throw new TRpcClientRequestException('Request failed ("'.$http_response_header[0].'")');
 
 		return $_response;
@@ -131,7 +131,7 @@ 
 	 */
 	public function setIsNotification($bool)
 	{
-		$this->_isNotification = TPropertyValue::ensureBoolean($bool);
+		$this->_isNotification=TPropertyValue::ensureBoolean($bool);
 	}
 
 	/**
@@ -147,6 +147,6 @@ 
 	 */
 	public function setServerUrl($value)
 	{
-		$this->_serverUrl = $value;
+		$this->_serverUrl=$value;
 	}
 }
\ No newline at end of file

framework/Util/TVarDumper.php

Doc Comments +3 added lines

@@ -55,6 +55,9 @@
 			return self::$_output;
 	}
 
+	/**
+	 * @param integer $level
+	 */
 	private static function dumpInternal($var,$level)
 	{
 		switch(gettype($var))

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +17 added lines, -17 removed lines

@@ -40,27 +40,27 @@ 
 	 * @param integer maximum depth that the dumper should go into the variable. Defaults to 10.
 	 * @return string the string representation of the variable
 	 */
-	public static function dump($var,$depth=10,$highlight=false)
+	public static function dump($var, $depth=10, $highlight=false)
 	{
 		self::$_output='';
 		self::$_objects=array();
 		self::$_depth=$depth;
-		self::dumpInternal($var,0);
+		self::dumpInternal($var, 0);
 		if($highlight)
 		{
-			$result=highlight_string("<?php\n".self::$_output,true);
-			return preg_replace('/&lt;\\?php<br \\/>/','',$result,1);
+			$result=highlight_string("<?php\n".self::$_output, true);
+			return preg_replace('/&lt;\\?php<br \\/>/', '', $result, 1);
 		}
 		else
 			return self::$_output;
 	}
 
-	private static function dumpInternal($var,$level)
+	private static function dumpInternal($var, $level)
 	{
 		switch(gettype($var))
 		{
 			case 'boolean':
-				self::$_output.=$var?'true':'false';
+				self::$_output.=$var ? 'true' : 'false';
 				break;
 			case 'integer':
 				self::$_output.="$var";
@@ -81,41 +81,41 @@ 
 				self::$_output.='{unknown}';
 				break;
 			case 'array':
-				if(self::$_depth<=$level)
+				if(self::$_depth <= $level)
 					self::$_output.='array(...)';
 				else if(empty($var))
 					self::$_output.='array()';
 				else
 				{
 					$keys=array_keys($var);
-					$spaces=str_repeat(' ',$level*4);
+					$spaces=str_repeat(' ', $level * 4);
 					self::$_output.="array\n".$spaces.'(';
 					foreach($keys as $key)
 					{
 						self::$_output.="\n".$spaces."    [$key] => ";
-						self::$_output.=self::dumpInternal($var[$key],$level+1);
+						self::$_output.=self::dumpInternal($var[$key], $level + 1);
 					}
 					self::$_output.="\n".$spaces.')';
 				}
 				break;
 			case 'object':
-				if(($id=array_search($var,self::$_objects,true))!==false)
-					self::$_output.=get_class($var).'#'.($id+1).'(...)';
-				else if(self::$_depth<=$level)
+				if(($id=array_search($var, self::$_objects, true))!==false)
+					self::$_output.=get_class($var).'#'.($id + 1).'(...)';
+				else if(self::$_depth <= $level)
 					self::$_output.=get_class($var).'(...)';
 				else
 				{
-					$id=array_push(self::$_objects,$var);
+					$id=array_push(self::$_objects, $var);
 					$className=get_class($var);
-					$members=(array)$var;
+					$members=(array) $var;
 					$keys=array_keys($members);
-					$spaces=str_repeat(' ',$level*4);
+					$spaces=str_repeat(' ', $level * 4);
 					self::$_output.="$className#$id\n".$spaces.'(';
 					foreach($keys as $key)
 					{
-						$keyDisplay=strtr(trim($key),array("\0"=>':'));
+						$keyDisplay=strtr(trim($key), array("\0"=>':'));
 						self::$_output.="\n".$spaces."    [$keyDisplay] => ";
-						self::$_output.=self::dumpInternal($members[$key],$level+1);
+						self::$_output.=self::dumpInternal($members[$key], $level + 1);
 					}
 					self::$_output.="\n".$spaces.')';
 				}

framework/Web/Javascripts/JSMin.php

Doc Comments +9 added lines

@@ -73,6 +73,9 @@ 
 
   // -- Protected Instance Methods ---------------------------------------------
 
+  /**
+   * @param integer $d
+   */
   protected function action($d) {
     switch($d) {
       case 1:
@@ -132,6 +135,9 @@ 
     }
   }
 
+  /**
+   * @return string
+   */
   protected function get() {
     $c = $this->lookAhead;
     $this->lookAhead = null;
@@ -156,6 +162,9 @@ 
     return ' ';
   }
 
+  /**
+   * @param string $c
+   */
   protected function isAlphaNum($c) {
     return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
   }

Braces +2 added lines, -4 removed lines

@@ -191,8 +191,7 @@ 
             default:
               if ($this->isAlphaNum($this->b)) {
                 $this->action(1);
-              }
-              else {
+              } else {
                 $this->action(2);
               }
           }
@@ -224,8 +223,7 @@ 
                 default:
                   if ($this->isAlphaNum($this->a)) {
                     $this->action(1);
-                  }
-                  else {
+                  } else {
                     $this->action(3);
                   }
               }

Indentation +198 added lines, -198 removed lines

@@ -59,228 +59,228 @@
   // -- Public Static Methods --------------------------------------------------
 
   public static function minify($js) {
-    $jsmin = new JSMin($js);
-    return $jsmin->min();
+	$jsmin = new JSMin($js);
+	return $jsmin->min();
   }
 
   // -- Public Instance Methods ------------------------------------------------
 
   public function __construct($input) {
-    $this->input       = str_replace("\r\n", "\n", $input);
-    $this->inputLength = strlen($this->input);
+	$this->input       = str_replace("\r\n", "\n", $input);
+	$this->inputLength = strlen($this->input);
   }
 
   // -- Protected Instance Methods ---------------------------------------------
 
   protected function action($d) {
-    switch($d) {
-      case 1:
-        $this->output .= $this->a;
-
-      case 2:
-        $this->a = $this->b;
-
-        if ($this->a === "'" || $this->a === '"') {
-          for (;;) {
-            $this->output .= $this->a;
-            $this->a       = $this->get();
-
-            if ($this->a === $this->b) {
-              break;
-            }
-
-            if (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated string literal.');
-            }
-
-            if ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            }
-          }
-        }
-
-      case 3:
-        $this->b = $this->next();
-
-        if ($this->b === '/' && (
-            $this->a === '(' || $this->a === ',' || $this->a === '=' ||
-            $this->a === ':' || $this->a === '[' || $this->a === '!' ||
-            $this->a === '&' || $this->a === '|' || $this->a === '?')) {
-
-          $this->output .= $this->a . $this->b;
-
-          for (;;) {
-            $this->a = $this->get();
-
-            if ($this->a === '/') {
-              break;
-            } elseif ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            } elseif (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated regular expression '.
-                  'literal.');
-            }
-
-            $this->output .= $this->a;
-          }
-
-          $this->b = $this->next();
-        }
-    }
+	switch($d) {
+	  case 1:
+		$this->output .= $this->a;
+
+	  case 2:
+		$this->a = $this->b;
+
+		if ($this->a === "'" || $this->a === '"') {
+		  for (;;) {
+			$this->output .= $this->a;
+			$this->a       = $this->get();
+
+			if ($this->a === $this->b) {
+			  break;
+			}
+
+			if (ord($this->a) <= self::ORD_LF) {
+			  throw new JSMinException('Unterminated string literal.');
+			}
+
+			if ($this->a === '\\') {
+			  $this->output .= $this->a;
+			  $this->a       = $this->get();
+			}
+		  }
+		}
+
+	  case 3:
+		$this->b = $this->next();
+
+		if ($this->b === '/' && (
+			$this->a === '(' || $this->a === ',' || $this->a === '=' ||
+			$this->a === ':' || $this->a === '[' || $this->a === '!' ||
+			$this->a === '&' || $this->a === '|' || $this->a === '?')) {
+
+		  $this->output .= $this->a . $this->b;
+
+		  for (;;) {
+			$this->a = $this->get();
+
+			if ($this->a === '/') {
+			  break;
+			} elseif ($this->a === '\\') {
+			  $this->output .= $this->a;
+			  $this->a       = $this->get();
+			} elseif (ord($this->a) <= self::ORD_LF) {
+			  throw new JSMinException('Unterminated regular expression '.
+				  'literal.');
+			}
+
+			$this->output .= $this->a;
+		  }
+
+		  $this->b = $this->next();
+		}
+	}
   }
 
   protected function get() {
-    $c = $this->lookAhead;
-    $this->lookAhead = null;
-
-    if ($c === null) {
-      if ($this->inputIndex < $this->inputLength) {
-        $c = $this->input[$this->inputIndex];
-        $this->inputIndex += 1;
-      } else {
-        $c = null;
-      }
-    }
-
-    if ($c === "\r") {
-      return "\n";
-    }
-
-    if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
-      return $c;
-    }
-
-    return ' ';
+	$c = $this->lookAhead;
+	$this->lookAhead = null;
+
+	if ($c === null) {
+	  if ($this->inputIndex < $this->inputLength) {
+		$c = $this->input[$this->inputIndex];
+		$this->inputIndex += 1;
+	  } else {
+		$c = null;
+	  }
+	}
+
+	if ($c === "\r") {
+	  return "\n";
+	}
+
+	if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
+	  return $c;
+	}
+
+	return ' ';
   }
 
   protected function isAlphaNum($c) {
-    return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
+	return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
   }
 
   protected function min() {
-    $this->a = "\n";
-    $this->action(3);
-
-    while ($this->a !== null) {
-      switch ($this->a) {
-        case ' ':
-          if ($this->isAlphaNum($this->b)) {
-            $this->action(1);
-          } else {
-            $this->action(2);
-          }
-          break;
-
-        case "\n":
-          switch ($this->b) {
-            case '{':
-            case '[':
-            case '(':
-            case '+':
-            case '-':
-              $this->action(1);
-              break;
-
-            case ' ':
-              $this->action(3);
-              break;
-
-            default:
-              if ($this->isAlphaNum($this->b)) {
-                $this->action(1);
-              }
-              else {
-                $this->action(2);
-              }
-          }
-          break;
-
-        default:
-          switch ($this->b) {
-            case ' ':
-              if ($this->isAlphaNum($this->a)) {
-                $this->action(1);
-                break;
-              }
-
-              $this->action(3);
-              break;
-
-            case "\n":
-              switch ($this->a) {
-                case '}':
-                case ']':
-                case ')':
-                case '+':
-                case '-':
-                case '"':
-                case "'":
-                  $this->action(1);
-                  break;
-
-                default:
-                  if ($this->isAlphaNum($this->a)) {
-                    $this->action(1);
-                  }
-                  else {
-                    $this->action(3);
-                  }
-              }
-              break;
-
-            default:
-              $this->action(1);
-              break;
-          }
-      }
-    }
-
-    return $this->output;
+	$this->a = "\n";
+	$this->action(3);
+
+	while ($this->a !== null) {
+	  switch ($this->a) {
+		case ' ':
+		  if ($this->isAlphaNum($this->b)) {
+			$this->action(1);
+		  } else {
+			$this->action(2);
+		  }
+		  break;
+
+		case "\n":
+		  switch ($this->b) {
+			case '{':
+			case '[':
+			case '(':
+			case '+':
+			case '-':
+			  $this->action(1);
+			  break;
+
+			case ' ':
+			  $this->action(3);
+			  break;
+
+			default:
+			  if ($this->isAlphaNum($this->b)) {
+				$this->action(1);
+			  }
+			  else {
+				$this->action(2);
+			  }
+		  }
+		  break;
+
+		default:
+		  switch ($this->b) {
+			case ' ':
+			  if ($this->isAlphaNum($this->a)) {
+				$this->action(1);
+				break;
+			  }
+
+			  $this->action(3);
+			  break;
+
+			case "\n":
+			  switch ($this->a) {
+				case '}':
+				case ']':
+				case ')':
+				case '+':
+				case '-':
+				case '"':
+				case "'":
+				  $this->action(1);
+				  break;
+
+				default:
+				  if ($this->isAlphaNum($this->a)) {
+					$this->action(1);
+				  }
+				  else {
+					$this->action(3);
+				  }
+			  }
+			  break;
+
+			default:
+			  $this->action(1);
+			  break;
+		  }
+	  }
+	}
+
+	return $this->output;
   }
 
   protected function next() {
-    $c = $this->get();
-
-    if ($c === '/') {
-      switch($this->peek()) {
-        case '/':
-          for (;;) {
-            $c = $this->get();
-
-            if (ord($c) <= self::ORD_LF) {
-              return $c;
-            }
-          }
-
-        case '*':
-          $this->get();
-
-          for (;;) {
-            switch($this->get()) {
-              case '*':
-                if ($this->peek() === '/') {
-                  $this->get();
-                  return ' ';
-                }
-                break;
-
-              case null:
-                throw new JSMinException('Unterminated comment.');
-            }
-          }
-
-        default:
-          return $c;
-      }
-    }
-
-    return $c;
+	$c = $this->get();
+
+	if ($c === '/') {
+	  switch($this->peek()) {
+		case '/':
+		  for (;;) {
+			$c = $this->get();
+
+			if (ord($c) <= self::ORD_LF) {
+			  return $c;
+			}
+		  }
+
+		case '*':
+		  $this->get();
+
+		  for (;;) {
+			switch($this->get()) {
+			  case '*':
+				if ($this->peek() === '/') {
+				  $this->get();
+				  return ' ';
+				}
+				break;
+
+			  case null:
+				throw new JSMinException('Unterminated comment.');
+			}
+		  }
+
+		default:
+		  return $c;
+	  }
+	}
+
+	return $c;
   }
 
   protected function peek() {
-    $this->lookAhead = $this->get();
-    return $this->lookAhead;
+	$this->lookAhead = $this->get();
+	return $this->lookAhead;
   }
 }
\ No newline at end of file

Spacing +66 added lines, -66 removed lines

@@ -45,29 +45,29 @@ 
  */
 
 class JSMin {
-  const ORD_LF    = 10;
-  const ORD_SPACE = 32;
+  const ORD_LF=10;
+  const ORD_SPACE=32;
 
-  protected $a           = '';
-  protected $b           = '';
-  protected $input       = '';
-  protected $inputIndex  = 0;
-  protected $inputLength = 0;
-  protected $lookAhead   = null;
-  protected $output      = '';
+  protected $a='';
+  protected $b='';
+  protected $input='';
+  protected $inputIndex=0;
+  protected $inputLength=0;
+  protected $lookAhead=null;
+  protected $output='';
 
   // -- Public Static Methods --------------------------------------------------
 
   public static function minify($js) {
-    $jsmin = new JSMin($js);
+    $jsmin=new JSMin($js);
     return $jsmin->min();
   }
 
   // -- Public Instance Methods ------------------------------------------------
 
   public function __construct($input) {
-    $this->input       = str_replace("\r\n", "\n", $input);
-    $this->inputLength = strlen($this->input);
+    $this->input=str_replace("\r\n", "\n", $input);
+    $this->inputLength=strlen($this->input);
   }
 
   // -- Protected Instance Methods ---------------------------------------------
@@ -75,80 +75,80 @@ 
   protected function action($d) {
     switch($d) {
       case 1:
-        $this->output .= $this->a;
+        $this->output.=$this->a;
 
       case 2:
-        $this->a = $this->b;
+        $this->a=$this->b;
 
-        if ($this->a === "'" || $this->a === '"') {
-          for (;;) {
-            $this->output .= $this->a;
-            $this->a       = $this->get();
+        if($this->a==="'" || $this->a==='"') {
+          for(;;) {
+            $this->output.=$this->a;
+            $this->a=$this->get();
 
-            if ($this->a === $this->b) {
+            if($this->a===$this->b) {
               break;
             }
 
-            if (ord($this->a) <= self::ORD_LF) {
+            if(ord($this->a) <= self::ORD_LF) {
               throw new JSMinException('Unterminated string literal.');
             }
 
-            if ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
+            if($this->a==='\\') {
+              $this->output.=$this->a;
+              $this->a=$this->get();
             }
           }
         }
 
       case 3:
-        $this->b = $this->next();
+        $this->b=$this->next();
 
-        if ($this->b === '/' && (
-            $this->a === '(' || $this->a === ',' || $this->a === '=' ||
-            $this->a === ':' || $this->a === '[' || $this->a === '!' ||
-            $this->a === '&' || $this->a === '|' || $this->a === '?')) {
+        if($this->b==='/' && (
+            $this->a==='(' || $this->a===',' || $this->a==='=' ||
+            $this->a===':' || $this->a==='[' || $this->a==='!' ||
+            $this->a==='&' || $this->a==='|' || $this->a==='?')) {
 
-          $this->output .= $this->a . $this->b;
+          $this->output.=$this->a.$this->b;
 
-          for (;;) {
-            $this->a = $this->get();
+          for(;;) {
+            $this->a=$this->get();
 
-            if ($this->a === '/') {
+            if($this->a==='/') {
               break;
-            } elseif ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            } elseif (ord($this->a) <= self::ORD_LF) {
+            } elseif($this->a==='\\') {
+              $this->output.=$this->a;
+              $this->a=$this->get();
+            } elseif(ord($this->a) <= self::ORD_LF) {
               throw new JSMinException('Unterminated regular expression '.
                   'literal.');
             }
 
-            $this->output .= $this->a;
+            $this->output.=$this->a;
           }
 
-          $this->b = $this->next();
+          $this->b=$this->next();
         }
     }
   }
 
   protected function get() {
-    $c = $this->lookAhead;
-    $this->lookAhead = null;
+    $c=$this->lookAhead;
+    $this->lookAhead=null;
 
-    if ($c === null) {
-      if ($this->inputIndex < $this->inputLength) {
-        $c = $this->input[$this->inputIndex];
-        $this->inputIndex += 1;
+    if($c===null) {
+      if($this->inputIndex < $this->inputLength) {
+        $c=$this->input[$this->inputIndex];
+        $this->inputIndex+=1;
       } else {
-        $c = null;
+        $c=null;
       }
     }
 
-    if ($c === "\r") {
+    if($c==="\r") {
       return "\n";
     }
 
-    if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
+    if($c===null || $c==="\n" || ord($c) >= self::ORD_SPACE) {
       return $c;
     }
 
@@ -156,17 +156,17 @@ 
   }
 
   protected function isAlphaNum($c) {
-    return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
+    return ord($c) > 126 || $c==='\\' || preg_match('/^[\w\$]$/', $c)===1;
   }
 
   protected function min() {
-    $this->a = "\n";
+    $this->a="\n";
     $this->action(3);
 
-    while ($this->a !== null) {
-      switch ($this->a) {
+    while($this->a!==null) {
+      switch($this->a) {
         case ' ':
-          if ($this->isAlphaNum($this->b)) {
+          if($this->isAlphaNum($this->b)) {
             $this->action(1);
           } else {
             $this->action(2);
@@ -174,7 +174,7 @@ 
           break;
 
         case "\n":
-          switch ($this->b) {
+          switch($this->b) {
             case '{':
             case '[':
             case '(':
@@ -188,7 +188,7 @@ 
               break;
 
             default:
-              if ($this->isAlphaNum($this->b)) {
+              if($this->isAlphaNum($this->b)) {
                 $this->action(1);
               }
               else {
@@ -198,9 +198,9 @@ 
           break;
 
         default:
-          switch ($this->b) {
+          switch($this->b) {
             case ' ':
-              if ($this->isAlphaNum($this->a)) {
+              if($this->isAlphaNum($this->a)) {
                 $this->action(1);
                 break;
               }
@@ -209,7 +209,7 @@ 
               break;
 
             case "\n":
-              switch ($this->a) {
+              switch($this->a) {
                 case '}':
                 case ']':
                 case ')':
@@ -221,7 +221,7 @@ 
                   break;
 
                 default:
-                  if ($this->isAlphaNum($this->a)) {
+                  if($this->isAlphaNum($this->a)) {
                     $this->action(1);
                   }
                   else {
@@ -241,15 +241,15 @@ 
   }
 
   protected function next() {
-    $c = $this->get();
+    $c=$this->get();
 
-    if ($c === '/') {
+    if($c==='/') {
       switch($this->peek()) {
         case '/':
-          for (;;) {
-            $c = $this->get();
+          for(;;) {
+            $c=$this->get();
 
-            if (ord($c) <= self::ORD_LF) {
+            if(ord($c) <= self::ORD_LF) {
               return $c;
             }
           }
@@ -257,10 +257,10 @@ 
         case '*':
           $this->get();
 
-          for (;;) {
+          for(;;) {
             switch($this->get()) {
               case '*':
-                if ($this->peek() === '/') {
+                if($this->peek()==='/') {
                   $this->get();
                   return ' ';
                 }
@@ -280,7 +280,7 @@ 
   }
 
   protected function peek() {
-    $this->lookAhead = $this->get();
+    $this->lookAhead=$this->get();
     return $this->lookAhead;
   }
 }
\ No newline at end of file

framework/Web/Services/TJsonService.php

Doc Comments +1 added lines

@@ -140,6 +140,7 @@
 	/**
 	 * Renders content provided by TJsonResponse::getJsonContent() as
 	 * javascript in JSON format.
+	 * @param TJsonResponse $service
 	 */
 	protected function createJsonResponse($service,$properties,$config)
 	{

Spacing +12 added lines, -12 removed lines

@@ -77,7 +77,7 @@ 
 			if(is_array($config))
 			{
 				foreach($config['json'] as $id => $json)
-					$this->_services[$id] = $json;
+					$this->_services[$id]=$json;
 			}
 		}
 		else
@@ -109,14 +109,14 @@ 
 					$service=Prado::createComponent($serviceConfig['class']);
 					if($service instanceof TJsonResponse)
 					{
-						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:array();
-						$this->createJsonResponse($service,$properties,$serviceConfig);
+						$properties=isset($serviceConfig['properties']) ? $serviceConfig['properties'] : array();
+						$this->createJsonResponse($service, $properties, $serviceConfig);
 					}
 					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
+					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
 			else
 			{
@@ -125,33 +125,33 @@ 
 				{
 					$service=Prado::createComponent($class);
 					if($service instanceof TJsonResponse)
-						$this->createJsonResponse($service,$properties,$serviceConfig);
+						$this->createJsonResponse($service, $properties, $serviceConfig);
 					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
+					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
 		}
 		else
-			throw new THttpException(404,'jsonservice_provider_unknown',$id);
+			throw new THttpException(404, 'jsonservice_provider_unknown', $id);
 	}
 
 	/**
 	 * Renders content provided by TJsonResponse::getJsonContent() as
 	 * javascript in JSON format.
 	 */
-	protected function createJsonResponse($service,$properties,$config)
+	protected function createJsonResponse($service, $properties, $config)
 	{
 		// init service properties
 		foreach($properties as $name=>$value)
-			$service->setSubproperty($name,$value);
+			$service->setSubproperty($name, $value);
 		$service->init($config);
 
 		//send content if not null
 		if(($content=$service->getJsonContent())!==null)
 		{
-			$response = $this->getResponse();
+			$response=$this->getResponse();
 			$response->setContentType('application/json');
 			$response->setCharset('UTF-8');
 			//send content

Braces +6 added lines, -12 removed lines

@@ -79,8 +79,7 @@ 
 				foreach($config['json'] as $id => $json)
 					$this->_services[$id] = $json;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('json') as $json)
 			{
@@ -111,14 +110,11 @@ 
 					{
 						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:array();
 						$this->createJsonResponse($service,$properties,$serviceConfig);
-					}
-					else
+					} else
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required',$id);
-			}
-			else
+			} else
 			{
 				$properties=$serviceConfig->getAttributes();
 				if(($class=$properties->remove('class'))!==null)
@@ -128,12 +124,10 @@ 
 						$this->createJsonResponse($service,$properties,$serviceConfig);
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required',$id);
 			}
-		}
-		else
+		} else
 			throw new THttpException(404,'jsonservice_provider_unknown',$id);
 	}
 

framework/Web/THttpResponseAdapter.php

Doc Comments +1 added lines

@@ -31,6 +31,7 @@
 	/**
 	 * Constructor. Attach a response to be adapted.
 	 * @param THttpResponse the response object the adapter is to attach to.
+	 * @param THttpResponse $response
 	 */
 	public function __construct($response)
 	{

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 	 */
 	public function createNewHtmlWriter($type, $writer)
 	{
-		return $this->_response->createNewHtmlWriter($type,$writer);
+		return $this->_response->createNewHtmlWriter($type, $writer);
 	}
 }
 

framework/Web/THttpSession.php

Doc Comments +3 added lines

@@ -265,6 +265,7 @@ 
 	 * If true, make sure the methods {@link _open}, {@link _close}, {@link _read},
 	 * {@link _write}, {@link _destroy}, and {@link _gc} are overridden in child
 	 * class, because they will be used as the callback handlers.
+	 * @param boolean $value
 	 */
 	public function setUseCustomStorage($value)
 	{
@@ -527,6 +528,7 @@ 
 	 * Returns the session variable value with the session variable name.
 	 * This method is exactly the same as {@link offsetGet}.
 	 * @param mixed the session variable name
+	 * @param string $key
 	 * @return mixed the session variable value, null if no such variable exists
 	 */
 	public function itemAt($key)
@@ -539,6 +541,7 @@ 
 	 * Note, if the specified name already exists, the old value will be removed first.
 	 * @param mixed session variable name
 	 * @param mixed session variable value
+	 * @param string $key
 	 */
 	public function add($key,$value)
 	{

Indentation +2 added lines, -2 removed lines

@@ -306,10 +306,10 @@
 		{
 			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
 			if($value===THttpSessionCookieMode::None) 
-      {
+	  {
 				ini_set('session.use_cookies','0');
 			  ini_set('session.use_only_cookies','0');
-      }
+	  }
 			else if($value===THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies','1');

Braces +4 added lines, -8 removed lines

@@ -309,13 +309,11 @@ 
       {
 				ini_set('session.use_cookies','0');
 			  ini_set('session.use_only_cookies','0');
-      }
-			else if($value===THttpSessionCookieMode::Allow)
+      } else if($value===THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies','1');
 				ini_set('session.use_only_cookies','0');
-			}
-			else
+			} else
 			{
 				ini_set('session.use_cookies','1');
 				ini_set('session.use_only_cookies','1');
@@ -368,8 +366,7 @@ 
 			{
 				ini_set('session.gc_probability',$value);
 				ini_set('session.gc_divisor','100');
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
 		}
 	}
@@ -557,8 +554,7 @@ 
 			$value=$_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 

Spacing +24 added lines, -24 removed lines

@@ -138,9 +138,9 @@ 
 		if(!$this->_started)
 		{
 			if($this->_customStorage)
-				session_set_save_handler(array($this,'_open'),array($this,'_close'),array($this,'_read'),array($this,'_write'),array($this,'_destroy'),array($this,'_gc'));
+				session_set_save_handler(array($this, '_open'), array($this, '_close'), array($this, '_read'), array($this, '_write'), array($this, '_destroy'), array($this, '_gc'));
 			if($this->_cookie!==null)
-				session_set_cookie_params($this->_cookie->getExpire(),$this->_cookie->getPath(),$this->_cookie->getDomain(),$this->_cookie->getSecure(),$this->_cookie->getHttpOnly());
+				session_set_cookie_params($this->_cookie->getExpire(), $this->_cookie->getPath(), $this->_cookie->getDomain(), $this->_cookie->getSecure(), $this->_cookie->getHttpOnly());
 			if(ini_get('session.auto_start')!=='1')
 				session_start();
 			$this->_started=true;
@@ -180,7 +180,7 @@ 
 	 */
 	public function regenerate($deleteOld=false)
 	{
-		$old = $this->getSessionID();
+		$old=$this->getSessionID();
 		session_regenerate_id($deleteOld);
 		return $old;
 	}
@@ -232,7 +232,7 @@ 
 		else if(ctype_alnum($value))
 			session_name($value);
 		else
-			throw new TInvalidDataValueException('httpsession_sessionname_invalid',$value);
+			throw new TInvalidDataValueException('httpsession_sessionname_invalid', $value);
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 		else if(is_dir($value))
 			session_save_path($value);
 		else
-			throw new TInvalidDataValueException('httpsession_savepath_invalid',$value);
+			throw new TInvalidDataValueException('httpsession_savepath_invalid', $value);
 	}
 
 	/**
@@ -282,7 +282,7 @@ 
 	public function getCookie()
 	{
 		if($this->_cookie===null)
-			$this->_cookie=new THttpCookie($this->getSessionName(),$this->getSessionID());
+			$this->_cookie=new THttpCookie($this->getSessionName(), $this->getSessionID());
 		return $this->_cookie;
 	}
 
@@ -309,21 +309,21 @@ 
 			throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
 		else
 		{
-			$value=TPropertyValue::ensureEnum($value,'Prado\\Web\\THttpSessionCookieMode');
+			$value=TPropertyValue::ensureEnum($value, 'Prado\\Web\\THttpSessionCookieMode');
 			if($value===THttpSessionCookieMode::None) 
       {
-				ini_set('session.use_cookies','0');
-			  ini_set('session.use_only_cookies','0');
+				ini_set('session.use_cookies', '0');
+			  ini_set('session.use_only_cookies', '0');
       }
 			else if($value===THttpSessionCookieMode::Allow)
 			{
-				ini_set('session.use_cookies','1');
-				ini_set('session.use_only_cookies','0');
+				ini_set('session.use_cookies', '1');
+				ini_set('session.use_only_cookies', '0');
 			}
 			else
 			{
-				ini_set('session.use_cookies','1');
-				ini_set('session.use_only_cookies','1');
+				ini_set('session.use_cookies', '1');
+				ini_set('session.use_only_cookies', '1');
 				ini_set('session.use_trans_sid', 0);
 			}
 		}
@@ -369,13 +369,13 @@ 
 		else
 		{
 			$value=TPropertyValue::ensureInteger($value);
-			if($value>=0 && $value<=100)
+			if($value >= 0 && $value <= 100)
 			{
-				ini_set('session.gc_probability',$value);
-				ini_set('session.gc_divisor','100');
+				ini_set('session.gc_probability', $value);
+				ini_set('session.gc_divisor', '100');
 			}
 			else
-				throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
+				throw new TInvalidDataValueException('httpsession_gcprobability_invalid', $value);
 		}
 	}
 
@@ -397,9 +397,9 @@ 
 		else
 		{
 			$value=TPropertyValue::ensureBoolean($value);
-			if ($value && $this->getCookieMode()==THttpSessionCookieMode::Only)
+			if($value && $this->getCookieMode()==THttpSessionCookieMode::Only)
 					throw new TInvalidOperationException('httpsession_transid_cookieonly');
-			ini_set('session.use_trans_sid',$value?'1':'0');
+			ini_set('session.use_trans_sid', $value ? '1' : '0');
 		}
 	}
 
@@ -420,7 +420,7 @@ 
 		if($this->_started)
 			throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
 		else
-			ini_set('session.gc_maxlifetime',$value);
+			ini_set('session.gc_maxlifetime', $value);
 	}
 
 	/**
@@ -430,7 +430,7 @@ 
 	 * @param string session name
 	 * @return boolean whether session is opened successfully
 	 */
-	public function _open($savePath,$sessionName)
+	public function _open($savePath, $sessionName)
 	{
 		return true;
 	}
@@ -463,7 +463,7 @@ 
 	 * @param string session data
 	 * @return boolean whether session write is successful
 	 */
-	public function _write($id,$data)
+	public function _write($id, $data)
 	{
 		return true;
 	}
@@ -545,7 +545,7 @@ 
 	 * @param mixed session variable name
 	 * @param mixed session variable value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
 		$_SESSION[$key]=$value;
 	}
@@ -618,7 +618,7 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
 		$_SESSION[$offset]=$item;
 	}

framework/Web/UI/ActiveControls/TActiveListBox.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 	/**
 	 * Javascript client class for this control.
 	 * This method overrides the parent implementation.
-	 * @return null no javascript class name.
+	 * @return string no javascript class name.
 	 */
 	protected function getClientClassName()
 	{

Spacing +7 added lines, -7 removed lines

@@ -62,7 +62,7 @@ 
 	 */
 	protected function createListItemCollection()
 	{
-		$collection  = new TActiveListItemCollection;
+		$collection=new TActiveListItemCollection;
 		$collection->setControl($this);
 		return $collection;
 	}
@@ -85,15 +85,15 @@ 
 	 */
 	public function setSelectionMode($value)
 	{
-		if(parent::getSelectionMode() === $value)
+		if(parent::getSelectionMode()===$value)
 			return;
 
 		parent::setSelectionMode($value);
-		$multiple = $this->getIsMultiSelect();
-		$id = $this->getUniqueID(); $multi_id = $id.'[]';
+		$multiple=$this->getIsMultiSelect();
+		$id=$this->getUniqueID(); $multi_id=$id.'[]';
 		if($this->getActiveControl()->canUpdateClientSide())
 		{
-			$client = $this->getPage()->getCallbackClient();
+			$client=$this->getPage()->getCallbackClient();
 			$client->setAttribute($this, 'multiple', $multiple ? 'multiple' : false);
 			$client->setAttribute($this, 'name', $multiple ? $multi_id : $id);
 		}
@@ -146,8 +146,8 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
-		if ($this->getAutoPostBack())
+		$writer->addAttribute('id', $this->getClientID());
+		if($this->getAutoPostBack())
 			$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
 	}