pradosoft / prado

framework/I18N/TI18NControl.php

Spacing +7 added lines, -7 removed lines

@@ -41,18 +41,18 @@ 
 	 */
 	public function getCharset()
 	{
-		$app = $this->getApplication()->getGlobalization(false);
+		$app=$this->getApplication()->getGlobalization(false);
 
 		//instance charset
-		$charset = $this->getViewState('Charset','');
+		$charset=$this->getViewState('Charset', '');
 
 		//fall back to globalization charset
 		if(empty($charset))
-			$charset = ($app===null) ? '' : $app->getCharset();
+			$charset=($app===null) ? '' : $app->getCharset();
 
 		//fall back to default charset
 		if(empty($charset))
-			$charset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();
+			$charset=($app===null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		return $charset;
 	}
@@ -63,7 +63,7 @@ 
 	 */
 	public function setCharset($value)
 	{
-		$this->setViewState('Charset',$value,'');
+		$this->setViewState('Charset', $value, '');
 	}
 
 
@@ -74,7 +74,7 @@ 
 	 */
 	public function getCulture()
 	{
-		return $this->getViewState('Culture','');
+		return $this->getViewState('Culture', '');
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 */
 	public function setCulture($culture)
 	{
-		$this->setViewState('Culture',$culture,'');
+		$this->setViewState('Culture', $culture, '');
 	}
 }
 

framework/I18N/TChoiceFormat.php

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->getViewState('Value','');
+		return $this->getViewState('Value', '');
 	}
 
 	/**
@@ -89,7 +89,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value',$value,'');
+		$this->setViewState('Value', $value, '');
 	}
 
 	/**
@@ -99,10 +99,10 @@ 
 	 */
 	protected function translateText($text, $subs)
 	{
-		$text = parent::translateText($text, $subs);
-		$choice = new ChoiceFormat();
-		$value = $this->getValue();
-		$string = $choice->format($text, $value);
+		$text=parent::translateText($text, $subs);
+		$choice=new ChoiceFormat();
+		$value=$this->getValue();
+		$string=$choice->format($text, $value);
 		if($string)
 			return strtr($string, array('{Value}'=> $value));
 	}

framework/I18N/TGlobalization.php

Spacing +28 added lines, -28 removed lines

@@ -29,13 +29,13 @@ 
 	 * Default character set is 'UTF-8'.
 	 * @var string
 	 */
-	private $_defaultCharset = 'UTF-8';
+	private $_defaultCharset='UTF-8';
 
 	/**
 	 * Default culture is 'en'.
 	 * @var string
 	 */
-	private $_defaultCulture = 'en';
+	private $_defaultCulture='en';
 
 	/**
 	 * The current charset.
@@ -77,11 +77,11 @@ 
 		if($config!==null)
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-				$translation = isset($config['translate'])?$config['translate']:null;
+				$translation=isset($config['translate']) ? $config['translate'] : null;
 			else
 			{
-				$t = $config->getElementByTagName('translation');
-				$translation = ($t)?$t->getAttributes():null;
+				$t=$config->getElementByTagName('translation');
+				$translation=($t) ? $t->getAttributes() : null;
 			}
 			if($translation)
 				$this->setTranslationConfiguration($translation);
@@ -102,7 +102,7 @@ 
 	 */
 	public function setTranslateDefaultCulture($value)
 	{
-		$this->_translateDefaultCulture = TPropertyValue::ensureBoolean($value);
+		$this->_translateDefaultCulture=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 */
 	public function setDefaultCulture($culture)
 	{
-		$this->_defaultCulture = str_replace('-','_',$culture);
+		$this->_defaultCulture=str_replace('-', '_', $culture);
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	 */
 	public function setDefaultCharset($charset)
 	{
-		$this->_defaultCharset = $charset;
+		$this->_defaultCharset=$charset;
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	 */
 	public function setCulture($culture)
 	{
-		$this->_culture = str_replace('-','_',$culture);
+		$this->_culture=str_replace('-', '_', $culture);
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = $charset;
+		$this->_charset=$charset;
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 	 */
 	public function getTranslationConfiguration()
 	{
-		return (!$this->_translateDefaultCulture && ($this->getDefaultCulture() == $this->getCulture()))
+		return (!$this->_translateDefaultCulture && ($this->getDefaultCulture()==$this->getCulture()))
 			? null
 			: $this->_translation;
 	}
@@ -196,11 +196,11 @@ 
 	 */
 	protected function setTranslationConfiguration($config)
 	{
-		if($config['type'] == 'XLIFF' || $config['type'] == 'gettext')
+		if($config['type']=='XLIFF' || $config['type']=='gettext')
 		{
 			if($config['source'])
 			{
-				$config['source'] = Prado::getPathOfNamespace($config['source']);
+				$config['source']=Prado::getPathOfNamespace($config['source']);
 				if(!is_dir($config['source']))
 				{
 					if(@mkdir($config['source'])===false)
@@ -216,7 +216,7 @@ 
 		}
 		if($config['cache'])
 		{
-			$config['cache'] = $this->getApplication()->getRunTimePath().'/i18n';
+			$config['cache']=$this->getApplication()->getRunTimePath().'/i18n';
 			if(!is_dir($config['cache']))
 			{
 				if(@mkdir($config['cache'])===false)
@@ -225,7 +225,7 @@ 
 				chmod($config['cache'], PRADO_CHMOD); //make it deletable
 			}
 		}
-		$this->_translation = $config;
+		$this->_translation=$config;
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 	 */
 	public function setTranslationCatalogue($value)
 	{
-		$this->_translation['catalogue'] = $value;
+		$this->_translation['catalogue']=$value;
 	}
 
 	/**
@@ -252,11 +252,11 @@ 
 	 */
 	public function getCultureVariants($culture=null)
 	{
-		if($culture===null) $culture = $this->getCulture();
-		$variants = explode('_', $culture);
-		$result = array();
+		if($culture===null) $culture=$this->getCulture();
+		$variants=explode('_', $culture);
+		$result=array();
 		for(; count($variants) > 0; array_pop($variants))
-			$result[] = implode('_', $variants);
+			$result[]=implode('_', $variants);
 		return $result;
 	}
 
@@ -279,17 +279,17 @@ 
 	 * @param string culture string, null to use current culture
 	 * @return array list of possible localized resource files.
 	 */
-	public function getLocalizedResource($file,$culture=null)
+	public function getLocalizedResource($file, $culture=null)
 	{
-		$files = array();
-		$variants = $this->getCultureVariants($culture);
-		$path = pathinfo($file);
+		$files=array();
+		$variants=$this->getCultureVariants($culture);
+		$path=pathinfo($file);
 		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
-		$filename = substr($path['basename'],0,strrpos($path['basename'],'.'));
+			$files[]=$path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
+		$filename=substr($path['basename'], 0, strrpos($path['basename'], '.'));
 		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
-		$files[] = $file;
+			$files[]=$path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		$files[]=$file;
 		return $files;
 	}
 

framework/I18N/TTranslate.php

Spacing +29 added lines, -29 removed lines

@@ -66,7 +66,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -75,7 +75,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 */
 	public function setKey($value)
 	{
-		$this->setViewState('Key',$value,'');
+		$this->setViewState('Key', $value, '');
 	}
 
 	/**
@@ -93,7 +93,7 @@ 
 	 */
 	public function getKey()
 	{
-		return $this->getViewState('Key','');
+		return $this->getViewState('Key', '');
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public function getCatalogue()
 	{
-		return $this->getViewState('Catalogue','');
+		return $this->getViewState('Catalogue', '');
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function setCatalogue($value)
 	{
-		$this->setViewState('Catalogue',$value,'');
+		$this->setViewState('Catalogue', $value, '');
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	public function setTrim($value)
 	{
-		$this->setViewState('Trim',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Trim', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function getTrim()
 	{
-		return $this->getViewState('Trim',true);
+		return $this->getViewState('Trim', true);
 	}
 
 	/**
@@ -140,13 +140,13 @@ 
 	 */
 	public function getParameters()
 	{
-		if($parameters=$this->getViewState('Parameters',null))
+		if($parameters=$this->getViewState('Parameters', null))
 			return $parameters;
 		else
 		{
 			$parameters=new TAttributeCollection;
 			$parameters->setCaseSensitive(true);
-			$this->setViewState('Parameters',$parameters,null);
+			$this->setViewState('Parameters', $parameters, null);
 			return $parameters;
 		}
 	}
@@ -156,7 +156,7 @@ 
 	 */
 	public function hasParameter($name)
 	{
-		if($parameters=$this->getViewState('Parameters',null))
+		if($parameters=$this->getViewState('Parameters', null))
 			return $parameters->contains($name);
 		else
 			return false;
@@ -167,7 +167,7 @@ 
 	 */
 	public function getParameter($name)
 	{
-		if($parameters=$this->getViewState('Parameters',null))
+		if($parameters=$this->getViewState('Parameters', null))
 			return $parameters->itemAt($name);
 		else
 			return null;
@@ -177,9 +177,9 @@ 
 	 * @param string parameter name
 	 * @param string value of the parameter
 	 */
-	public function setParameter($name,$value)
+	public function setParameter($name, $value)
 	{
-		$this->getParameters()->add($name,$value);
+		$this->getParameters()->add($name, $value);
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 	 */
 	public function removeParameter($name)
 	{
-		if($parameters=$this->getViewState('Parameters',null))
+		if($parameters=$this->getViewState('Parameters', null))
 			return $parameters->remove($name);
 		else
 			return null;
@@ -200,25 +200,25 @@ 
 	 */
 	public function render($writer)
 	{
-		$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
-		$subs = array();
+		$htmlWriter=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
+		$subs=array();
 		foreach($this->getParameters() as $key => $value)
-			$subs['{'.$key.'}'] = $value;
+			$subs['{'.$key.'}']=$value;
 		foreach($this->getControls() as $control)
 		{
 			if($control instanceof TTranslateParameter)
-				$subs['{'.$control->getKey().'}'] = $control->getParameter();
+				$subs['{'.$control->getKey().'}']=$control->getParameter();
 			elseif($control instanceof TControl)
 				$control->render($htmlWriter);
 			elseif(is_string($control))
 				$htmlWriter->write($control);
 		}
 
-		$text = $this->getText();
+		$text=$this->getText();
 		if(strlen($text)==0)
-			$text = $htmlWriter->flush();
+			$text=$htmlWriter->flush();
 		if($this->getTrim())
-			$text = trim($text);
+			$text=trim($text);
 
 		$writer->write($this->translateText($text, $subs));
 	}
@@ -231,20 +231,20 @@ 
 	 */
 	protected function translateText($text, $subs)
 	{
-		$app = $this->getApplication()->getGlobalization();
+		$app=$this->getApplication()->getGlobalization();
 
 		//no translation handler provided
-		if(($config = $app->getTranslationConfiguration())===null)
+		if(($config=$app->getTranslationConfiguration())===null)
 			return strtr($text, $subs);
 
-		$catalogue = $this->getCatalogue();
+		$catalogue=$this->getCatalogue();
 		if(empty($catalogue) && isset($config['catalogue']))
-			$catalogue = $config['catalogue'];
-		if (empty($catalogue)) $catalogue='messages';
+			$catalogue=$config['catalogue'];
+		if(empty($catalogue)) $catalogue='messages';
 		Translation::init($catalogue);
 
-		$key = $this->getKey();
-		if(!empty($key)) $text = $key;
+		$key=$this->getKey();
+		if(!empty($key)) $text=$key;
 
 		//translate it
 		return Translation::formatter($catalogue)->format($text,

framework/I18N/TDateFormat.php

Spacing +35 added lines, -35 removed lines

@@ -70,11 +70,11 @@ 
 	 * A set of pattern presets and their respective formatting shorthand.
 	 * @var array
 	 */
-	static private $_patternPresets = array(
-			'fulldate'=>'P','full'=>'P',
-			'longdate'=>'D','long'=>'d',
-			'mediumdate'=>'p','medium'=>'p',
-			'shortdate'=>'d','short'=>'d',
+	static private $_patternPresets=array(
+			'fulldate'=>'P', 'full'=>'P',
+			'longdate'=>'D', 'long'=>'d',
+			'mediumdate'=>'p', 'medium'=>'p',
+			'shortdate'=>'d', 'short'=>'d',
 			'fulltime'=>'Q', 'longtime'=>'T',
 			'mediumtime'=>'q', 'shorttime'=>'t');
 
@@ -84,7 +84,7 @@ 
 	 */
 	public function setPattern($value)
 	{
-		$this->setViewState('Pattern',$value,'');
+		$this->setViewState('Pattern', $value, '');
 	}
 
 	/**
@@ -93,35 +93,35 @@ 
 	 */
 	public function getPattern()
 	{
-		$string = $this->getViewState('Pattern','');
+		$string=$this->getViewState('Pattern', '');
 
-		$pattern = null;
+		$pattern=null;
 
 		//try the subpattern of "date time" presets
-		$subpatterns = explode(' ',$string,2);
-		$datetime = array();
+		$subpatterns=explode(' ', $string, 2);
+		$datetime=array();
 		if(count($subpatterns)==2)
 		{
-			$datetime[] = $this->getPreset($subpatterns[0]);
-			$datetime[] = $this->getPreset($subpatterns[1]);
+			$datetime[]=$this->getPreset($subpatterns[0]);
+			$datetime[]=$this->getPreset($subpatterns[1]);
 		}
 
 		//we have a good subpattern
-		if(count($datetime) == 2
-			&& strlen($datetime[0]) == 1
-			&& strlen($datetime[1]) == 1)
+		if(count($datetime)==2
+			&& strlen($datetime[0])==1
+			&& strlen($datetime[1])==1)
 		{
-			$pattern = $datetime;
+			$pattern=$datetime;
 		}
 		else //no subpattern, try the presets
-			$pattern = $this->getPreset($string);
+			$pattern=$this->getPreset($string);
 
 		//no presets found, use the string as the pattern
 		//and let the DateFormat handle it.
 		if($pattern===null)
-			$pattern = $string;
-		if (!is_array($pattern) && strlen($pattern) == 0)
-			$pattern = null;
+			$pattern=$string;
+		if(!is_array($pattern) && strlen($pattern)==0)
+			$pattern=null;
 		return $pattern;
 	}
 
@@ -132,10 +132,10 @@ 
 	 */
 	protected function getPreset($string)
 	{
-		$string = strtolower($string);
+		$string=strtolower($string);
 		foreach(self::$_patternPresets as $pattern => $preset)
 		{
-			if($string == $pattern)
+			if($string==$pattern)
 				return $preset;
 		}
 	}
@@ -146,10 +146,10 @@ 
 	 */
 	public function getValue()
 	{
-		$value = $this->getViewState('Value','');
+		$value=$this->getViewState('Value', '');
 		if(empty($value))
 		{
-			$defaultText = $this->getDefaultText();
+			$defaultText=$this->getDefaultText();
 			if(empty($defaultText))
 				return time();
 		}
@@ -162,7 +162,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value',$value,'');
+		$this->setViewState('Value', $value, '');
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function getDefaultText()
 	{
-		return $this->getViewState('DefaultText','');
+		return $this->getViewState('DefaultText', '');
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function setDefaultText($value)
 	{
-		$this->setViewState('DefaultText',$value,'');
+		$this->setViewState('DefaultText', $value, '');
 	}
 
 	/**
@@ -217,29 +217,29 @@ 
 	 */
 	protected function getFormattedDate()
 	{
-		$value = $this->getValue();
-		$defaultText = $this->getDefaultText();
+		$value=$this->getValue();
+		$defaultText=$this->getDefaultText();
 		if(empty($value) && !empty($defaultText))
 			return $this->getDefaultText();
 
-		$app = $this->getApplication()->getGlobalization();
+		$app=$this->getApplication()->getGlobalization();
 
 		//initialized the default class wide formatter
 		if(self::$formatter===null)
-			self::$formatter = new DateFormat($app->getCulture());
+			self::$formatter=new DateFormat($app->getCulture());
 
-		$culture = $this->getCulture();
+		$culture=$this->getCulture();
 
 		//return the specific cultural formatted date time
-		if(strlen($culture) && $app->getCulture() !== $culture)
+		if(strlen($culture) && $app->getCulture()!==$culture)
 		{
-			$formatter = new DateFormat($culture);
+			$formatter=new DateFormat($culture);
 			return $formatter->format($value,
 									  $this->getPattern(),
 									  $this->getCharset());
 		}
 		//return the application wide culture formatted date time.
-		$result = self::$formatter->format($value,
+		$result=self::$formatter->format($value,
 										$this->getPattern(),
 										$this->getCharset());
 		return $result;

framework/I18N/TNumberFormat.php

Spacing +25 added lines, -25 removed lines

@@ -77,7 +77,7 @@ 
 	 */
 	public function getPattern()
 	{
-		return $this->getViewState('Pattern','');
+		return $this->getViewState('Pattern', '');
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function setPattern($pattern)
 	{
-		$this->setViewState('Pattern',$pattern,'');
+		$this->setViewState('Pattern', $pattern, '');
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->getViewState('Value','');
+		return $this->getViewState('Value', '');
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value',$value,'');
+		$this->setViewState('Value', $value, '');
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function getDefaultText()
 	{
-		return $this->getViewState('DefaultText','');
+		return $this->getViewState('DefaultText', '');
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function setDefaultText($value)
 	{
-		$this->setViewState('DefaultText',$value,'');
+		$this->setViewState('DefaultText', $value, '');
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function getType()
 	{
-		return $this->getViewState('Type','d');
+		return $this->getViewState('Type', 'd');
 	}
 
 	/**
@@ -168,20 +168,20 @@ 
 	 */
 	public function setType($type)
 	{
-		$type = strtolower($type);
+		$type=strtolower($type);
 
 		switch($type)
 		{
 			case 'decimal':
-				$this->setViewState('Type','d',''); break;
+				$this->setViewState('Type', 'd', ''); break;
 			case 'currency':
-				$this->setViewState('Type','c',''); break;
+				$this->setViewState('Type', 'c', ''); break;
 			case 'percentage':
-				$this->setViewState('Type','p',''); break;
+				$this->setViewState('Type', 'p', ''); break;
 			case 'scientific':
-				$this->setViewState('Type','e',''); break;
+				$this->setViewState('Type', 'e', ''); break;
 			default:
-				throw new TInvalidDataValueException('numberformat_type_invalid',$type);
+				throw new TInvalidDataValueException('numberformat_type_invalid', $type);
 		}
 
 	}
@@ -191,7 +191,7 @@ 
 	 */
 	public function getCurrency()
 	{
-		return $this->getViewState('Currency','USD');
+		return $this->getViewState('Currency', 'USD');
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	 */
 	public function setCurrency($currency)
 	{
-		$this->setViewState('Currency', $currency,'');
+		$this->setViewState('Currency', $currency, '');
 	}
 
 	/**
@@ -212,31 +212,31 @@ 
 	 */
 	protected function getFormattedValue()
 	{
-		$value = $this->getValue();
-		$defaultText = $this->getDefaultText();
+		$value=$this->getValue();
+		$defaultText=$this->getDefaultText();
 		if(empty($value) && !empty($defaultText))
 			return $this->getDefaultText();
 
-		$app = $this->getApplication()->getGlobalization();
+		$app=$this->getApplication()->getGlobalization();
 		//initialized the default class wide formatter
 		if(self::$formatter===null)
-			self::$formatter = new NumberFormat($app->getCulture());
+			self::$formatter=new NumberFormat($app->getCulture());
 
-		$pattern = strlen($this->getPattern()) > 0
+		$pattern=strlen($this->getPattern()) > 0
 						? $this->getPattern() : $this->getType();
 
-		$culture = $this->getCulture();
+		$culture=$this->getCulture();
 		//return the specific cultural formatted number
-		if(!empty($culture) && $app->getCulture() != $culture)
+		if(!empty($culture) && $app->getCulture()!=$culture)
 		{
-			$formatter = new NumberFormat($culture);
-			return $formatter->format($this->getValue(),$pattern,
+			$formatter=new NumberFormat($culture);
+			return $formatter->format($this->getValue(), $pattern,
 									  $this->getCurrency(),
 									  $this->getCharset());
 		}
 
 		//return the application wide culture formatted number.
-		return self::$formatter->format($this->getValue(),$pattern,
+		return self::$formatter->format($this->getValue(), $pattern,
 										$this->getCurrency(),
 										$this->getCharset());
 	}

framework/Exceptions/TErrorHandler.php

Spacing +38 added lines, -38 removed lines

@@ -98,7 +98,7 @@ 
 		if(($templatePath=Prado::getPathOfNamespace($value))!==null && is_dir($templatePath))
 			$this->_templatePath=$templatePath;
 		else
-			throw new TConfigurationException('errorhandler_errortemplatepath_invalid',$value);
+			throw new TConfigurationException('errorhandler_errortemplatepath_invalid', $value);
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 * @param mixed sender of the event
 	 * @param mixed event parameter (if the event is raised by TApplication, it refers to the exception instance)
 	 */
-	public function handleError($sender,$param)
+	public function handleError($sender, $param)
 	{
 		static $handling=false;
 		// We need to restore error and exception handlers,
@@ -129,11 +129,11 @@ 
 			if(!headers_sent())
 				header('Content-Type: text/html; charset=UTF-8');
 			if($param instanceof THttpException)
-				$this->handleExternalError($param->getStatusCode(),$param);
+				$this->handleExternalError($param->getStatusCode(), $param);
 			else if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->displayException($param);
 			else
-				$this->handleExternalError(500,$param);
+				$this->handleExternalError(500, $param);
 		}
 	}
 
@@ -146,21 +146,21 @@ 
 	 */
 	protected static function hideSecurityRelated($value, $exception=null)
 	{
-		$aRpl = array();
-		if($exception !== null && $exception instanceof Exception)
+		$aRpl=array();
+		if($exception!==null && $exception instanceof Exception)
 		{
-			$aTrace = $exception->getTrace();
+			$aTrace=$exception->getTrace();
 			foreach($aTrace as $item)
 			{
 				if(isset($item['file']))
-					$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
+					$aRpl[dirname($item['file']).DIRECTORY_SEPARATOR]='<hidden>'.DIRECTORY_SEPARATOR;
 			}
 		}
-		$aRpl[$_SERVER['DOCUMENT_ROOT']] = '${DocumentRoot}';
-		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])] = '${DocumentRoot}';
-		$aRpl[PRADO_DIR . DIRECTORY_SEPARATOR] = '${PradoFramework}' . DIRECTORY_SEPARATOR;
+		$aRpl[$_SERVER['DOCUMENT_ROOT']]='${DocumentRoot}';
+		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])]='${DocumentRoot}';
+		$aRpl[PRADO_DIR.DIRECTORY_SEPARATOR]='${PradoFramework}'.DIRECTORY_SEPARATOR;
 		if(isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
-		$aRpl = array_reverse($aRpl, true);
+		$aRpl=array_reverse($aRpl, true);
 
 		return str_replace(array_keys($aRpl), $aRpl, $value);
 	}
@@ -172,36 +172,36 @@ 
 	 * @param integer response status code
 	 * @param Exception exception instance
 	 */
-	protected function handleExternalError($statusCode,$exception)
+	protected function handleExternalError($statusCode, $exception)
 	{
 		if(!($exception instanceof THttpException))
 			error_log($exception->__toString());
 
-		$content=$this->getErrorTemplate($statusCode,$exception);
+		$content=$this->getErrorTemplate($statusCode, $exception);
 
-		$serverAdmin=isset($_SERVER['SERVER_ADMIN'])?$_SERVER['SERVER_ADMIN']:'';
+		$serverAdmin=isset($_SERVER['SERVER_ADMIN']) ? $_SERVER['SERVER_ADMIN'] : '';
 
-		$isDebug = $this->getApplication()->getMode()===TApplicationMode::Debug;
+		$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
 
-		$errorMessage = $exception->getMessage();
+		$errorMessage=$exception->getMessage();
 		if($isDebug)
 			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
 		else
 		{
 			$version='';
-			$errorMessage = self::hideSecurityRelated($errorMessage, $exception);
+			$errorMessage=self::hideSecurityRelated($errorMessage, $exception);
 		}
 		$tokens=array(
 			'%%StatusCode%%' => "$statusCode",
 			'%%ErrorMessage%%' => htmlspecialchars($errorMessage),
 			'%%ServerAdmin%%' => $serverAdmin,
 			'%%Version%%' => $version,
-			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
+			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		);
 
 		$this->getApplication()->getResponse()->setStatusCode($statusCode, $isDebug ? $exception->getMessage() : null);
 
-		echo strtr($content,$tokens);
+		echo strtr($content, $tokens);
 	}
 
 	/**
@@ -246,8 +246,8 @@ 
 		if($exception instanceof TTemplateException)
 		{
 			$fileName=$exception->getTemplateFile();
-			$lines=empty($fileName)?explode("\n",$exception->getTemplateSource()):@file($fileName);
-			$source=$this->getSourceCode($lines,$exception->getLineNumber());
+			$lines=empty($fileName) ? explode("\n", $exception->getTemplateSource()) : @file($fileName);
+			$source=$this->getSourceCode($lines, $exception->getLineNumber());
 			if($fileName==='')
 				$fileName='---embedded template---';
 			$errorLine=$exception->getLineNumber();
@@ -264,7 +264,7 @@ 
 				$fileName=$exception->getFile();
 				$errorLine=$exception->getLine();
 			}
-			$source=$this->getSourceCode(@file($fileName),$errorLine);
+			$source=$this->getSourceCode(@file($fileName), $errorLine);
 		}
 
 		if($this->getApplication()->getMode()===TApplicationMode::Debug)
@@ -279,12 +279,12 @@ 
 			'%%SourceCode%%' => $source,
 			'%%StackTrace%%' => htmlspecialchars($exception->getTraceAsString()),
 			'%%Version%%' => $version,
-			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
+			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		);
 
 		$content=$this->getExceptionTemplate($exception);
 
-		echo strtr($content,$tokens);
+		echo strtr($content, $tokens);
 	}
 
 	/**
@@ -321,7 +321,7 @@ 
 	 * @param Exception the exception to be displayed
 	 * @return string the template content
 	 */
-	protected function getErrorTemplate($statusCode,$exception)
+	protected function getErrorTemplate($statusCode, $exception)
 	{
 		$base=$this->getErrorTemplatePath().DIRECTORY_SEPARATOR.self::ERROR_FILE_NAME;
 		$lang=Prado::getPreferredLanguage();
@@ -354,16 +354,16 @@ 
 		else if($exception instanceof TInvalidOperationException)
 		{
 			// in case of getter or setter error, find out the exact file and row
-			if(($result=$this->getPropertyAccessTrace($trace,'__get'))===null)
-				$result=$this->getPropertyAccessTrace($trace,'__set');
+			if(($result=$this->getPropertyAccessTrace($trace, '__get'))===null)
+				$result=$this->getPropertyAccessTrace($trace, '__set');
 		}
-		if($result!==null && strpos($result['file'],': eval()\'d code')!==false)
+		if($result!==null && strpos($result['file'], ': eval()\'d code')!==false)
 			return null;
 
 		return $result;
 	}
 
-	private function getPropertyAccessTrace($trace,$pattern)
+	private function getPropertyAccessTrace($trace, $pattern)
 	{
 		$result=null;
 		foreach($trace as $t)
@@ -376,21 +376,21 @@ 
 		return $result;
 	}
 
-	private function getSourceCode($lines,$errorLine)
+	private function getSourceCode($lines, $errorLine)
 	{
-		$beginLine=$errorLine-self::SOURCE_LINES>=0?$errorLine-self::SOURCE_LINES:0;
-		$endLine=$errorLine+self::SOURCE_LINES<=count($lines)?$errorLine+self::SOURCE_LINES:count($lines);
+		$beginLine=$errorLine - self::SOURCE_LINES >= 0 ? $errorLine - self::SOURCE_LINES : 0;
+		$endLine=$errorLine + self::SOURCE_LINES <= count($lines) ? $errorLine + self::SOURCE_LINES : count($lines);
 
 		$source='';
-		for($i=$beginLine;$i<$endLine;++$i)
+		for($i=$beginLine; $i < $endLine; ++$i)
 		{
-			if($i===$errorLine-1)
+			if($i===$errorLine - 1)
 			{
-				$line=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
+				$line=htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 				$source.="<div class=\"error\">".$line."</div>";
 			}
 			else
-				$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
+				$source.=htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 		}
 		return $source;
 	}
@@ -398,7 +398,7 @@ 
 	private function addLink($message)
 	{
 		$baseUrl='http://pradosoft.github.io/docs/manual/class-';
-		return preg_replace('/\b(T[A-Z]\w+)\b/',"<a href=\"$baseUrl\${1}\" target=\"_blank\">\${1}</a>",$message);
+		return preg_replace('/\b(T[A-Z]\w+)\b/', "<a href=\"$baseUrl\${1}\" target=\"_blank\">\${1}</a>", $message);
 	}
 }
 

framework/Exceptions/TException.php

Spacing +9 added lines, -9 removed lines

@@ -50,9 +50,9 @@ 
 		array_shift($args);
 		$n=count($args);
 		$tokens=array();
-		for($i=0;$i<$n;++$i)
+		for($i=0; $i < $n; ++$i)
 			$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
-		parent::__construct(strtr($errorMessage,$tokens));
+		parent::__construct(strtr($errorMessage, $tokens));
 	}
 
 	/**
@@ -65,13 +65,13 @@ 
 		$msgFile=$this->getErrorMessageFile();
 
 		// Cache messages
-		if (!isset(self::$_messageCache[$msgFile]))
+		if(!isset(self::$_messageCache[$msgFile]))
 		{
 			if(($entries=@file($msgFile))!==false)
 			{
 				foreach($entries as $entry)
 				{
-					@list($code,$message)=explode('=',$entry,2);
+					@list($code, $message)=explode('=', $entry, 2);
 					self::$_messageCache[$msgFile][trim($code)]=trim($message);
 				}
 			}
@@ -338,7 +338,7 @@ 
 	 * @param string error file
 	 * @param integer error line number
 	 */
-	public function __construct($errno,$errstr,$errfile,$errline)
+	public function __construct($errno, $errstr, $errfile, $errline)
 	{
 		static $errorTypes=array(
 			E_ERROR           => "Error",
@@ -354,7 +354,7 @@ 
 			E_USER_NOTICE     => "User Notice",
 			E_STRICT          => "Runtime Notice"
 		);
-		$errorType=isset($errorTypes[$errno])?$errorTypes[$errno]:'Unknown Error';
+		$errorType=isset($errorTypes[$errno]) ? $errorTypes[$errno] : 'Unknown Error';
 		parent::__construct("[$errorType] $errstr (@line $errline in file $errfile).");
 	}
 
@@ -394,7 +394,7 @@ 
 	 * will be used as the error message. Any rest parameters will be used
 	 * to replace placeholders ({0}, {1}, {2}, etc.) in the message.
 	 */
-	public function __construct($statusCode,$errorMessage)
+	public function __construct($statusCode, $errorMessage)
 	{
 		$this->_statusCode=$statusCode;
 		$this->setErrorCode($errorMessage);
@@ -404,9 +404,9 @@ 
 		array_shift($args);
 		$n=count($args);
 		$tokens=array();
-		for($i=0;$i<$n;++$i)
+		for($i=0; $i < $n; ++$i)
 			$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
-		parent::__construct(strtr($errorMessage,$tokens));
+		parent::__construct(strtr($errorMessage, $tokens));
 	}
 
 	/**

requirements/index.php

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