pradosoft / prado

tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.php

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
 			{
 				$list[] = $country;
 				$count++;
-				if($count > 10) break;
+				if($count > 10) {
+					break;
+				}
 			}
 		}
 		return $list;

framework/Web/UI/TClientScriptManager.php

Braces +70 added lines, -51 removed lines

@@ -144,10 +144,11 @@ 
 				self::$_pradoPackages = $packages;
 			}
 
-			if (isset(self::$_pradoScripts[$name]))
-				$this->_registeredPradoScripts[$name]=true;
-			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+			if (isset(self::$_pradoScripts[$name])) {
+							$this->_registeredPradoScripts[$name]=true;
+			} else {
+							throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+			}
 
 			if(($packages=array_keys($this->_registeredPradoScripts))!==array())
 			{
@@ -159,22 +160,25 @@ 
 				{
 					foreach (self::$_pradoScripts[$p] as $dep)
 					{
-						foreach (self::$_pradoPackages[$dep] as $script)
-						if (!isset($this->_expandedPradoScripts[$script]))
+						foreach (self::$_pradoPackages[$dep] as $script) {
+												if (!isset($this->_expandedPradoScripts[$script]))
 						{
 							$this->_expandedPradoScripts[$script] = true;
+						}
 							if($isDebug)
 							{
-								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl))
-									$packagesUrl[]=$url;
+								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl)) {
+																	$packagesUrl[]=$url;
+								}
 							} else {
 								if (!in_array($url=$baseUrl.'/min/'.$script,$packagesUrl))
 								{
 									if(!is_file($filePath=$path.'/min/'.$script))
 									{
 										$dirPath=dirname($filePath);
-										if(!is_dir($dirPath))
-											mkdir($dirPath, PRADO_CHMOD, true);
+										if(!is_dir($dirPath)) {
+																					mkdir($dirPath, PRADO_CHMOD, true);
+										}
 										file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base.'/'.$script)));
 										chmod($filePath, PRADO_CHMOD);
 									}
@@ -184,8 +188,9 @@ 
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+				foreach($packagesUrl as $url) {
+									$this->registerScriptFile($url,$url);
+				}
 			}
 		}
 	}
@@ -226,8 +231,7 @@ 
 				$base = $dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
-		}
-		else
+		} else
 		{
 			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
 		}
@@ -278,8 +282,9 @@ 
 		if($class === null) {
 			return;
 		}
-		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null)
-			$options['FormID']=$form->getClientID();
+		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null) {
+					$options['FormID']=$form->getClientID();
+		}
 		$optionString=TJavaScript::encode($options);
 		$code="new {$class}({$optionString});";
 
@@ -300,9 +305,9 @@ 
 	{
 		$panelID=is_string($panel)?$panel:$panel->getUniqueID();
 
-		if(is_string($button))
-			$buttonID=$button;
-		else
+		if(is_string($button)) {
+					$buttonID=$button;
+		} else
 		{
 			$button->setIsDefaultButton(true);
 			$buttonID=$button->getUniqueID();
@@ -339,8 +344,9 @@ 
 	public function registerFocusControl($target)
 	{
 		$this->registerPradoScriptInternal('jquery');
-		if($target instanceof TControl)
-			$target=$target->getClientID();
+		if($target instanceof TControl) {
+					$target=$target->getClientID();
+		}
 		$this->_endScripts['prado:focus'] = 'jQuery(\'#'.$target.'\').focus();';
 
 		$params=func_get_args();
@@ -371,10 +377,11 @@ 
 	 */
 	public function registerStyleSheetFile($key,$url,$media='')
 	{
-		if($media==='')
-			$this->_styleSheetFiles[$key]=$url;
-		else
-			$this->_styleSheetFiles[$key]=array($url,$media);
+		if($media==='') {
+					$this->_styleSheetFiles[$key]=$url;
+		} else {
+					$this->_styleSheetFiles[$key]=array($url,$media);
+		}
 
 		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheetFile',$params);
@@ -405,9 +412,10 @@ 
 				$this->_styleSheetFiles)
 		);
 
-		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url)
-			if (substr($url,strlen($url)-4)=='.css')
+		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url) {
+					if (substr($url,strlen($url)-4)=='.css')
 				$stylesheets[] = $url;
+		}
 
 		$stylesheets = array_unique($stylesheets);
 
@@ -601,10 +609,11 @@ 
 		$str='';
 		foreach($this->_styleSheetFiles as $url)
 		{
-			if(is_array($url))
-				$str.="<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"".THttpUtility::htmlEncode($url[0])."\" />\n";
-			else
-				$str.="<link rel=\"stylesheet\" type=\"text/css\" href=\"".THttpUtility::htmlEncode($url)."\" />\n";
+			if(is_array($url)) {
+							$str.="<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"".THttpUtility::htmlEncode($url[0])."\" />\n";
+			} else {
+							$str.="<link rel=\"stylesheet\" type=\"text/css\" href=\"".THttpUtility::htmlEncode($url)."\" />\n";
+			}
 		}
 		$writer->write($str);
 	}
@@ -614,8 +623,9 @@ 
 	 */
 	public function renderStyleSheets($writer)
 	{
-		if(count($this->_styleSheets))
-			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n",$this->_styleSheets)."\n/*]]>*/\n</style>\n");
+		if(count($this->_styleSheets)) {
+					$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n",$this->_styleSheets)."\n/*]]>*/\n</style>\n");
+		}
 	}
 
 	/**
@@ -738,25 +748,30 @@ 
 	 */
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
-		if ($initial) $this->_renderedHiddenFields = array();
+		if ($initial) {
+			$this->_renderedHiddenFields = array();
+		}
 		$str='';
 		foreach($this->_hiddenFields as $name=>$value)
 		{
-			if (in_array($name,$this->_renderedHiddenFields)) continue;
+			if (in_array($name,$this->_renderedHiddenFields)) {
+				continue;
+			}
 			$id=strtr($name,':','_');
 			if(is_array($value))
 			{
-				foreach($value as $v)
-					$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
-			}
-			else
+				foreach($value as $v) {
+									$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
+				}
+			} else
 			{
 				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
 			$this->_renderedHiddenFields[] = $name;
 		}
-		if($str!=='')
-			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
+		if($str!=='') {
+					$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
+		}
 	}
 
 	public function getHiddenFields()
@@ -769,8 +784,9 @@ 
 	 */
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
-			throw new Exception('Operation invalid when page is already rendering');
+		if ($form = $this->_page->InFormRender) {
+					throw new Exception('Operation invalid when page is already rendering');
+		}
 	}
 }
 
@@ -802,8 +818,9 @@ 
 	 */
 	protected function setFunction($name, $code)
 	{
-		if(!TJavaScript::isJsLiteral($code))
-			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+		if(!TJavaScript::isJsLiteral($code)) {
+					$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+		}
 		$this->setOption($name, $code);
 	}
 
@@ -812,10 +829,11 @@ 
 	 */
 	protected function getOption($name)
 	{
-		if ($this->_options)
-			return $this->_options->itemAt($name);
-		else
-			return null;
+		if ($this->_options) {
+					return $this->_options->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -832,8 +850,9 @@ 
 	 */
 	public function getOptions()
 	{
-		if (!$this->_options)
-			$this->_options = Prado::createComponent('System.Collections.TMap');
+		if (!$this->_options) {
+					$this->_options = Prado::createComponent('System.Collections.TMap');
+		}
 		return $this->_options;
 	}
 

tests/FunctionalTests/tickets/protected/pages/Ticket719.php

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
 			{
 				$list[] = $country;
 				$count++;
-				if($count > 10) break;
+				if($count > 10) {
+					break;
+				}
 			}
 		}
 		return $list;

tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php

Braces +1 added lines, -2 removed lines

@@ -114,8 +114,7 @@
 		{
 			$this->projectDao->addUserToProject($project->ID, 'asd');
 			$this->fail();
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 			$this->pass();
 		}