pradosoft / prado

framework/Web/UI/ActiveControls/TActivePager.php

Braces +3 added lines, -6 removed lines

@@ -127,8 +127,7 @@ 
 				$button->setCssClass($this->getButtonCssClass());
 				return $button;
 			}
-		}
-		else if($buttonType===TPagerButtonType::ImageButton)
+		} else if($buttonType===TPagerButtonType::ImageButton)
 		{
 			$button = new TActiveImageButton;
 			$button->setImageUrl($this->getPageImageUrl($text,$commandName));
@@ -136,8 +135,7 @@ 
 				$button->Visible = true;
 			else
 				$button->Visible = false;
-		}
-		else
+		} else
 		{
 			$button=new TActiveButton;
 			if(!$enabled)
@@ -197,8 +195,7 @@ 
 			TWebControl::render($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this,$writer);
-		}
-		else
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}

Spacing +15 added lines, -15 removed lines

@@ -94,11 +94,11 @@ 
 		);
 
 		$this->getControls()->add($list);
-		$list->setDataSource(range(1,$this->getPageCount()));
+		$list->setDataSource(range(1, $this->getPageCount()));
 		$list->dataBind();
 		$list->setSelectedIndex($this->getCurrentPageIndex());
 		$list->setAutoPostBack(true);
-		$list->attachEventHandler('OnSelectedIndexChanged',array($this,'listIndexChanged'));
+		$list->attachEventHandler('OnSelectedIndexChanged', array($this, 'listIndexChanged'));
 		$list->attachEventHandler('OnCallback', array($this, 'handleCallback'));
 	}
 
@@ -114,7 +114,7 @@ 
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
 	 * @return mixed the button instance
 	 */
-	protected function createPagerButton($buttonType,$enabled,$text,$commandName,$commandParameter)
+	protected function createPagerButton($buttonType, $enabled, $text, $commandName, $commandParameter)
 	{
 		if($buttonType===TPagerButtonType::LinkButton)
 		{
@@ -130,12 +130,12 @@ 
 		}
 		else if($buttonType===TPagerButtonType::ImageButton)
 		{
-			$button = new TActiveImageButton;
-			$button->setImageUrl($this->getPageImageUrl($text,$commandName));
+			$button=new TActiveImageButton;
+			$button->setImageUrl($this->getPageImageUrl($text, $commandName));
 			if($enabled)
-				$button->Visible = true;
+				$button->Visible=true;
 			else
-				$button->Visible = false;
+				$button->Visible=false;
 		}
 		else
 		{
@@ -146,7 +146,7 @@ 
 
 		if($buttonType===TPagerButtonType::ImageButton)
 		{
-			$button->ImageUrl = $text;
+			$button->ImageUrl=$text;
 		}
 
 		$button->setText($text);
@@ -170,14 +170,14 @@ 
 	 * @param mixed $sender
 	 * @param TCallbackEventParameter $param
 	 */
-	public function handleCallback ($sender,$param)
+	public function handleCallback($sender, $param)
 	{
 		// Update all the buttons pagers attached to the same control.
 		// Dropdown pagers doesn't need to be re-rendered.
 		$controlToPaginate=$this->getControlToPaginate();
-		foreach ($this->getNamingContainer()->findControlsByType('TActivePager', false) as $control)
+		foreach($this->getNamingContainer()->findControlsByType('TActivePager', false) as $control)
 		{
-			if ($control->getMode() !== TPagerMode::DropDownList && $control->getControlToPaginate()===$controlToPaginate)
+			if($control->getMode()!==TPagerMode::DropDownList && $control->getControlToPaginate()===$controlToPaginate)
 			{
 				$control->render($param->getNewWriter());
 				// FIXME : With some very fast machine, the getNewWriter() consecutive calls are in the same microsecond, resulting
@@ -189,18 +189,18 @@ 
 		$this->onCallback($param);
 	}
 
-	public function render ($writer)
+	public function render($writer)
 	{
 		if($this->getHasPreRendered())
 		{
-			$this->setDisplay(($this->getPageCount()==1)?TDisplayStyle::None:TDisplayStyle::Dynamic);
+			$this->setDisplay(($this->getPageCount()==1) ? TDisplayStyle::None : TDisplayStyle::Dynamic);
 			TWebControl::render($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this,$writer);
+				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
 		}
 		else
 		{
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}
 }

framework/Web/UI/ActiveControls/TActiveRepeater.php

Braces +1 added lines, -2 removed lines

@@ -95,8 +95,7 @@
 		if($this->getHasPreRendered()) {
 			$this->renderRepeater($writer);
 			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
-		}
-		else {
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}
 	}

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
 		parent::setDataSource($value);
 		if($this->getActiveControl()->canUpdateClientSide()) {
 			$this->renderPager();
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 		}
 	}
 
@@ -94,10 +94,10 @@ 
 	public function render($writer) {
 		if($this->getHasPreRendered()) {
 			$this->renderRepeater($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
+			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
 		}
 		else {
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}
 
@@ -111,7 +111,7 @@ 
 		foreach($pager as $item) {
 			if($item->ControlToPaginate==$this->ID) {
 				$writer=$this->getResponse()->createHtmlWriter();
-				$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+				$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
 			}
 		}
 	}
@@ -123,7 +123,7 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 */
 	private function renderRepeater($writer) {
-		$writer->addAttribute('id',$this->getSurroundingTagID());
+		$writer->addAttribute('id', $this->getSurroundingTagID());
 		$writer->renderBeginTag($this->getSurroundingTag());
 		parent::render($writer);
 		$writer->renderEndTag();

framework/Collections/TQueue.php

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
 				$this->_d[]=$item;
 				++$this->_c;
 			}
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
  * @package System.Collections
  * @since 3.1
  */
-class TQueue extends TComponent implements IteratorAggregate,Countable
+class TQueue extends TComponent implements IteratorAggregate, Countable
 {
 	/**
 	 * internal data storage
@@ -101,7 +101,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return array_search($item,$this->_d,true)!==false;
+		return array_search($item, $this->_d, true)!==false;
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	public function enqueue($item)
 	{
 		++$this->_c;
-		$this->_d[] = $item;
+		$this->_d[]=$item;
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 
 	/**
@@ -257,7 +257,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_i<$this->_c;
+		return $this->_i < $this->_c;
 	}
 }
 

requirements/index.php

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 
 		echo "\n\n** PDF file quickstart.pdf created **\n\n";
 
-	}
-	else
+	} else
 	{
 		echo " Unable to find pdfLatex executable $pdflatexExec";
 	}

Spacing +22 added lines, -22 removed lines

@@ -27,11 +27,11 @@ 
 /**
  * @var array List of requirements (required or not, check item, hint)
  */
-$requirements = array(
+$requirements=array(
 	array(
 		true,
-		version_compare(PHP_VERSION,"5.3.3",">="),
-		'PHP version check','PHP 5.3.3 or higher required'),
+		version_compare(PHP_VERSION, "5.3.3", ">="),
+		'PHP version check', 'PHP 5.3.3 or higher required'),
 	array(
 		true,
 		isset($_SERVER["HTTP_ACCEPT"]),
@@ -49,17 +49,17 @@ 
 		'REQUEST_URI required'),
 	array(
 		true,
-		isset($_SERVER["PATH_INFO"]) || strpos($_SERVER["PHP_SELF"],$_SERVER["SCRIPT_NAME"])===0,
+		isset($_SERVER["PATH_INFO"]) || strpos($_SERVER["PHP_SELF"], $_SERVER["SCRIPT_NAME"])===0,
 		'$_SERVER["PATH_INFO"] check',
 		'PATH_INFO required'),
 	array(
 		true,
-		class_exists('Reflection',false),
+		class_exists('Reflection', false),
 		'Reflection extension check',
 		'Reflection extension required'),
 	array(
 		true,
-		class_exists("DOMDocument",false),
+		class_exists("DOMDocument", false),
 		'DOM extension check',
 		'DOM extension required'),
     array(
@@ -84,7 +84,7 @@ 
         'JSON extension required'),
     array(
         false,
-        class_exists("PDO",false),
+        class_exists("PDO", false),
         'PDO extension check',
         'PDO extension optional'),
 	array(
@@ -149,11 +149,11 @@ 
 		'SOAP extension optional'),
 );
 
-$results = "<table class=\"result\">\n";
-$conclusion = 0;
+$results="<table class=\"result\">\n";
+$conclusion=0;
 foreach($requirements as $requirement)
 {
-	list($required,$expression,$aspect,$hint)=$requirement;
+	list($required, $expression, $aspect, $hint)=$requirement;
 	//eval('$ret='.$expression.';');
 	$ret=$expression;
 	if($required)
@@ -179,7 +179,7 @@ 
 	}
 	$results.="<tr class=\"$ret\"><td class=\"$ret\">".lmessage($aspect)."</td><td class=\"$ret\">".lmessage($hint)."</td></tr>\n";
 }
-$results .= '</table>';
+$results.='</table>';
 if($conclusion===0)
 	$conclusion=lmessage('all passed');
 else if($conclusion===1)
@@ -187,11 +187,11 @@ 
 else
 	$conclusion=lmessage('passed with warnings');
 
-$tokens = array(
+$tokens=array(
 	'%%Conclusion%%' => $conclusion,
 	'%%Details%%' => $results,
 	'%%Version%%' => $_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.getPradoVersion(),
-	'%%Time%%' => @strftime('%Y-%m-%d %H:%m',time()),
+	'%%Time%%' => @strftime('%Y-%m-%d %H:%m', time()),
 );
 
 $lang=getPreferredLanguage();
@@ -202,7 +202,7 @@ 
 	die("Unable to open template file '$templateFile'.");
 
 header('Content-Type: text/html; charset=UTF-8');
-echo strtr($content,$tokens);
+echo strtr($content, $tokens);
 
 /**
  * Returns a localized message according to user preferred language.
@@ -214,7 +214,7 @@ 
 	static $messages=null;
 	if($messages===null)
 	{
-		$lang = getPreferredLanguage();
+		$lang=getPreferredLanguage();
 		$msgFile=dirname(__FILE__)."/messages-$lang.txt";
 		if(!is_file($msgFile))
 			$msgFile=dirname(__FILE__).'/messages.txt';
@@ -222,12 +222,12 @@ 
 		{
 			foreach($entries as $entry)
 			{
-				@list($code,$message)=explode('=',$entry,2);
+				@list($code, $message)=explode('=', $entry, 2);
 				$messages[trim($code)]=trim($message);
 			}
 		}
 	}
-	return isset($messages[$token])?$messages[$token]:$token;
+	return isset($messages[$token]) ? $messages[$token] : $token;
 }
 
 /**
@@ -243,10 +243,10 @@ 
 	if($languages===null)
 	{
 		$languages=array();
-		foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
+		foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 		{
-			$array=explode(';q=',trim($language));
-			$languages[trim($array[0])]=isset($array[1])?(float)$array[1]:1.0;
+			$array=explode(';q=', trim($language));
+			$languages[trim($array[0])]=isset($array[1]) ? (float) $array[1] : 1.0;
 		}
 		arsort($languages);
 		$languages=array_keys($languages);
@@ -266,7 +266,7 @@ 
 	if($language===null)
 	{
 		$langs=getUserLanguages();
-		$lang=explode('-',$langs[0]);
+		$lang=explode('-', $langs[0]);
 		if(empty($lang[0]) || !function_exists('ctype_alpha') || !ctype_alpha($lang[0]))
 			$language='en';
 		else
@@ -285,7 +285,7 @@ 
 	{
 		$contents=file_get_contents($coreFile);
 		$matches=array();
-		if(preg_match('/public static function getVersion.*?return \'(.*?)\'/ms',$contents,$matches)>0)
+		if(preg_match('/public static function getVersion.*?return \'(.*?)\'/ms', $contents, $matches) > 0)
 			return $matches[1];
 	}
 	return '';

Indentation +33 added lines, -33 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * PRADO Requirements Checker script
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package prado
- */
+	 * PRADO Requirements Checker script
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package prado
+	 */
 
 /**
  * PRADO Requirements Checker script
@@ -62,31 +62,31 @@ 
 		class_exists("DOMDocument",false),
 		'DOM extension check',
 		'DOM extension required'),
-    array(
-        true,
-        extension_loaded("SPL"),
-        'SPL extension check',
-        'SPL extension required'),
-    array(
-        true,
-        extension_loaded("CType"),
-        'CType extension check',
-        'CType extension required'),
-    array(
-        true,
-        extension_loaded("pcre"),
-        'PCRE extension check',
-        'PCRE extension required'),
-    array(
-        true,
-        extension_loaded("json"),
-        'JSON extension check',
-        'JSON extension required'),
-    array(
-        false,
-        class_exists("PDO",false),
-        'PDO extension check',
-        'PDO extension optional'),
+	array(
+		true,
+		extension_loaded("SPL"),
+		'SPL extension check',
+		'SPL extension required'),
+	array(
+		true,
+		extension_loaded("CType"),
+		'CType extension check',
+		'CType extension required'),
+	array(
+		true,
+		extension_loaded("pcre"),
+		'PCRE extension check',
+		'PCRE extension required'),
+	array(
+		true,
+		extension_loaded("json"),
+		'JSON extension check',
+		'JSON extension required'),
+	array(
+		false,
+		class_exists("PDO",false),
+		'PDO extension check',
+		'PDO extension optional'),
 	array(
 		false,
 		function_exists("iconv"),

framework/Xml/TXmlDocument.php

Doc Comments +5 added lines

@@ -66,6 +66,7 @@ 
 
 	/**
 	 * @param TXmlElement parent element of this element
+	 * @param TXmlElement|null $parent
 	 */
 	public function setParent($parent)
 	{
@@ -175,6 +176,7 @@ 
 	}
 
 	/**
+	 * @param string $tagName
 	 * @return TList list of all child elements that have the specified tag-name
 	 */
 	public function getElementsByTagName($tagName)
@@ -334,6 +336,7 @@ 
 
 	/**
 	 * @param string version of this XML document
+	 * @param string $version
 	 */
 	public function setVersion($version)
 	{
@@ -350,6 +353,7 @@ 
 
 	/**
 	 * @param string encoding of this XML document
+	 * @param string $encoding
 	 */
 	public function setEncoding($encoding)
 	{
@@ -473,6 +477,7 @@ 
 	/**
 	 * Recursively converts DOM XML nodes into TXmlElement
 	 * @param DOMXmlNode the node to be converted
+	 * @param DOMElement $node
 	 * @return TXmlElement the converted TXmlElement
 	 */
 	protected function buildElement($node)

Spacing +24 added lines, -24 removed lines

@@ -109,7 +109,7 @@ 
 	 */
 	public function getHasElement()
 	{
-		return $this->_elements!==null && $this->_elements->getCount()>0;
+		return $this->_elements!==null && $this->_elements->getCount() > 0;
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function getHasAttribute()
 	{
-		return $this->_attributes!==null && $this->_attributes->getCount()>0;
+		return $this->_attributes!==null && $this->_attributes->getCount() > 0;
 	}
 
 	/**
@@ -135,9 +135,9 @@ 
 	 * @param string attribute name
 	 * @param string attribute value
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,TPropertyValue::ensureString($value));
+		$this->getAttributes()->add($name, TPropertyValue::ensureString($value));
 	}
 
 	/**
@@ -203,12 +203,12 @@ 
 				$attr.=" $name=\"$value\"";
 			}
 		}
-		$prefix=str_repeat(' ',$indent*4);
+		$prefix=str_repeat(' ', $indent * 4);
 		if($this->getHasElement())
 		{
 			$str=$prefix."<{$this->_tagName}$attr>\n";
 			foreach($this->getElements() as $element)
-				$str.=$element->toString($indent+1)."\n";
+				$str.=$element->toString($indent + 1)."\n";
 			$str.=$prefix."</{$this->_tagName}>";
 			return $str;
 		}
@@ -241,7 +241,7 @@ 
 
 	private function xmlEncode($str)
 	{
-		return strtr($str,array(
+		return strtr($str, array(
 			'>'=>'&gt;',
 			'<'=>'&lt;',
 			'&'=>'&amp;',
@@ -317,7 +317,7 @@ 
 	 * @param string version of this XML document
 	 * @param string encoding of this XML document
 	 */
-	public function __construct($version='1.0',$encoding='')
+	public function __construct($version='1.0', $encoding='')
 	{
 		parent::__construct('');
 		$this->setVersion($version);
@@ -367,7 +367,7 @@ 
 		if(($str=@file_get_contents($file))!==false)
 			return $this->loadFromString($str);
 		else
-			throw new TIOException('xmldocument_file_read_failed',$file);
+			throw new TIOException('xmldocument_file_read_failed', $file);
 	}
 
 	/**
@@ -395,17 +395,17 @@ 
 		$attributes->clear();
 
 		static $bSimpleXml;
-		if($bSimpleXml === null)
-			$bSimpleXml = (boolean)function_exists('simplexml_load_string');
+		if($bSimpleXml===null)
+			$bSimpleXml=(boolean) function_exists('simplexml_load_string');
 
 		if($bSimpleXml)
 		{
-			$simpleDoc = simplexml_load_string($string);
-			$docNamespaces = $simpleDoc->getDocNamespaces(false);
-			$simpleDoc = null;
+			$simpleDoc=simplexml_load_string($string);
+			$docNamespaces=$simpleDoc->getDocNamespaces(false);
+			$simpleDoc=null;
 			foreach($docNamespaces as $prefix => $uri)
 			{
- 				if($prefix === '')
+ 				if($prefix==='')
    					$attributes->add('xmlns', $uri);
    				else
    					$attributes->add('xmlns:'.$prefix, $uri);
@@ -413,7 +413,7 @@ 
 		}
 
 		foreach($element->attributes as $name=>$attr)
-			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') .$name,$attr->value);
+			$attributes->add(($attr->prefix==='' ? '' : $attr->prefix.':').$name, $attr->value);
 		foreach($element->childNodes as $child)
 		{
 			if($child instanceof DOMElement)
@@ -430,13 +430,13 @@ 
 	 */
 	public function saveToFile($file)
 	{
-		if(($fw=fopen($file,'w'))!==false)
+		if(($fw=fopen($file, 'w'))!==false)
 		{
-			fwrite($fw,$this->saveToString());
+			fwrite($fw, $this->saveToString());
 			fclose($fw);
 		}
 		else
-			throw new TIOException('xmldocument_file_write_failed',$file);
+			throw new TIOException('xmldocument_file_write_failed', $file);
 	}
 
 	/**
@@ -445,8 +445,8 @@ 
 	 */
 	public function saveToString()
 	{
-		$version=empty($this->_version)?' version="1.0"':' version="'.$this->_version.'"';
-		$encoding=empty($this->_encoding)?'':' encoding="'.$this->_encoding.'"';
+		$version=empty($this->_version) ? ' version="1.0"' : ' version="'.$this->_version.'"';
+		$encoding=empty($this->_encoding) ? '' : ' encoding="'.$this->_encoding.'"';
 		return "<?xml{$version}{$encoding}?>\n".$this->toString(0);
 	}
 
@@ -480,7 +480,7 @@ 
 		$element=new TXmlElement($node->tagName);
 		$element->setValue($node->nodeValue);
 		foreach($node->attributes as $name=>$attr)
-			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name,$attr->value);
+			$element->getAttributes()->add(($attr->prefix==='' ? '' : $attr->prefix.':').$name, $attr->value);
 
 		foreach($node->childNodes as $child)
 		{
@@ -534,11 +534,11 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TXmlElement object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TXmlElement)
 		{
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 			if($item->getParent()!==null)
 				$item->getParent()->getElements()->remove($item);
 			$item->setParent($this->_o);

Braces +4 added lines, -8 removed lines

@@ -211,13 +211,11 @@ 
 				$str.=$element->toString($indent+1)."\n";
 			$str.=$prefix."</{$this->_tagName}>";
 			return $str;
-		}
-		else if(($value=$this->getValue())!=='')
+		} else if(($value=$this->getValue())!=='')
 		{
 			$value=$this->xmlEncode($value);
 			return $prefix."<{$this->_tagName}$attr>$value</{$this->_tagName}>";
-		}
-		else
+		} else
 			return $prefix."<{$this->_tagName}$attr />";
 	}
 
@@ -434,8 +432,7 @@ 
 		{
 			fwrite($fw,$this->saveToString());
 			fclose($fw);
-		}
-		else
+		} else
 			throw new TIOException('xmldocument_file_write_failed',$file);
 	}
 
@@ -542,8 +539,7 @@ 
 			if($item->getParent()!==null)
 				$item->getParent()->getElements()->remove($item);
 			$item->setParent($this->_o);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('xmlelementlist_xmlelement_required');
 	}
 

framework/Web/Javascripts/packages.php

Spacing +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@ 
 //$Id: packages.php 3319 2013-09-08 20:59:44Z ctrlaltca $
 
 // To make future upgrades easier
-if (!defined('PROTOTYPE_DIR')) define ('PROTOTYPE_DIR', 'prototype-1.7');
-if (!defined('JQUERY_DIR')) define ('JQUERY_DIR', 'jquery');
-if (!defined('BOOTSTRAP_DIR')) define ('BOOTSTRAP_DIR', 'bootstrap3');
-if (!defined('SCRIPTACULOUS_DIR')) define ('SCRIPTACULOUS_DIR', 'scriptaculous-1.9.0');
+if(!defined('PROTOTYPE_DIR')) define('PROTOTYPE_DIR', 'prototype-1.7');
+if(!defined('JQUERY_DIR')) define('JQUERY_DIR', 'jquery');
+if(!defined('BOOTSTRAP_DIR')) define('BOOTSTRAP_DIR', 'bootstrap3');
+if(!defined('SCRIPTACULOUS_DIR')) define('SCRIPTACULOUS_DIR', 'scriptaculous-1.9.0');
 
 //package names and its contents (files relative to the current directory)
-$packages = array(
+$packages=array(
 	// base prado scripts
 	'prado' => array(
 		'prado/prado.js',
@@ -115,7 +115,7 @@ 
 
 
 //package names and their dependencies
-$dependencies = array(
+$dependencies=array(
 		'jquery'			=> array('jquery'),
 		'prado'				=> array('jquery', 'prado'),
 		'bootstrap'			=> array('jquery', 'bootstrap'),
@@ -138,7 +138,7 @@ 
 		'jqueryui'			=> array('jquery', 'jqueryui'),
 		'prototype'			=> array('prototype'),
 		'dragdrop'			=> array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop'),
-		'dragdropextra'		=> array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop','dragdropextra'),
+		'dragdropextra'		=> array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop', 'dragdropextra'),
 		'autocomplete'		=> array('prototype', 'jquery', 'prado', 'ajax', 'autocomplete'),
 );
 

framework/Web/TUrlManager.php

Spacing +11 added lines, -11 removed lines

@@ -64,10 +64,10 @@ 
 	 * @return string URL
 	 * @see parseUrl
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
 		$url=$serviceID.'='.urlencode($serviceParam);
-		$amp=$encodeAmpersand?'&':'&';
+		$amp=$encodeAmpersand ? '&' : '&';
 		$request=$this->getRequest();
 		if(is_array($getItems) || $getItems instanceof Traversable)
 		{
@@ -103,9 +103,9 @@ 
 		switch($request->getUrlFormat())
 		{
 			case THttpRequestUrlFormat::Path:
-				return $request->getApplicationUrl().'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return $request->getApplicationUrl().'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			case THttpRequestUrlFormat::HiddenPath:
-				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			default:
 				return $request->getApplicationUrl().'?'.$url;
 		}
@@ -127,24 +127,24 @@ 
 	public function parseUrl()
 	{
 		$request=$this->getRequest();
-		$pathInfo=trim($request->getPathInfo(),'/');
+		$pathInfo=trim($request->getPathInfo(), '/');
 		if(($request->getUrlFormat()===THttpRequestUrlFormat::Path ||
 			$request->getUrlFormat()===THttpRequestUrlFormat::HiddenPath) &&
 			$pathInfo!=='')
 		{
 			$separator=$request->getUrlParamSeparator();
-			$paths=explode('/',$pathInfo);
+			$paths=explode('/', $pathInfo);
 			$getVariables=array();
 			foreach($paths as $path)
 			{
 				if(($path=trim($path))!=='')
 				{
-					if(($pos=strpos($path,$separator))!==false)
+					if(($pos=strpos($path, $separator))!==false)
 					{
-						$name=substr($path,0,$pos);
-						$value=substr($path,$pos+1);
-						if(($pos=strpos($name,'[]'))!==false)
-							$getVariables[substr($name,0,$pos)][]=$value;
+						$name=substr($path, 0, $pos);
+						$value=substr($path, $pos + 1);
+						if(($pos=strpos($name, '[]'))!==false)
+							$getVariables[substr($name, 0, $pos)][]=$value;
 						else
 							$getVariables[$name]=$value;
 					}

Braces +5 added lines, -10 removed lines

@@ -80,12 +80,10 @@ 
 						$name=urlencode($name.'[]');
 						foreach($value as $v)
 							$url.=$amp.$name.'='.urlencode($v);
-					}
-					else
+					} else
 						$url.=$amp.urlencode($name).'='.urlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($getItems as $name=>$value)
 				{
@@ -93,8 +91,7 @@ 
 					{
 						foreach($value as $v)
 							$url.=$amp.$name.'[]='.$v;
-					}
-					else
+					} else
 						$url.=$amp.$name.'='.$value;
 				}
 			}
@@ -147,14 +144,12 @@ 
 							$getVariables[substr($name,0,$pos)][]=$value;
 						else
 							$getVariables[$name]=$value;
-					}
-					else
+					} else
 						$getVariables[$path]='';
 				}
 			}
 			return $getVariables;
-		}
-		else
+		} else
 			return array();
 	}
 }

framework/Web/Services/TSoapService.php

Spacing +35 added lines, -35 removed lines

@@ -120,7 +120,7 @@ 
 				$this->loadConfig($dom);
 			}
 			else
-				throw new TConfigurationException('soapservice_configfile_invalid',$this->_configFile);
+				throw new TConfigurationException('soapservice_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
 
@@ -137,16 +137,16 @@ 
 	protected function resolveRequest()
 	{
 		$serverID=$this->getRequest()->getServiceParameter();
-		if(($pos=strrpos($serverID,'.wsdl'))===strlen($serverID)-5)
+		if(($pos=strrpos($serverID, '.wsdl'))===strlen($serverID) - 5)
 		{
-			$serverID=substr($serverID,0,$pos);
+			$serverID=substr($serverID, 0, $pos);
 			$this->_wsdlRequest=true;
 		}
 		else
 			$this->_wsdlRequest=false;
 		$this->_serverID=$serverID;
 		if(!isset($this->_servers[$serverID]))
-			throw new THttpException(400,'soapservice_request_invalid',$serverID);
+			throw new THttpException(400, 'soapservice_request_invalid', $serverID);
 	}
 
 	/**
@@ -162,9 +162,9 @@ 
 			{
 				foreach($config['soap'] as $id => $server)
 				{
-					$properties = isset($server['properties'])?$server['properties']:array();
+					$properties=isset($server['properties']) ? $server['properties'] : array();
 					if(isset($this->_servers[$id]))
-						throw new TConfigurationException('soapservice_serverid_duplicated',$id);
+						throw new TConfigurationException('soapservice_serverid_duplicated', $id);
 					$this->_servers[$id]=$properties;
 				}
 			}
@@ -177,7 +177,7 @@ 
 				if(($id=$properties->remove('id'))===null)
 					throw new TConfigurationException('soapservice_serverid_required');
 				if(isset($this->_servers[$id]))
-					throw new TConfigurationException('soapservice_serverid_duplicated',$id);
+					throw new TConfigurationException('soapservice_serverid_duplicated', $id);
 				$this->_servers[$id]=$properties;
 			}
 		}
@@ -198,8 +198,8 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile=Prado::getPathOfNamespace($value,Prado::getApplication()->getConfigurationFileExt()))===null)
-			throw new TConfigurationException('soapservice_configfile_invalid',$value);
+		if(($this->_configFile=Prado::getPathOfNamespace($value, Prado::getApplication()->getConfigurationFileExt()))===null)
+			throw new TConfigurationException('soapservice_configfile_invalid', $value);
 	}
 
 	/**
@@ -210,9 +210,9 @@ 
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
 	 * @return string URL for the page and GET parameters
 	 */
-	public function constructUrl($serverID,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($serverID, $getParams=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
-		return $this->getRequest()->constructUrl($this->getID(),$serverID,$getParams,$encodeAmpersand,$encodeGetItems);
+		return $this->getRequest()->constructUrl($this->getID(), $serverID, $getParams, $encodeAmpersand, $encodeGetItems);
 	}
 
 	/**
@@ -248,13 +248,13 @@ 
 		if($serverClass===null)
 			$serverClass=self::DEFAULT_SOAP_SERVER;
 		Prado::using($serverClass);
-		$className=($pos=strrpos($serverClass,'.'))!==false?substr($serverClass,$pos+1):$serverClass;
-		if($className!==self::DEFAULT_SOAP_SERVER && !is_subclass_of($className,self::DEFAULT_SOAP_SERVER))
-			throw new TConfigurationException('soapservice_server_invalid',$serverClass);
+		$className=($pos=strrpos($serverClass, '.'))!==false ? substr($serverClass, $pos + 1) : $serverClass;
+		if($className!==self::DEFAULT_SOAP_SERVER && !is_subclass_of($className, self::DEFAULT_SOAP_SERVER))
+			throw new TConfigurationException('soapservice_server_invalid', $serverClass);
 		$server=new $className;
 		$server->setID($this->_serverID);
 		foreach($properties as $name=>$value)
-			$server->setSubproperty($name,$value);
+			$server->setSubproperty($name, $value);
 		return $server;
 	}
 
@@ -266,21 +266,21 @@ 
 	 */
 	public function run()
 	{
-		Prado::trace("Running SOAP service",'System.Web.Services.TSoapService');
+		Prado::trace("Running SOAP service", 'System.Web.Services.TSoapService');
 		$server=$this->createServer();
 		$this->getResponse()->setContentType('text/xml');
 		$this->getResponse()->setCharset($server->getEncoding());
 		if($this->getIsWsdlRequest())
 		{
 			// server WSDL file
-			Prado::trace("Generating WSDL",'System.Web.Services.TSoapService');
+			Prado::trace("Generating WSDL", 'System.Web.Services.TSoapService');
 			$this->getResponse()->clear();
 			$this->getResponse()->write($server->getWsdl());
 		}
 		else
 		{
 			// provide SOAP service
-			Prado::trace("Handling SOAP request",'System.Web.Services.TSoapService');
+			Prado::trace("Handling SOAP request", 'System.Web.Services.TSoapService');
 			$server->run();
 		}
 	}
@@ -331,8 +331,8 @@ 
 	 */
 	public function setID($id)
 	{
-		if(strrpos($this->_id,'.wsdl')===strlen($this->_id)-5)
-			throw new TInvalidDataValueException('soapserver_id_invalid',$id);
+		if(strrpos($this->_id, '.wsdl')===strlen($this->_id) - 5)
+			throw new TInvalidDataValueException('soapserver_id_invalid', $id);
 		$this->_id=$id;
 	}
 
@@ -344,7 +344,7 @@ 
 		if(($provider=$this->getProvider())!==null)
 		{
 			Prado::using($provider);
-			$providerClass=($pos=strrpos($provider,'.'))!==false?substr($provider,$pos+1):$provider;
+			$providerClass=($pos=strrpos($provider, '.'))!==false ? substr($provider, $pos + 1) : $provider;
 			$this->guessMethodCallRequested($providerClass);
 			$server=$this->createServer();
 			$server->setClass($providerClass, $this);
@@ -357,7 +357,7 @@ 
 		{
 			$server->handle();
 		}
-		catch (Exception $e)
+		catch(Exception $e)
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->fault($e->getMessage(), $e->__toString());
@@ -376,7 +376,7 @@ 
 	 */
 	public function fault($title, $details='', $code='SERVER', $actor='', $name='')
 	{
-		Prado::trace('SOAP-Fault '.$code. ' '.$title.' : '.$details, 'System.Web.Services.TSoapService');
+		Prado::trace('SOAP-Fault '.$code.' '.$title.' : '.$details, 'System.Web.Services.TSoapService');
 		$this->_server->fault($code, $title, $actor, $details, $name);
 	}
 
@@ -387,14 +387,14 @@ 
 	 */
 	protected function guessMethodCallRequested($class)
 	{
-		$namespace = $class.'wsdl';
-		$message = file_get_contents("php://input");
-		$matches= array();
+		$namespace=$class.'wsdl';
+		$message=file_get_contents("php://input");
+		$matches=array();
 		if(preg_match('/xmlns:([^=]+)="urn:'.$namespace.'"/', $message, $matches))
 		{
 			if(preg_match('/<'.$matches[1].':([a-zA-Z_]+[a-zA-Z0-9_]+)/', $message, $method))
 			{
-				$this->_requestedMethod = $method[1];
+				$this->_requestedMethod=$method[1];
 			}
 		}
 	}
@@ -417,8 +417,8 @@ 
 		if($this->_server===null)
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
-				ini_set("soap.wsdl_cache_enabled",0);
-			$this->_server = new SoapServer($this->getWsdlUri(),$this->getOptions());
+				ini_set("soap.wsdl_cache_enabled", 0);
+			$this->_server=new SoapServer($this->getWsdlUri(), $this->getOptions());
 		}
 		return $this->_server;
 	}
@@ -459,7 +459,7 @@ 
 		if($this->_wsdlUri==='')
 		{
 			$provider=$this->getProvider();
-			$providerClass=($pos=strrpos($provider,'.'))!==false?substr($provider,$pos+1):$provider;
+			$providerClass=($pos=strrpos($provider, '.'))!==false ? substr($provider, $pos + 1) : $provider;
 			Prado::using($provider);
 			if($this->getApplication()->getMode()===TApplicationMode::Performance && ($cache=$this->getApplication()->getCache())!==null)
 			{
@@ -468,7 +468,7 @@ 
 					return $wsdl;
 				Prado::using('System.3rdParty.WsdlGen.WsdlGenerator');
 				$wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
-				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass,$wsdl);
+				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass, $wsdl);
 				return $wsdl;
 			}
 			else
@@ -487,7 +487,7 @@ 
 	public function getWsdlUri()
 	{
 		if($this->_wsdlUri==='')
-			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID().'.wsdl',false);
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID().'.wsdl', false);
 		else
 			return $this->_wsdlUri;
 	}
@@ -506,7 +506,7 @@ 
 	public function getUri()
 	{
 		if($this->_uri==='')
-			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID(),false);
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID(), false);
 		else
 			return $this->_uri;
 	}
@@ -552,7 +552,7 @@ 
 		if($value==='1.1' || $value==='1.2' || $value==='')
 			$this->_version=$value;
 		else
-			throw new TInvalidDataValueException('soapserver_version_invalid',$value);
+			throw new TInvalidDataValueException('soapserver_version_invalid', $value);
 	}
 
 	/**
@@ -616,7 +616,7 @@ 
 	 */
 	public function setClassMaps($classes)
 	{
-		$this->_classMap = $classes;
+		$this->_classMap=$classes;
 	}
 }
 

Braces +8 added lines, -16 removed lines

@@ -118,8 +118,7 @@ 
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadConfig($dom);
-			}
-			else
+			} else
 				throw new TConfigurationException('soapservice_configfile_invalid',$this->_configFile);
 		}
 		$this->loadConfig($config);
@@ -141,8 +140,7 @@ 
 		{
 			$serverID=substr($serverID,0,$pos);
 			$this->_wsdlRequest=true;
-		}
-		else
+		} else
 			$this->_wsdlRequest=false;
 		$this->_serverID=$serverID;
 		if(!isset($this->_servers[$serverID]))
@@ -168,8 +166,7 @@ 
 					$this->_servers[$id]=$properties;
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('soap') as $serverXML)
 			{
@@ -276,8 +273,7 @@ 
 			Prado::trace("Generating WSDL",'System.Web.Services.TSoapService');
 			$this->getResponse()->clear();
 			$this->getResponse()->write($server->getWsdl());
-		}
-		else
+		} else
 		{
 			// provide SOAP service
 			Prado::trace("Handling SOAP request",'System.Web.Services.TSoapService');
@@ -350,14 +346,12 @@ 
 			$server->setClass($providerClass, $this);
 			if($this->_persistent)
 				$server->setPersistence(SOAP_PERSISTENCE_SESSION);
-		}
-		else
+		} else
 			$server=$this->createServer();
 		try
 		{
 			$server->handle();
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->fault($e->getMessage(), $e->__toString());
@@ -470,14 +464,12 @@ 
 				$wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass,$wsdl);
 				return $wsdl;
-			}
-			else
+			} else
 			{
 				Prado::using('System.3rdParty.WsdlGen.WsdlGenerator');
 				return WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 			}
-		}
-		else
+		} else
 			return file_get_contents($this->_wsdlUri);
 	}
 

framework/Web/UI/ActiveControls/TValueTriggeredCallback.php

Spacing +5 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function setDecayRate($value)
 	{
-		$decay = TPropertyValue::ensureFloat($value);
+		$decay=TPropertyValue::ensureFloat($value);
 		if($decay < 0)
 			throw new TConfigurationException('callback_decay_be_not_negative', $this->getID());
 		$this->setViewState('Decay', $decay);
@@ -90,10 +90,10 @@ 
 	 */
 	protected function getTriggerOptions()
 	{
-		$options = parent::getTriggerOptions();
-		$options['PropertyName'] = $this->getPropertyName();
-		$options['Interval'] = $this->getInterval();
-		$options['Decay'] = $this->getDecayRate();
+		$options=parent::getTriggerOptions();
+		$options['PropertyName']=$this->getPropertyName();
+		$options['Interval']=$this->getInterval();
+		$options['Decay']=$this->getDecayRate();
 		return $options;
 	}