pradosoft / prado

framework/I18N/core/util.php

Spacing +17 added lines, -17 removed lines

@@ -40,7 +40,7 @@ 
  */
 	function parseDSN($dsn)
 	{
-		if (is_array($dsn)) {
+		if(is_array($dsn)) {
 			return $dsn;
 		}
 
@@ -57,7 +57,7 @@ 
 		];
 
 		// Find phptype and dbsyntax
-		if (($pos = strpos($dsn, '://')) !== false) {
+		if(($pos = strpos($dsn, '://')) !== false) {
 			$str = substr($dsn, 0, $pos);
 			$dsn = substr($dsn, $pos + 3);
 		} else {
@@ -67,7 +67,7 @@ 
 
 		// Get phptype and dbsyntax
 		// $str => phptype(dbsyntax)
-		if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
+		if(preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
 			$parsed['phptype'] = $arr[1];
 			$parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2];
 		} else {
@@ -75,16 +75,16 @@ 
 			$parsed['dbsyntax'] = $str;
 		}
 
-		if (empty($dsn)) {
+		if(empty($dsn)) {
 			return $parsed;
 		}
 
 		// Get (if found): username and password
 		// $dsn => username:password@protocol+hostspec/database
-		if (($at = strrpos($dsn, '@')) !== false) {
+		if(($at = strrpos($dsn, '@')) !== false) {
 			$str = substr($dsn, 0, $at);
 			$dsn = substr($dsn, $at + 1);
-			if (($pos = strpos($str, ':')) !== false) {
+			if(($pos = strpos($str, ':')) !== false) {
 				$parsed['username'] = rawurldecode(substr($str, 0, $pos));
 				$parsed['password'] = rawurldecode(substr($str, $pos + 1));
 			} else {
@@ -95,17 +95,17 @@ 
 		// Find protocol and hostspec
 
 		// $dsn => proto(proto_opts)/database
-		if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
+		if(preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
 			$proto = $match[1];
 			$proto_opts = (!empty($match[2])) ? $match[2] : false;
 			$dsn = $match[3];
 
 		// $dsn => protocol+hostspec/database (old format)
 		} else {
-			if (strpos($dsn, '+') !== false) {
+			if(strpos($dsn, '+') !== false) {
 				list($proto, $dsn) = explode('+', $dsn, 2);
 			}
-			if (strpos($dsn, '/') !== false) {
+			if(strpos($dsn, '/') !== false) {
 				list($proto_opts, $dsn) = explode('/', $dsn, 2);
 			} else {
 				$proto_opts = $dsn;
@@ -116,34 +116,34 @@ 
 		// process the different protocol options
 		$parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
 		$proto_opts = rawurldecode($proto_opts);
-		if ($parsed['protocol'] == 'tcp') {
-			if (strpos($proto_opts, ':') !== false) {
+		if($parsed['protocol'] == 'tcp') {
+			if(strpos($proto_opts, ':') !== false) {
 				list($parsed['hostspec'], $parsed['port']) = explode(':', $proto_opts);
 			} else {
 				$parsed['hostspec'] = $proto_opts;
 			}
-		} elseif ($parsed['protocol'] == 'unix') {
+		} elseif($parsed['protocol'] == 'unix') {
 			$parsed['socket'] = $proto_opts;
 		}
 
 		// Get dabase if any
 		// $dsn => database
-		if (!empty($dsn)) {
+		if(!empty($dsn)) {
 			// /database
-			if (($pos = strpos($dsn, '?')) === false) {
+			if(($pos = strpos($dsn, '?')) === false) {
 				$parsed['database'] = $dsn;
 			// /database?param1=value1&param2=value2
 			} else {
 				$parsed['database'] = substr($dsn, 0, $pos);
 				$dsn = substr($dsn, $pos + 1);
-				if (strpos($dsn, '&') !== false) {
+				if(strpos($dsn, '&') !== false) {
 					$opts = explode('&', $dsn);
 				} else { // database?param1=value1
 					$opts = [$dsn];
 				}
-				foreach ($opts as $opt) {
+				foreach($opts as $opt) {
 					list($key, $value) = explode('=', $opt);
-					if (!isset($parsed[$key])) { // don't allow params overwrite
+					if(!isset($parsed[$key])) { // don't allow params overwrite
 						$parsed[$key] = rawurldecode($value);
 					}
 				}

framework/I18N/TDateFormat.php

Spacing +5 added lines, -5 removed lines

@@ -73,10 +73,10 @@ 
 	 * @var array
 	 */
 	private static $_patternPresets = [
-			'fulldate' => 'P','full' => 'P',
-			'longdate' => 'D','long' => 'd',
-			'mediumdate' => 'p','medium' => 'p',
-			'shortdate' => 'd','short' => 'd',
+			'fulldate' => 'P', 'full' => 'P',
+			'longdate' => 'D', 'long' => 'd',
+			'mediumdate' => 'p', 'medium' => 'p',
+			'shortdate' => 'd', 'short' => 'd',
 			'fulltime' => 'Q', 'longtime' => 'T',
 			'mediumtime' => 'q', 'shorttime' => 't'];
 
@@ -122,7 +122,7 @@ 
 		//and let the DateFormat handle it.
 		if($pattern === null)
 			$pattern = $string;
-		if (!is_array($pattern) && strlen($pattern) == 0)
+		if(!is_array($pattern) && strlen($pattern) == 0)
 			$pattern = null;
 		return $pattern;
 	}

framework/Wsat/pages/layout/TWsatLayout.php

Spacing +2 added lines, -2 removed lines

@@ -21,9 +21,9 @@
 
 		private function validateSecurity()
 		{
-				if ($this->Session["wsat_password"] !== $this->getService()->getPassword())
+				if($this->Session["wsat_password"] !== $this->getService()->getPassword())
 				{
-						if (!$this->getPage() instanceof TWsatLogin)
+						if(!$this->getPage() instanceof TWsatLogin)
 						{
 								$url = $this->Service->constructUrl('TWsatLogin');
 								$this->Response->redirect($url);

framework/Wsat/pages/TWsatLogin.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 		public function login()
 		{
-				if ($this->IsValid)
+				if($this->IsValid)
 				{
 						$this->Session["wsat_password"] = $this->getService()->getPassword();
 						$url = $this->Service->constructUrl('TWsatHome');

framework/Wsat/TWsatService.php

Spacing +2 added lines, -2 removed lines

@@ -48,10 +48,10 @@
 
 		public function init($config)
 		{
-				if ($this->getApplication()->getMode() === TApplicationMode::Performance || $this->getApplication()->getMode() === TApplicationMode::Normal)
+				if($this->getApplication()->getMode() === TApplicationMode::Performance || $this->getApplication()->getMode() === TApplicationMode::Normal)
 						throw new TInvalidOperationException("You should not use Prado WSAT in any of the production modes.");
 
-				if (empty($this->_pass))
+				if(empty($this->_pass))
 						throw new TConfigurationException("You need to specify the Password attribute.");
 
 				$this->setDefaultPage("TWsatHome");

framework/Util/TBehavior.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 	{
 		$this->_owner = $owner;
 		foreach($this->events() as $event => $handler)
-			$owner->attachEventHandler($event, [$this,$handler]);
+			$owner->attachEventHandler($event, [$this, $handler]);
 	}
 
 	/**
@@ -58,7 +58,7 @@ 
 	public function detach($owner)
 	{
 		foreach($this->events() as $event => $handler)
-			$owner->detachEventHandler($event, [$this,$handler]);
+			$owner->detachEventHandler($event, [$this, $handler]);
 		$this->_owner = null;
 	}
 

framework/Util/TCallChain.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function addCall($method, $args)
 	{
-		$this->add([$method,$args]);
+		$this->add([$method, $args]);
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	{
 		$args = func_get_args();
 		if($this->getCount() === 0)
-			return isset($args[0])?$args[0]:null;
+			return isset($args[0]) ? $args[0] : null;
 
 		if(!$this->_iterator)
 		{
@@ -144,7 +144,7 @@ 
 	public function __dycall($method, $args)
 	{
 		if($this->_method == $method)
-			return call_user_func_array([$this,'call'], $args);
+			return call_user_func_array([$this, 'call'], $args);
 		return null;
 	}
 }
\ No newline at end of file

framework/Util/TLogRouter.php

Spacing +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
 				throw new TConfigurationException('logrouter_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
-		$this->getApplication()->attachEventHandler('OnEndRequest', [$this,'collectLogs']);
+		$this->getApplication()->attachEventHandler('OnEndRequest', [$this, 'collectLogs']);
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 			{
 				foreach($config['routes'] as $route)
 				{
-					$properties = isset($route['properties'])?$route['properties']:[];
+					$properties = isset($route['properties']) ? $route['properties'] : [];
 					if(!isset($route['class']))
 						throw new TConfigurationException('logrouter_routeclass_required');
 					$route = Prado::createComponent($route['class']);

framework/Util/TSimpleDateFormatter.php

Spacing +19 added lines, -19 removed lines

@@ -241,21 +241,21 @@ 
 			$day = null;
 		}
 
-		while ($i_format < $pattern_length)
+		while($i_format < $pattern_length)
 		{
 			$c = $this->charAt($pattern, $i_format);
 			$token = '';
-			while ($this->charEqual($pattern, $i_format, $c)
+			while($this->charEqual($pattern, $i_format, $c)
 						&& ($i_format < $pattern_length))
 			{
 				$token .= $this->charAt($pattern, $i_format++);
 			}
 
-			if ($token == 'yyyy' || $token == 'yy' || $token == 'y')
+			if($token == 'yyyy' || $token == 'yy' || $token == 'y')
 			{
-				if ($token == 'yyyy') { $x = 4;$y = 4; }
-				if ($token == 'yy')   { $x = 2;$y = 2; }
-				if ($token == 'y')    { $x = 2;$y = 4; }
+				if($token == 'yyyy') { $x = 4; $y = 4; }
+				if($token == 'yy') { $x = 2; $y = 2; }
+				if($token == 'y') { $x = 2; $y = 4; }
 				$year = $this->getInteger($value, $i_val, $x, $y);
 				if($year === null)
 					return null;
@@ -263,30 +263,30 @@ 
 				$i_val += strlen($year);
 				if(strlen($year) == 2)
 				{
-					$iYear = (int)$year;
+					$iYear = (int) $year;
 					if($iYear > 70)
 						$year = $iYear + 1900;
 					else
 						$year = $iYear + 2000;
 				}
-				$year = (int)$year;
+				$year = (int) $year;
 			}
 			elseif($token == 'MM' || $token == 'M')
 			{
-				$month = $this->getInteger($value,$i_val,
+				$month = $this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iMonth = (int)$month;
+				$iMonth = (int) $month;
 				if($month === null || $iMonth < 1 || $iMonth > 12)
 					return null;
 					//throw new TInvalidDataValueException('Invalid month', $value);
 				$i_val += strlen($month);
 				$month = $iMonth;
 			}
-			elseif ($token == 'dd' || $token == 'd')
+			elseif($token == 'dd' || $token == 'd')
 			{
-				$day = $this->getInteger($value,$i_val,
+				$day = $this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iDay = (int)$day;
+				$iDay = (int) $day;
 				if($day === null || $iDay < 1 || $iDay > 31)
 					return null;
 					//throw new TInvalidDataValueException('Invalid day', $value);
@@ -302,7 +302,7 @@ 
 					$i_val += $this->length($token);
 			}
 		}
-		if ($i_val != $this->length($value))
+		if($i_val != $this->length($value))
 			return null;
 			//throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
 		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
@@ -312,8 +312,8 @@ 
 			if(empty($year)) {
 				$year = date('Y');
 			}
-			$day = (int)$day <= 0 ? 1 : (int)$day;
-			$month = (int)$month <= 0 ? 1 : (int)$month;
+			$day = (int) $day <= 0 ? 1 : (int) $day;
+			$month = (int) $month <= 0 ? 1 : (int) $month;
 
 			$s = new \DateTime;
 			$s->setDate($year, $month, $day);
@@ -366,12 +366,12 @@ 
 	private function getInteger($str, $i, $minlength, $maxlength)
 	{
 		//match for digits backwards
-		for ($x = $maxlength; $x >= $minlength; $x--)
+		for($x = $maxlength; $x >= $minlength; $x--)
 		{
 			$token = $this->substring($str, $i, $x);
-			if ($this->length($token) < $minlength)
+			if($this->length($token) < $minlength)
 				return null;
-			if (preg_match('/^\d+$/', $token))
+			if(preg_match('/^\d+$/', $token))
 				return $token;
 		}
 		return null;