pradosoft / prado

framework/Web/UI/TTemplateControl.php

Indentation +84 added lines, -84 removed lines

@@ -238,90 +238,90 @@
 		parent::initRecursive($namingContainer);
 	}
         
-        /**
-         * Function to update view controls with data in a given AR object.
-         * View controls and AR object need to have the same name in IDs and Attrs respectively.
-         * @param TActiveRecord $arObj
-         * @param Boolean $throwExceptions Wheter or not to throw exceptions
-         * @author Daniel Sampedro <darthdaniel85@gmail.com>
-         */
-        public function tryToUpdateView($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key != "RELATIONS")
-                                {
-                                        $control = $this->{$key};
-                                        if ($control instanceof TTextBox)
-                                                $control->Text = $arObj->{$key};
-                                        elseif ($control instanceof TCheckBox)
-                                                $control->Checked = (boolean) $arObj->{$key};
-                                        elseif ($control instanceof TDatePicker)
-                                                $control->Date = $arObj->{$key};
-                                }
-                                else
-                                {
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
-                                        {
-                                                $relControl = $this->{$relKey};
-                                                switch ($relValues[0])
-                                                {
-                                                        case TActiveRecord::BELONGS_TO:
-                                                        case TActiveRecord::HAS_ONE:
-                                                                $relControl->Text = $arObj->{$relKey};
-                                                                break;
-                                                        case TActiveRecord::HAS_MANY:
-                                                                if ($relControl instanceof TListControl)
-                                                                {
-                                                                        $relControl->DataSource = $arObj->{$relKey};
-                                                                        $relControl->dataBind();
-                                                                }
-                                                                break;
-                                                }
-                                        }
-                                        break;
-                                }
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
+		/**
+		 * Function to update view controls with data in a given AR object.
+		 * View controls and AR object need to have the same name in IDs and Attrs respectively.
+		 * @param TActiveRecord $arObj
+		 * @param Boolean $throwExceptions Wheter or not to throw exceptions
+		 * @author Daniel Sampedro <darthdaniel85@gmail.com>
+		 */
+		public function tryToUpdateView($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key != "RELATIONS")
+								{
+										$control = $this->{$key};
+										if ($control instanceof TTextBox)
+												$control->Text = $arObj->{$key};
+										elseif ($control instanceof TCheckBox)
+												$control->Checked = (boolean) $arObj->{$key};
+										elseif ($control instanceof TDatePicker)
+												$control->Date = $arObj->{$key};
+								}
+								else
+								{
+										foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
+										{
+												$relControl = $this->{$relKey};
+												switch ($relValues[0])
+												{
+														case TActiveRecord::BELONGS_TO:
+														case TActiveRecord::HAS_ONE:
+																$relControl->Text = $arObj->{$relKey};
+																break;
+														case TActiveRecord::HAS_MANY:
+																if ($relControl instanceof TListControl)
+																{
+																		$relControl->DataSource = $arObj->{$relKey};
+																		$relControl->dataBind();
+																}
+																break;
+												}
+										}
+										break;
+								}
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
 
-        /**
-         * Function to try to update an AR object with data in view controls.
-         * @param TActiveRecord $arObj
-         * @param Boolean $throwExceptions Wheter or not to throw exceptions
-         * @author Daniel Sampedro <darthdaniel85@gmail.com>
-         */
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key == "RELATIONS")
-                                        break;
-                                $control = $this->{$key};
-                                if ($control instanceof TTextBox)
-                                        $arObj->{$key} = $control->Text;
-                                elseif ($control instanceof TCheckBox)
-                                        $arObj->{$key} = $control->Checked;
-                                elseif ($control instanceof TDatePicker)
-                                        $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
+		/**
+		 * Function to try to update an AR object with data in view controls.
+		 * @param TActiveRecord $arObj
+		 * @param Boolean $throwExceptions Wheter or not to throw exceptions
+		 * @author Daniel Sampedro <darthdaniel85@gmail.com>
+		 */
+		public function tryToUpdateAR($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key == "RELATIONS")
+										break;
+								$control = $this->{$key};
+								if ($control instanceof TTextBox)
+										$arObj->{$key} = $control->Text;
+								elseif ($control instanceof TCheckBox)
+										$arObj->{$key} = $control->Checked;
+								elseif ($control instanceof TDatePicker)
+										$arObj->{$key} = $control->Date;
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
 }
 

Braces +6 added lines, -12 removed lines

@@ -69,8 +69,7 @@ 
 			if(!isset(self::$_template[$class]))
 				self::$_template[$class]=$this->loadTemplate();
 			return self::$_template[$class];
-		}
-		else
+		} else
 			return $this->_localTemplate;
 	}
 
@@ -205,8 +204,7 @@ 
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
 			$controls->insertAt($loc,$content);
-		}
-		else
+		} else
 			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
 	}
 
@@ -232,8 +230,7 @@ 
 			$master->ensureChildControls();
 			foreach($this->_contents as $id=>$content)
 				$master->injectContent($id,$content);
-		}
-		else if(!empty($this->_contents))
+		} else if(!empty($this->_contents))
 			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		parent::initRecursive($namingContainer);
 	}
@@ -261,8 +258,7 @@ 
                                                 $control->Checked = (boolean) $arObj->{$key};
                                         elseif ($control instanceof TDatePicker)
                                                 $control->Date = $arObj->{$key};
-                                }
-                                else
+                                } else
                                 {
                                         foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
@@ -284,8 +280,7 @@ 
                                         }
                                         break;
                                 }
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;
@@ -315,8 +310,7 @@ 
                                         $arObj->{$key} = $control->Checked;
                                 elseif ($control instanceof TDatePicker)
                                         $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;

Doc Comments +2 added lines

@@ -146,6 +146,7 @@ 
 	 * Registers a content control.
 	 * @param string ID of the content
 	 * @param TContent
+	 * @param string $id
 	 */
 	public function registerContent($id,TContent $object)
 	{
@@ -160,6 +161,7 @@ 
 	 * This method should only be used by framework and control developers.
 	 * @param string placeholder ID
 	 * @param TContentPlaceHolder placeholder control
+	 * @param string $id
 	 */
 	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
 	{

Spacing +44 added lines, -44 removed lines

@@ -117,7 +117,7 @@ 
 	 */
 	protected function loadTemplate()
 	{
-		Prado::trace("Loading template ".get_class($this),'\Prado\Web\UI\TTemplateControl');
+		Prado::trace("Loading template ".get_class($this), '\Prado\Web\UI\TTemplateControl');
 		$template=$this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
 		return $template;
 	}
@@ -134,9 +134,9 @@ 
 			foreach($tpl->getDirective() as $name=>$value)
 			{
 				if(is_string($value))
-					$this->setSubProperty($name,$value);
+					$this->setSubProperty($name, $value);
 				else
-					throw new TConfigurationException('templatecontrol_directive_invalid',get_class($this),$name);
+					throw new TConfigurationException('templatecontrol_directive_invalid', get_class($this), $name);
 			}
 			$tpl->instantiateIn($this);
 		}
@@ -147,10 +147,10 @@ 
 	 * @param string ID of the content
 	 * @param TContent
 	 */
-	public function registerContent($id,TContent $object)
+	public function registerContent($id, TContent $object)
 	{
 		if(isset($this->_contents[$id]))
-			throw new TConfigurationException('templatecontrol_contentid_duplicated',$id);
+			throw new TConfigurationException('templatecontrol_contentid_duplicated', $id);
 		else
 			$this->_contents[$id]=$object;
 	}
@@ -161,10 +161,10 @@ 
 	 * @param string placeholder ID
 	 * @param TContentPlaceHolder placeholder control
 	 */
-	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
+	public function registerContentPlaceHolder($id, TContentPlaceHolder $object)
 	{
 		if(isset($this->_placeholders[$id]))
-			throw new TConfigurationException('templatecontrol_placeholderid_duplicated',$id);
+			throw new TConfigurationException('templatecontrol_placeholderid_duplicated', $id);
 		else
 			$this->_placeholders[$id]=$object;
 	}
@@ -199,17 +199,17 @@ 
 	 * @param string ID of the content control
 	 * @param TContent the content to be injected
 	 */
-	public function injectContent($id,$content)
+	public function injectContent($id, $content)
 	{
 		if(isset($this->_placeholders[$id]))
 		{
 			$placeholder=$this->_placeholders[$id];
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
-			$controls->insertAt($loc,$content);
+			$controls->insertAt($loc, $content);
 		}
 		else
-			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
+			throw new TConfigurationException('templatecontrol_placeholder_inexistent', $id);
 	}
 
 	/**
@@ -233,10 +233,10 @@ 
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
 			foreach($this->_contents as $id=>$content)
-				$master->injectContent($id,$content);
+				$master->injectContent($id, $content);
 		}
 		else if(!empty($this->_contents))
-			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
+			throw new TConfigurationException('templatecontrol_mastercontrol_required', get_class($this));
 		parent::initRecursive($namingContainer);
 	}
         
@@ -247,38 +247,38 @@ 
          * @param Boolean $throwExceptions Wheter or not to throw exceptions
          * @author Daniel Sampedro <darthdaniel85@gmail.com>
          */
-        public function tryToUpdateView($arObj, $throwExceptions = false)
+        public function tryToUpdateView($arObj, $throwExceptions=false)
         {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
+                $objAttrs=get_class_vars(get_class($arObj));
+                foreach(array_keys($objAttrs) as $key)
                 {
                         try
                         {
-                                if ($key != "RELATIONS")
+                                if($key!="RELATIONS")
                                 {
-                                        $control = $this->{$key};
-                                        if ($control instanceof TTextBox)
-                                                $control->Text = $arObj->{$key};
-                                        elseif ($control instanceof TCheckBox)
-                                                $control->Checked = (boolean) $arObj->{$key};
-                                        elseif ($control instanceof TDatePicker)
-                                                $control->Date = $arObj->{$key};
+                                        $control=$this->{$key};
+                                        if($control instanceof TTextBox)
+                                                $control->Text=$arObj->{$key};
+                                        elseif($control instanceof TCheckBox)
+                                                $control->Checked=(boolean) $arObj->{$key};
+                                        elseif($control instanceof TDatePicker)
+                                                $control->Date=$arObj->{$key};
                                 }
                                 else
                                 {
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
+                                        foreach($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
-                                                $relControl = $this->{$relKey};
-                                                switch ($relValues[0])
+                                                $relControl=$this->{$relKey};
+                                                switch($relValues[0])
                                                 {
                                                         case TActiveRecord::BELONGS_TO:
                                                         case TActiveRecord::HAS_ONE:
-                                                                $relControl->Text = $arObj->{$relKey};
+                                                                $relControl->Text=$arObj->{$relKey};
                                                                 break;
                                                         case TActiveRecord::HAS_MANY:
-                                                                if ($relControl instanceof TListControl)
+                                                                if($relControl instanceof TListControl)
                                                                 {
-                                                                        $relControl->DataSource = $arObj->{$relKey};
+                                                                        $relControl->DataSource=$arObj->{$relKey};
                                                                         $relControl->dataBind();
                                                                 }
                                                                 break;
@@ -287,9 +287,9 @@ 
                                         break;
                                 }
                         } 
-                        catch (Exception $ex)
+                        catch(Exception $ex)
                         {
-                                if ($throwExceptions)
+                                if($throwExceptions)
                                         throw $ex;
                         }
                 }
@@ -301,26 +301,26 @@ 
          * @param Boolean $throwExceptions Wheter or not to throw exceptions
          * @author Daniel Sampedro <darthdaniel85@gmail.com>
          */
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
+        public function tryToUpdateAR($arObj, $throwExceptions=false)
         {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
+                $objAttrs=get_class_vars(get_class($arObj));
+                foreach(array_keys($objAttrs) as $key)
                 {
                         try
                         {
-                                if ($key == "RELATIONS")
+                                if($key=="RELATIONS")
                                         break;
-                                $control = $this->{$key};
-                                if ($control instanceof TTextBox)
-                                        $arObj->{$key} = $control->Text;
-                                elseif ($control instanceof TCheckBox)
-                                        $arObj->{$key} = $control->Checked;
-                                elseif ($control instanceof TDatePicker)
-                                        $arObj->{$key} = $control->Date;
+                                $control=$this->{$key};
+                                if($control instanceof TTextBox)
+                                        $arObj->{$key}=$control->Text;
+                                elseif($control instanceof TCheckBox)
+                                        $arObj->{$key}=$control->Checked;
+                                elseif($control instanceof TDatePicker)
+                                        $arObj->{$key}=$control->Date;
                         } 
-                        catch (Exception $ex)
+                        catch(Exception $ex)
                         {
-                                if ($throwExceptions)
+                                if($throwExceptions)
                                         throw $ex;
                         }
                 }

framework/Web/TCacheHttpSession.php

Indentation +10 added lines, -10 removed lines

@@ -50,8 +50,8 @@ 
 	 * It reads the CacheModule property.
 	 * @param TXmlElement module configuration
 	 */
-    public function init($config)
-    {
+	public function init($config)
+	{
 		if($this->_cacheModuleID==='')
 			throw new TConfigurationException('cachesession_cachemoduleid_required');
 		else if(($cache=$this->getApplication()->getModule($this->_cacheModuleID))===null)
@@ -62,7 +62,7 @@ 
 			throw new TConfigurationException('cachesession_cachemodule_invalid',$this->_cacheModuleID);
 		$this->setUseCustomStorage(true);
 		parent::init($config);
-    }
+	}
 
 	/**
 	 * @return string the ID of the cache module.
@@ -95,7 +95,7 @@ 
 	 */
 	public function _read($id)
 	{
-	    return $this->_cache->get($this->calculateKey($id));
+		return $this->_cache->get($this->calculateKey($id));
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function _destroy($id)
 	{
-	    return $this->_cache->delete($this->calculateKey($id));
+		return $this->_cache->delete($this->calculateKey($id));
 	}
 
 	/**
@@ -125,15 +125,15 @@ 
 	 */
 	public function getKeyPrefix()
 	{
-	    return $this->_prefix;
+		return $this->_prefix;
 	}
 
 	/**
-     * @param string prefix of session variable name to avoid conflict with other cache data
-     */
+	 * @param string prefix of session variable name to avoid conflict with other cache data
+	 */
 	public function setKeyPrefix($value)
 	{
-	    $this->_prefix=$value;
+		$this->_prefix=$value;
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	protected function calculateKey($id)
 	{
-	    return $this->_prefix.':'.$id;
+		return $this->_prefix.':'.$id;
 	}
 }
 

Spacing +4 added lines, -4 removed lines

@@ -55,11 +55,11 @@ 
 		if($this->_cacheModuleID==='')
 			throw new TConfigurationException('cachesession_cachemoduleid_required');
 		else if(($cache=$this->getApplication()->getModule($this->_cacheModuleID))===null)
-			throw new TConfigurationException('cachesession_cachemodule_inexistent',$this->_cacheModuleID);
+			throw new TConfigurationException('cachesession_cachemodule_inexistent', $this->_cacheModuleID);
 		else if($cache instanceof ICache)
 			$this->_cache=$cache;
 		else
-			throw new TConfigurationException('cachesession_cachemodule_invalid',$this->_cacheModuleID);
+			throw new TConfigurationException('cachesession_cachemodule_invalid', $this->_cacheModuleID);
 		$this->setUseCustomStorage(true);
 		parent::init($config);
     }
@@ -104,9 +104,9 @@ 
 	 * @param string session data
 	 * @return boolean whether session write is successful
 	 */
-	public function _write($id,$data)
+	public function _write($id, $data)
 	{
-		return $this->_cache->set($this->calculateKey($id),$data,$this->getTimeout());
+		return $this->_cache->set($this->calculateKey($id), $data, $this->getTimeout());
 	}
 
 	/**

framework/TApplication.php

Indentation +1 added lines, -1 removed lines

@@ -602,7 +602,7 @@
 
  	/**
  	 * @param string the application configuration type. 'xml' and 'php' are valid values
-	 */
+ 	 */
 	public function setConfigurationType($value)
 	{
 		$this->_configType = $value;

Doc Comments +9 added lines

@@ -325,6 +325,7 @@ 
 	 * to determine the application configuration file,
 	 * application root path and the runtime path.
 	 * @param string the application root path or the application configuration file
+	 * @param string $basePath
 	 * @see setBasePath
 	 * @see setRuntimePath
 	 * @see setConfigurationFile
@@ -423,6 +424,7 @@ 
 	 * A global value is one that is persistent across users sessions and requests.
 	 * @param string the name of the value to be returned
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
+	 * @param integer $defaultValue
 	 * @return mixed the global value corresponding to $key
 	 */
 	public function getGlobalState($key,$defaultValue=null)
@@ -439,6 +441,7 @@ 
 	 * @param mixed the global value to be set
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @param boolean wheter to force an immediate GlobalState save. defaults to false
+	 * @param string $key
 	 */
 	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
 	{
@@ -553,6 +556,7 @@ 
 
 	/**
 	 * @param string the directory containing the application configuration file
+	 * @param string $value
 	 */
 	public function setBasePath($value)
 	{
@@ -569,6 +573,7 @@ 
 
 	/**
 	 * @param string the application configuration file (absolute path)
+	 * @param string $value
 	 */
 	public function setConfigurationFile($value)
 	{
@@ -585,6 +590,7 @@ 
 
  	/**
  	 * @param string the application configuration type. 'xml' and 'php' are valid values
+ 	 * @param string $value
 	 */
 	public function setConfigurationType($value)
 	{
@@ -640,6 +646,7 @@ 
 
 	/**
 	 * @param string the directory storing cache data and application-level persistent data. (absolute path)
+	 * @param string $value
 	 */
 	public function setRuntimePath($value)
 	{
@@ -1071,6 +1078,7 @@ 
 	 * The service instance will be created. Its properties will be initialized
 	 * and the configurations will be applied, if any.
 	 * @param string service ID
+	 * @param string $serviceID
 	 */
 	public function startService($serviceID)
 	{
@@ -1109,6 +1117,7 @@ 
 	 * This method is invoked when an exception is raised during the lifecycles
 	 * of the application.
 	 * @param mixed event parameter
+	 * @param \Exception $param
 	 */
 	public function onError($param)
 	{

Spacing +69 added lines, -69 removed lines

@@ -116,7 +116,7 @@ 
 	/**
 	 * Configuration file type, application.xml and config.xml
 	 */
-	const CONFIG_TYPE_XML = 'xml';
+	const CONFIG_TYPE_XML='xml';
 	/**
 	 * Application configuration file name
 	 */
@@ -128,7 +128,7 @@ 
 	/**
 	 * Configuration file type, application.php and config.php
 	 */
-	const CONFIG_TYPE_PHP = 'php';
+	const CONFIG_TYPE_PHP='php';
 	/**
 	 * Runtime directory name
 	 */
@@ -281,7 +281,7 @@ 
 	/**
 	 * @var string Customizable page service ID
 	 */
-	private $_pageServiceID = self::PAGE_SERVICE_ID;
+	private $_pageServiceID=self::PAGE_SERVICE_ID;
 
 	/**
 	 * Constructor.
@@ -301,7 +301,7 @@ 
 	 * @param boolean whether to cache application configuration. Defaults to true.
 	 * @throws TConfigurationException if configuration file cannot be read or the runtime path is invalid.
 	 */
-	public function __construct($basePath='protected',$cacheConfig=true, $configType=self::CONFIG_TYPE_XML)
+	public function __construct($basePath='protected', $cacheConfig=true, $configType=self::CONFIG_TYPE_XML)
 	{
 		// register application as a singleton
 		Prado::setApplication($this);
@@ -314,9 +314,9 @@ 
 		// generates unique ID by hashing the runtime path
 		$this->_uniqueID=md5($this->_runtimePath);
 		$this->_parameters=new \Prado\Collections\TMap;
-		$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
+		$this->_services=array($this->getPageServiceID()=>array('TPageService', array(), null));
 
-		Prado::setPathOfAlias('Application',$this->_basePath);
+		Prado::setPathOfAlias('Application', $this->_basePath);
 	}
 
 	/**
@@ -333,7 +333,7 @@ 
 	{
 		// determine configuration path and file
 		if(empty($basePath) || ($basePath=realpath($basePath))===false)
-			throw new TConfigurationException('application_basepath_invalid',$basePath);
+			throw new TConfigurationException('application_basepath_invalid', $basePath);
 		if(is_dir($basePath) && is_file($basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName()))
 			$configFile=$basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName();
 		else if(is_file($basePath))
@@ -354,7 +354,7 @@ 
 				if(!is_dir($runtimePath))
 				{
 					if(@mkdir($runtimePath)===false)
-						throw new TConfigurationException('application_runtimepath_failed',$runtimePath);
+						throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
 					@chmod($runtimePath, PRADO_CHMOD); //make it deletable
 				}
 				$this->setConfigurationFile($configFile);
@@ -363,7 +363,7 @@ 
 			$this->setRuntimePath($runtimePath);
 		}
 		else
-			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
+			throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 
 	}
 
@@ -380,14 +380,14 @@ 
 			$n=count(self::$_steps);
 			$this->_step=0;
 			$this->_requestCompleted=false;
-			while($this->_step<$n)
+			while($this->_step < $n)
 			{
 				if($this->_mode===self::STATE_OFF)
-					throw new THttpException(503,'application_unavailable');
+					throw new THttpException(503, 'application_unavailable');
 				if($this->_requestCompleted)
 					break;
 				$method=self::$_steps[$this->_step];
-				Prado::trace("Executing $method()",'Prado\TApplication');
+				Prado::trace("Executing $method()", 'Prado\TApplication');
 				$this->$method();
 				$this->_step++;
 			}
@@ -425,9 +425,9 @@ 
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @return mixed the global value corresponding to $key
 	 */
-	public function getGlobalState($key,$defaultValue=null)
+	public function getGlobalState($key, $defaultValue=null)
 	{
-		return isset($this->_globals[$key])?$this->_globals[$key]:$defaultValue;
+		return isset($this->_globals[$key]) ? $this->_globals[$key] : $defaultValue;
 	}
 
 	/**
@@ -440,7 +440,7 @@ 
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @param boolean wheter to force an immediate GlobalState save. defaults to false
 	 */
-	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
+	public function setGlobalState($key, $value, $defaultValue=null, $forceSave=false)
 	{
 		$this->_stateChanged=true;
 		if($value===$defaultValue)
@@ -540,7 +540,7 @@ 
 	 */
 	public function setMode($value)
 	{
-		$this->_mode=TPropertyValue::ensureEnum($value,'\Prado\TApplicationMode');
+		$this->_mode=TPropertyValue::ensureEnum($value, '\Prado\TApplicationMode');
 	}
 
 	/**
@@ -588,7 +588,7 @@ 
 	 */
 	public function setConfigurationType($value)
 	{
-		$this->_configType = $value;
+		$this->_configType=$value;
 	}
 
 	/**
@@ -601,10 +601,10 @@ 
 			switch($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
-					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_PHP;
+					$this->_configFileExt=TApplication::CONFIG_FILE_EXT_PHP;
 					break;
 				default:
-					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_XML;
+					$this->_configFileExt=TApplication::CONFIG_FILE_EXT_XML;
 			}
 		}
 		return $this->_configFileExt;
@@ -616,15 +616,15 @@ 
 	public function getConfigurationFileName()
 	{
 		static $fileName;
-		if($fileName == null)
+		if($fileName==null)
 		{
 			switch($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
-					$fileName = TApplication::CONFIG_FILE_PHP;
+					$fileName=TApplication::CONFIG_FILE_PHP;
 					break;
 				default:
-					$fileName = TApplication::CONFIG_FILE_XML;
+					$fileName=TApplication::CONFIG_FILE_XML;
 			}
 		}
 		return $fileName;
@@ -675,7 +675,7 @@ 
 	public function setModule($id, IModule $module=null)
 	{
 		if(isset($this->_modules[$id]))
-			throw new TConfigurationException('application_moduleid_duplicated',$id);
+			throw new TConfigurationException('application_moduleid_duplicated', $id);
 		else
 			$this->_modules[$id]=$module;
 	}
@@ -691,7 +691,7 @@ 
 		// force loading of a lazy module
 		if($this->_modules[$id]===null)
 		{
-			$module = $this->internalLoadModule($id, true);
+			$module=$this->internalLoadModule($id, true);
 			$module[0]->init($module[1]);
 		}
 
@@ -940,37 +940,37 @@ 
 		list($moduleClass, $initProperties, $configElement)=$this->_lazyModules[$id];
 		if(isset($initProperties['lazy']) && $initProperties['lazy'] && !$force)
 		{
-			Prado::trace("Postponed loading of lazy module $id ({$moduleClass})",'\Prado\TApplication');
+			Prado::trace("Postponed loading of lazy module $id ({$moduleClass})", '\Prado\TApplication');
 			$this->setModule($id, null);
 			return null;
 		}
 
-		Prado::trace("Loading module $id ({$moduleClass})",'\Prado\TApplication');
+		Prado::trace("Loading module $id ({$moduleClass})", '\Prado\TApplication');
 		$module=Prado::createComponent($moduleClass);
 		foreach($initProperties as $name=>$value)
 		{
 			if($name==='lazy') continue;
-			$module->setSubProperty($name,$value);
+			$module->setSubProperty($name, $value);
 		}
-		$this->setModule($id,$module);
+		$this->setModule($id, $module);
 		// keep the key to avoid reuse of the old module id
 		$this->_lazyModules[$id]=null;
 
-		return array($module,$configElement);
+		return array($module, $configElement);
 	}
 	/**
 	 * Applies an application configuration.
 	 * @param TApplicationConfiguration the configuration
 	 * @param boolean whether the configuration is specified within a service.
 	 */
-	public function applyConfiguration($config,$withinService=false)
+	public function applyConfiguration($config, $withinService=false)
 	{
 		if($config->getIsEmpty())
 			return;
 
 		// set path aliases and using namespaces
 		foreach($config->getAliases() as $alias=>$path)
-			Prado::setPathOfAlias($alias,$path);
+			Prado::setPathOfAlias($alias, $path);
 		foreach($config->getUsings() as $using)
 			Prado::using($using);
 
@@ -978,11 +978,11 @@ 
 		if(!$withinService)
 		{
 			foreach($config->getProperties() as $name=>$value)
-				$this->setSubProperty($name,$value);
+				$this->setSubProperty($name, $value);
 		}
 
 		if(empty($this->_services))
-			$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
+			$this->_services=array($this->getPageServiceID()=>array('TPageService', array(), null));
 
 		// load parameters
 		foreach($config->getParameters() as $id=>$parameter)
@@ -991,11 +991,11 @@ 
 			{
 				$component=Prado::createComponent($parameter[0]);
 				foreach($parameter[1] as $name=>$value)
-					$component->setSubProperty($name,$value);
-				$this->_parameters->add($id,$component);
+					$component->setSubProperty($name, $value);
+				$this->_parameters->add($id, $component);
 			}
 			else
-				$this->_parameters->add($id,$parameter);
+				$this->_parameters->add($id, $parameter);
 		}
 
 		// load and init modules specified in app config
@@ -1005,7 +1005,7 @@ 
 			if(!is_string($id))
 				$id='_module'.count($this->_lazyModules);
 			$this->_lazyModules[$id]=$moduleConfig;
-			if($module = $this->internalLoadModule($id))
+			if($module=$this->internalLoadModule($id))
 				$modules[]=$module;
 		}
 		foreach($modules as $module)
@@ -1022,12 +1022,12 @@ 
 				$condition=$this->evaluateExpression($condition);
 			if($condition)
 			{
-				if(($path=Prado::getPathOfNamespace($filePath,$this->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('application_includefile_invalid',$filePath);
+				if(($path=Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt()))===null || !is_file($path))
+					throw new TConfigurationException('application_includefile_invalid', $filePath);
 				$cn=$this->getApplicationConfigurationClass();
 				$c=new $cn;
 				$c->loadFromFile($path);
-				$this->applyConfiguration($c,$withinService);
+				$this->applyConfiguration($c, $withinService);
 			}
 		}
 	}
@@ -1043,21 +1043,21 @@ 
 	 */
 	protected function initApplication()
 	{
-		Prado::trace('Initializing application','Prado\TApplication');
+		Prado::trace('Initializing application', 'Prado\TApplication');
 
 		if($this->_configFile!==null)
 		{
-			if($this->_cacheFile===null || @filemtime($this->_cacheFile)<filemtime($this->_configFile))
+			if($this->_cacheFile===null || @filemtime($this->_cacheFile) < filemtime($this->_configFile))
 			{
 				$config=new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
 				if($this->_cacheFile!==null)
-					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
+					file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
 			}
 			else
 				$config=unserialize(file_get_contents($this->_cacheFile));
 
-			$this->applyConfiguration($config,false);
+			$this->applyConfiguration($config, false);
 		}
 
 		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null)
@@ -1076,32 +1076,32 @@ 
 	{
 		if(isset($this->_services[$serviceID]))
 		{
-			list($serviceClass,$initProperties,$configElement)=$this->_services[$serviceID];
+			list($serviceClass, $initProperties, $configElement)=$this->_services[$serviceID];
 			$service=Prado::createComponent($serviceClass);
 			if(!($service instanceof IService))
-				throw new THttpException(500,'application_service_invalid',$serviceClass);
+				throw new THttpException(500, 'application_service_invalid', $serviceClass);
 			if(!$service->getEnabled())
-				throw new THttpException(500,'application_service_unavailable',$serviceClass);
+				throw new THttpException(500, 'application_service_unavailable', $serviceClass);
 			$service->setID($serviceID);
 			$this->setService($service);
 
 			foreach($initProperties as $name=>$value)
-				$service->setSubProperty($name,$value);
+				$service->setSubProperty($name, $value);
 
 			if($configElement!==null)
 			{
 				$config=new TApplicationConfiguration;
 				if($this->getConfigurationType()==self::CONFIG_TYPE_PHP)
-					$config->loadFromPhp($configElement,$this->getBasePath());
+					$config->loadFromPhp($configElement, $this->getBasePath());
 				else
-					$config->loadFromXml($configElement,$this->getBasePath());
-				$this->applyConfiguration($config,true);
+					$config->loadFromXml($configElement, $this->getBasePath());
+				$this->applyConfiguration($config, true);
 			}
 
 			$service->init($configElement);
 		}
 		else
-			throw new THttpException(500,'application_service_unknown',$serviceID);
+			throw new THttpException(500, 'application_service_unknown', $serviceID);
 	}
 
 	/**
@@ -1112,9 +1112,9 @@ 
 	 */
 	public function onError($param)
 	{
-		Prado::log($param->getMessage(),TLogger::ERROR,'Prado\TApplication');
-		$this->raiseEvent('OnError',$this,$param);
-		$this->getErrorHandler()->handleError($this,$param);
+		Prado::log($param->getMessage(), TLogger::ERROR, 'Prado\TApplication');
+		$this->raiseEvent('OnError', $this, $param);
+		$this->getErrorHandler()->handleError($this, $param);
 	}
 
 	/**
@@ -1126,7 +1126,7 @@ 
 	 */
 	public function onBeginRequest()
 	{
-		$this->raiseEvent('OnBeginRequest',$this,null);
+		$this->raiseEvent('OnBeginRequest', $this, null);
 	}
 
 	/**
@@ -1135,7 +1135,7 @@ 
 	 */
 	public function onAuthentication()
 	{
-		$this->raiseEvent('OnAuthentication',$this,null);
+		$this->raiseEvent('OnAuthentication', $this, null);
 	}
 
 	/**
@@ -1144,7 +1144,7 @@ 
 	 */
 	public function onAuthenticationComplete()
 	{
-		$this->raiseEvent('OnAuthenticationComplete',$this,null);
+		$this->raiseEvent('OnAuthenticationComplete', $this, null);
 	}
 
 	/**
@@ -1153,7 +1153,7 @@ 
 	 */
 	public function onAuthorization()
 	{
-		$this->raiseEvent('OnAuthorization',$this,null);
+		$this->raiseEvent('OnAuthorization', $this, null);
 	}
 
 	/**
@@ -1162,7 +1162,7 @@ 
 	 */
 	public function onAuthorizationComplete()
 	{
-		$this->raiseEvent('OnAuthorizationComplete',$this,null);
+		$this->raiseEvent('OnAuthorizationComplete', $this, null);
 	}
 
 	/**
@@ -1172,7 +1172,7 @@ 
 	public function onLoadState()
 	{
 		$this->loadGlobals();
-		$this->raiseEvent('OnLoadState',$this,null);
+		$this->raiseEvent('OnLoadState', $this, null);
 	}
 
 	/**
@@ -1181,7 +1181,7 @@ 
 	 */
 	public function onLoadStateComplete()
 	{
-		$this->raiseEvent('OnLoadStateComplete',$this,null);
+		$this->raiseEvent('OnLoadStateComplete', $this, null);
 	}
 
 	/**
@@ -1190,7 +1190,7 @@ 
 	 */
 	public function onPreRunService()
 	{
-		$this->raiseEvent('OnPreRunService',$this,null);
+		$this->raiseEvent('OnPreRunService', $this, null);
 	}
 
 	/**
@@ -1208,7 +1208,7 @@ 
 	 */
 	public function onSaveState()
 	{
-		$this->raiseEvent('OnSaveState',$this,null);
+		$this->raiseEvent('OnSaveState', $this, null);
 		$this->saveGlobals();
 	}
 
@@ -1218,7 +1218,7 @@ 
 	 */
 	public function onSaveStateComplete()
 	{
-		$this->raiseEvent('OnSaveStateComplete',$this,null);
+		$this->raiseEvent('OnSaveStateComplete', $this, null);
 	}
 
 	/**
@@ -1227,14 +1227,14 @@ 
 	 */
 	public function onPreFlushOutput()
 	{
-		$this->raiseEvent('OnPreFlushOutput',$this,null);
+		$this->raiseEvent('OnPreFlushOutput', $this, null);
 	}
 
 	/**
 	 * Flushes output to client side.
 	 * @param boolean whether to continue buffering after flush if buffering was active
 	 */
-	public function flushOutput($continueBuffering = true)
+	public function flushOutput($continueBuffering=true)
 	{
 		$this->getResponse()->flush($continueBuffering);
 	}
@@ -1246,7 +1246,7 @@ 
 	public function onEndRequest()
 	{
 		$this->flushOutput(false); // flush all remaining content in the buffer
-		$this->saveGlobals();  // save global state
-		$this->raiseEvent('OnEndRequest',$this,null);
+		$this->saveGlobals(); // save global state
+		$this->raiseEvent('OnEndRequest', $this, null);
 	}
 }

Braces +6 added lines, -12 removed lines

@@ -340,8 +340,7 @@ 
 		{
 			$configFile=$basePath;
 			$basePath=dirname($configFile);
-		}
-		else
+		} else
 			$configFile=null;
 
 		// determine runtime path
@@ -361,8 +360,7 @@ 
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
-		}
-		else
+		} else
 			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
 
 	}
@@ -391,8 +389,7 @@ 
 				$this->$method();
 				$this->_step++;
 			}
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -993,8 +990,7 @@ 
 				foreach($parameter[1] as $name=>$value)
 					$component->setSubProperty($name,$value);
 				$this->_parameters->add($id,$component);
-			}
-			else
+			} else
 				$this->_parameters->add($id,$parameter);
 		}
 
@@ -1053,8 +1049,7 @@ 
 				$config->loadFromFile($this->_configFile);
 				if($this->_cacheFile!==null)
 					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
-			}
-			else
+			} else
 				$config=unserialize(file_get_contents($this->_cacheFile));
 
 			$this->applyConfiguration($config,false);
@@ -1099,8 +1094,7 @@ 
 			}
 
 			$service->init($configElement);
-		}
-		else
+		} else
 			throw new THttpException(500,'application_service_unknown',$serviceID);
 	}
 

framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php

Indentation +4 added lines, -4 removed lines

@@ -90,10 +90,10 @@
 	private $_association_columns=array();
 
 	/**
-	* Get the foreign key index values from the results and make calls to the
-	* database to find the corresponding foreign objects using association table.
-	* @param array original results.
-	*/
+	 * Get the foreign key index values from the results and make calls to the
+	 * database to find the corresponding foreign objects using association table.
+	 * @param array original results.
+	 */
 	protected function collectForeignObjects(&$results)
 	{
 		list($sourceKeys, $foreignKeys) = $this->getRelationForeignKeys();

Spacing +87 added lines, -87 removed lines

@@ -96,10 +96,10 @@ 
 	*/
 	protected function collectForeignObjects(&$results)
 	{
-		list($sourceKeys, $foreignKeys) = $this->getRelationForeignKeys();
-		$properties = array_values($sourceKeys);
-		$indexValues = $this->getIndexValues($properties, $results);
-		$this->fetchForeignObjects($results, $foreignKeys,$indexValues,$sourceKeys);
+		list($sourceKeys, $foreignKeys)=$this->getRelationForeignKeys();
+		$properties=array_values($sourceKeys);
+		$indexValues=$this->getIndexValues($properties, $results);
+		$this->fetchForeignObjects($results, $foreignKeys, $indexValues, $sourceKeys);
 	}
 
 	/**
@@ -107,10 +107,10 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$association = $this->getAssociationTable();
-		$sourceKeys = $this->findForeignKeys($association, $this->getSourceRecord(), true);
-		$fkObject = $this->getContext()->getForeignRecordFinder();
-		$foreignKeys = $this->findForeignKeys($association, $fkObject);
+		$association=$this->getAssociationTable();
+		$sourceKeys=$this->findForeignKeys($association, $this->getSourceRecord(), true);
+		$fkObject=$this->getContext()->getForeignRecordFinder();
+		$foreignKeys=$this->findForeignKeys($association, $fkObject);
 		return array($sourceKeys, $foreignKeys);
 	}
 
@@ -121,16 +121,16 @@ 
 	{
 		if($this->_association===null)
 		{
-			$gateway = $this->getSourceRecord()->getRecordGateway();
-			$conn = $this->getSourceRecord()->getDbConnection();
+			$gateway=$this->getSourceRecord()->getRecordGateway();
+			$conn=$this->getSourceRecord()->getDbConnection();
 			//table name may include the fk column name separated with a dot.
-			$table = explode('.', $this->getContext()->getAssociationTable());
-			if(count($table)>1)
+			$table=explode('.', $this->getContext()->getAssociationTable());
+			if(count($table) > 1)
 			{
-				$columns = preg_replace('/^\((.*)\)/', '\1', $table[1]);
-				$this->_association_columns = preg_split('/\s*[, ]\*/',$columns);
+				$columns=preg_replace('/^\((.*)\)/', '\1', $table[1]);
+				$this->_association_columns=preg_split('/\s*[, ]\*/', $columns);
 			}
-			$this->_association = $gateway->getTableInfo($conn, $table[0]);
+			$this->_association=$gateway->getTableInfo($conn, $table[0]);
 		}
 		return $this->_association;
 	}
@@ -142,8 +142,8 @@ 
 	{
 		if($this->_sourceTable===null)
 		{
-			$gateway = $this->getSourceRecord()->getRecordGateway();
-			$this->_sourceTable = $gateway->getRecordTableInfo($this->getSourceRecord());
+			$gateway=$this->getSourceRecord()->getRecordGateway();
+			$this->_sourceTable=$gateway->getRecordTableInfo($this->getSourceRecord());
 		}
 		return $this->_sourceTable;
 	}
@@ -155,9 +155,9 @@ 
 	{
 		if($this->_foreignTable===null)
 		{
-			$gateway = $this->getSourceRecord()->getRecordGateway();
-			$fkObject = $this->getContext()->getForeignRecordFinder();
-			$this->_foreignTable = $gateway->getRecordTableInfo($fkObject);
+			$gateway=$this->getSourceRecord()->getRecordGateway();
+			$fkObject=$this->getContext()->getForeignRecordFinder();
+			$this->_foreignTable=$gateway->getRecordTableInfo($fkObject);
 		}
 		return $this->_foreignTable;
 	}
@@ -175,7 +175,7 @@ 
 	 */
 	protected function getForeignCommandBuilder()
 	{
-		$obj = $this->getContext()->getForeignRecordFinder();
+		$obj=$this->getContext()->getForeignRecordFinder();
 		return $this->getSourceRecord()->getRecordGateway()->getCommand($obj);
 	}
 
@@ -185,21 +185,21 @@ 
 	 * @param array field names
 	 * @param array foreign key index values.
 	 */
-	protected function fetchForeignObjects(&$results,$foreignKeys,$indexValues,$sourceKeys)
+	protected function fetchForeignObjects(&$results, $foreignKeys, $indexValues, $sourceKeys)
 	{
-		$criteria = $this->getCriteria();
-		$finder = $this->getContext()->getForeignRecordFinder();
-		$type = get_class($finder);
-		$command = $this->createCommand($criteria, $foreignKeys,$indexValues,$sourceKeys);
-		$srcProps = array_keys($sourceKeys);
+		$criteria=$this->getCriteria();
+		$finder=$this->getContext()->getForeignRecordFinder();
+		$type=get_class($finder);
+		$command=$this->createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys);
+		$srcProps=array_keys($sourceKeys);
 		$collections=array();
 		foreach($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
 		{
-			$hash = $this->getObjectHash($row, $srcProps);
+			$hash=$this->getObjectHash($row, $srcProps);
 			foreach($srcProps as $column)
 				unset($row[$column]);
-			$obj = $this->createFkObject($type,$row,$foreignKeys);
-			$collections[$hash][] = $obj;
+			$obj=$this->createFkObject($type, $row, $foreignKeys);
+			$collections[$hash][]=$obj;
 		}
 		$this->setResultCollection($results, $collections, array_values($sourceKeys));
 	}
@@ -210,9 +210,9 @@ 
 	 * @param array foreign key column names
 	 * @return TActiveRecord
 	 */
-	protected function createFkObject($type,$row,$foreignKeys)
+	protected function createFkObject($type, $row, $foreignKeys)
 	{
-		$obj = TActiveRecord::createRecord($type, $row);
+		$obj=TActiveRecord::createRecord($type, $row);
 		if(count($this->_association_columns) > 0)
 		{
 			$i=0;
@@ -228,22 +228,22 @@ 
 	 * @param array field names
 	 * @param array field values
 	 */
-	public function createCommand($criteria, $foreignKeys,$indexValues,$sourceKeys)
+	public function createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys)
 	{
-		$innerJoin = $this->getAssociationJoin($foreignKeys,$indexValues,$sourceKeys);
-		$fkTable = $this->getForeignTable()->getTableFullName();
-		$srcColumns = $this->getSourceColumns($sourceKeys);
+		$innerJoin=$this->getAssociationJoin($foreignKeys, $indexValues, $sourceKeys);
+		$fkTable=$this->getForeignTable()->getTableFullName();
+		$srcColumns=$this->getSourceColumns($sourceKeys);
 		if(($where=$criteria->getCondition())===null)
 			$where='1=1';
-		$sql = "SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
+		$sql="SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
 
-		$parameters = $criteria->getParameters()->toArray();
-		$ordering = $criteria->getOrdersBy();
-		$limit = $criteria->getLimit();
-		$offset = $criteria->getOffset();
+		$parameters=$criteria->getParameters()->toArray();
+		$ordering=$criteria->getOrdersBy();
+		$limit=$criteria->getLimit();
+		$offset=$criteria->getOffset();
 
-		$builder = $this->getForeignCommandBuilder()->getBuilder();
-		$command = $builder->applyCriterias($sql,$parameters,$ordering,$limit,$offset);
+		$builder=$this->getForeignCommandBuilder()->getBuilder();
+		$command=$builder->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 		$this->getCommandBuilder()->onCreateCommand($command, $criteria);
 		return $command;
 	}
@@ -255,11 +255,11 @@ 
 	protected function getSourceColumns($sourceKeys)
 	{
 		$columns=array();
-		$table = $this->getAssociationTable();
-		$tableName = $table->getTableFullName();
-		$columnNames = array_merge(array_keys($sourceKeys),$this->_association_columns);
+		$table=$this->getAssociationTable();
+		$tableName=$table->getTableFullName();
+		$columnNames=array_merge(array_keys($sourceKeys), $this->_association_columns);
 		foreach($columnNames as $name)
-			$columns[] = $tableName.'.'.$table->getColumn($name)->getColumnName();
+			$columns[]=$tableName.'.'.$table->getColumn($name)->getColumnName();
 		return implode(', ', $columns);
 	}
 
@@ -270,28 +270,28 @@ 
 	 * @param array source table column names.
 	 * @return string inner join condition for M-N relationship via association table.
 	 */
-	protected function getAssociationJoin($foreignKeys,$indexValues,$sourceKeys)
+	protected function getAssociationJoin($foreignKeys, $indexValues, $sourceKeys)
 	{
-		$refInfo= $this->getAssociationTable();
-		$fkInfo = $this->getForeignTable();
+		$refInfo=$this->getAssociationTable();
+		$fkInfo=$this->getForeignTable();
 
-		$refTable = $refInfo->getTableFullName();
-		$fkTable = $fkInfo->getTableFullName();
+		$refTable=$refInfo->getTableFullName();
+		$fkTable=$fkInfo->getTableFullName();
 
-		$joins = array();
-		$hasAssociationColumns = count($this->_association_columns) > 0;
+		$joins=array();
+		$hasAssociationColumns=count($this->_association_columns) > 0;
 		$i=0;
 		foreach($foreignKeys as $ref=>$fk)
 		{
 			if($hasAssociationColumns)
-				$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
+				$refField=$refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
 			else
-				$refField = $refInfo->getColumn($ref)->getColumnName();
-			$fkField = $fkInfo->getColumn($fk)->getColumnName();
-			$joins[] = "{$fkTable}.{$fkField} = {$refTable}.{$refField}";
+				$refField=$refInfo->getColumn($ref)->getColumnName();
+			$fkField=$fkInfo->getColumn($fk)->getColumnName();
+			$joins[]="{$fkTable}.{$fkField} = {$refTable}.{$refField}";
 		}
-		$joinCondition = implode(' AND ', $joins);
-		$index = $this->getCommandBuilder()->getIndexKeyCondition($refInfo,array_keys($sourceKeys), $indexValues);
+		$joinCondition=implode(' AND ', $joins);
+		$index=$this->getCommandBuilder()->getIndexKeyCondition($refInfo, array_keys($sourceKeys), $indexValues);
 		return "INNER JOIN {$refTable} ON ({$joinCondition}) AND {$index}";
 	}
 
@@ -301,15 +301,15 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$obj = $this->getContext()->getSourceRecord();
-		$fkObjects = &$obj->{$this->getContext()->getProperty()};
+		$obj=$this->getContext()->getSourceRecord();
+		$fkObjects=&$obj->{$this->getContext()->getProperty()};
 		$success=true;
-		if(($total = count($fkObjects))> 0)
+		if(($total=count($fkObjects)) > 0)
 		{
-			$source = $this->getSourceRecord();
-			$builder = $this->getAssociationTableCommandBuilder();
-			for($i=0;$i<$total;$i++)
-				$success = $fkObjects[$i]->save() && $success;
+			$source=$this->getSourceRecord();
+			$builder=$this->getAssociationTableCommandBuilder();
+			for($i=0; $i < $total; $i++)
+				$success=$fkObjects[$i]->save() && $success;
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}
 		return $success;
@@ -320,57 +320,57 @@ 
 	 */
 	protected function getAssociationTableCommandBuilder()
 	{
-		$conn = $this->getContext()->getSourceRecord()->getDbConnection();
+		$conn=$this->getContext()->getSourceRecord()->getDbConnection();
 		return $this->getAssociationTable()->createCommandBuilder($conn);
 	}
 
-	private function hasAssociationData($builder,$data)
+	private function hasAssociationData($builder, $data)
 	{
 		$condition=array();
-		$table = $this->getAssociationTable();
+		$table=$this->getAssociationTable();
 		foreach($data as $name=>$value)
-			$condition[] = $table->getColumn($name)->getColumnName().' = ?';
-		$command = $builder->createCountCommand(implode(' AND ', $condition),array_values($data));
-		$result = $this->getCommandBuilder()->onExecuteCommand($command, intval($command->queryScalar()));
+			$condition[]=$table->getColumn($name)->getColumnName().' = ?';
+		$command=$builder->createCountCommand(implode(' AND ', $condition), array_values($data));
+		$result=$this->getCommandBuilder()->onExecuteCommand($command, intval($command->queryScalar()));
 		return intval($result) > 0;
 	}
 
-	private function addAssociationData($builder,$data)
+	private function addAssociationData($builder, $data)
 	{
-		$command = $builder->createInsertCommand($data);
+		$command=$builder->createInsertCommand($data);
 		return $this->getCommandBuilder()->onExecuteCommand($command, $command->execute()) > 0;
 	}
 
-	private function updateAssociationTable($obj,$fkObjects, $builder)
+	private function updateAssociationTable($obj, $fkObjects, $builder)
 	{
-		$source = $this->getSourceRecordValues($obj);
-		$foreignKeys = $this->findForeignKeys($this->getAssociationTable(), $fkObjects[0]);
+		$source=$this->getSourceRecordValues($obj);
+		$foreignKeys=$this->findForeignKeys($this->getAssociationTable(), $fkObjects[0]);
 		$success=true;
 		foreach($fkObjects as $fkObject)
 		{
-			$data = array_merge($source, $this->getForeignObjectValues($foreignKeys,$fkObject));
-			if(!$this->hasAssociationData($builder,$data))
-				$success = $this->addAssociationData($builder,$data) && $success;
+			$data=array_merge($source, $this->getForeignObjectValues($foreignKeys, $fkObject));
+			if(!$this->hasAssociationData($builder, $data))
+				$success=$this->addAssociationData($builder, $data) && $success;
 		}
 		return $success;
 	}
 
 	private function getSourceRecordValues($obj)
 	{
-		$sourceKeys = $this->findForeignKeys($this->getAssociationTable(), $obj);
-		$indexValues = $this->getIndexValues(array_values($sourceKeys), $obj);
-		$data = array();
+		$sourceKeys=$this->findForeignKeys($this->getAssociationTable(), $obj);
+		$indexValues=$this->getIndexValues(array_values($sourceKeys), $obj);
+		$data=array();
 		$i=0;
 		foreach($sourceKeys as $name=>$srcKey)
-			$data[$name] = $indexValues[0][$i++];
+			$data[$name]=$indexValues[0][$i++];
 		return $data;
 	}
 
-	private function getForeignObjectValues($foreignKeys,$fkObject)
+	private function getForeignObjectValues($foreignKeys, $fkObject)
 	{
 		$data=array();
 		foreach($foreignKeys as $name=>$fKey)
-			$data[$name] = $fkObject->getColumnValue($fKey);
+			$data[$name]=$fkObject->getColumnValue($fKey);
 		return $data;
 	}
 }

Doc Comments +6 added lines, -2 removed lines

@@ -165,7 +165,7 @@ 
 	}
 
 	/**
-	 * @return TDataGatewayCommand
+	 * @return \Prado\Data\DataGateway\TDataGatewayCommand
 	 */
 	protected function getCommandBuilder()
 	{
@@ -173,7 +173,7 @@ 
 	}
 
 	/**
-	 * @return TDataGatewayCommand
+	 * @return \Prado\Data\DataGateway\TDataGatewayCommand
 	 */
 	protected function getForeignCommandBuilder()
 	{
@@ -210,6 +210,7 @@ 
 	 * @param string active record class name.
 	 * @param array row data
 	 * @param array foreign key column names
+	 * @param string $type
 	 * @return TActiveRecord
 	 */
 	protected function createFkObject($type,$row,$foreignKeys)
@@ -343,6 +344,9 @@ 
 		return $this->getCommandBuilder()->onExecuteCommand($command, $command->execute()) > 0;
 	}
 
+	/**
+	 * @param TActiveRecord $obj
+	 */
 	private function updateAssociationTable($obj,$fkObjects, $builder)
 	{
 		$source = $this->getSourceRecordValues($obj);

framework/Data/Common/Sqlite/TSqliteMetaData.php

Indentation +5 added lines, -5 removed lines

@@ -189,11 +189,11 @@
 		return false;
 	}
 
-        /**
-	 * Returns all table names in the database.
-	 * @param string $schema the schema of the tables. This is not used for sqlite database.
-	 * @return array all table names in the database.
-	 */
+		/**
+		 * Returns all table names in the database.
+		 * @param string $schema the schema of the tables. This is not used for sqlite database.
+		 * @return array all table names in the database.
+		 */
 	public function findTableNames($schema='')
 	{
 		$sql="SELECT DISTINCT tbl_name FROM sqlite_master WHERE tbl_name<>'sqlite_sequence'";

Spacing +36 added lines, -36 removed lines

@@ -69,30 +69,30 @@ 
 	 */
 	protected function createTableInfo($tableName)
 	{
-		$tableName = str_replace("'",'',$tableName);
+		$tableName=str_replace("'", '', $tableName);
 		$this->getDbConnection()->setActive(true);
-		$table = $this->getDbConnection()->quoteString($tableName);
-		$sql = "PRAGMA table_info({$table})";
-		$command = $this->getDbConnection()->createCommand($sql);
-		$foreign = $this->getForeignKeys($table);
+		$table=$this->getDbConnection()->quoteString($tableName);
+		$sql="PRAGMA table_info({$table})";
+		$command=$this->getDbConnection()->createCommand($sql);
+		$foreign=$this->getForeignKeys($table);
 		$index=0;
 		$columns=array();
 		$primary=array();
 		foreach($command->query() as $col)
 		{
-			$col['index'] = $index++;
-			$column = $this->processColumn($col, $foreign);
-			$columns[$col['name']] = $column;
+			$col['index']=$index++;
+			$column=$this->processColumn($col, $foreign);
+			$columns[$col['name']]=$column;
 			if($column->getIsPrimaryKey())
-				$primary[] = $col['name'];
+				$primary[]=$col['name'];
 		}
-		$info['TableName'] = $tableName;
+		$info['TableName']=$tableName;
 		if($this->getIsView($tableName))
-			$info['IsView'] = true;
+			$info['IsView']=true;
 		if(count($columns)===0)
 			throw new TDbException('dbmetadata_invalid_table_view', $tableName);
-		$class = $this->getTableInfoClass();
-		$tableInfo = new $class($info,$primary,$foreign);
+		$class=$this->getTableInfoClass();
+		$tableInfo=new $class($info, $primary, $foreign);
 		$tableInfo->getColumns()->copyFrom($columns);
 		return $tableInfo;
 	}
@@ -103,11 +103,11 @@ 
 	 */
 	protected function getIsView($tableName)
 	{
-		$sql = 'SELECT count(*) FROM sqlite_master WHERE type="view" AND name= :table';
+		$sql='SELECT count(*) FROM sqlite_master WHERE type="view" AND name= :table';
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		return intval($command->queryScalar()) === 1;
+		return intval($command->queryScalar())===1;
 	}
 
 	/**
@@ -117,39 +117,39 @@ 
 	 */
 	protected function processColumn($col, $foreign)
 	{
-		$columnId = $col['name']; //use column name as column Id
+		$columnId=$col['name']; //use column name as column Id
 
-		$info['ColumnName'] = '"'.$columnId.'"'; //quote the column names!
-		$info['ColumnId'] = $columnId;
-		$info['ColumnIndex'] = $col['index'];
+		$info['ColumnName']='"'.$columnId.'"'; //quote the column names!
+		$info['ColumnId']=$columnId;
+		$info['ColumnIndex']=$col['index'];
 
 		if($col['notnull']!=='99')
-			$info['AllowNull'] = true;
+			$info['AllowNull']=true;
 
 		if($col['pk']==='1')
-			$info['IsPrimaryKey'] = true;
+			$info['IsPrimaryKey']=true;
 		if($this->isForeignKeyColumn($columnId, $foreign))
-			$info['IsForeignKey'] = true;
+			$info['IsForeignKey']=true;
 
 		if($col['dflt_value']!==null)
-			$info['DefaultValue'] = $col['dflt_value'];
+			$info['DefaultValue']=$col['dflt_value'];
 
-		$type = strtolower($col['type']);
-		$info['AutoIncrement'] = $type==='integer' && $col['pk']==='1';
+		$type=strtolower($col['type']);
+		$info['AutoIncrement']=$type==='integer' && $col['pk']==='1';
 
-		$info['DbType'] = $type;
+		$info['DbType']=$type;
 		$match=array();
 		if(is_int($pos=strpos($type, '(')) && preg_match('/\((.*)\)/', $type, $match))
 		{
-			$ps = explode(',', $match[1]);
+			$ps=explode(',', $match[1]);
 			if(count($ps)===2)
 			{
-				$info['NumericPrecision'] = intval($ps[0]);
-				$info['NumericScale'] = intval($ps[1]);
+				$info['NumericPrecision']=intval($ps[0]);
+				$info['NumericScale']=intval($ps[1]);
 			}
 			else
 				$info['ColumnSize']=intval($match[1]);
-			$info['DbType'] = substr($type,0,$pos);
+			$info['DbType']=substr($type, 0, $pos);
 		}
 
 		return new TSqliteTableColumn($info);
@@ -163,13 +163,13 @@ 
 	 */
 	protected function getForeignKeys($table)
 	{
-		$sql = "PRAGMA foreign_key_list({$table})";
-		$command = $this->getDbConnection()->createCommand($sql);
-		$fkeys = array();
+		$sql="PRAGMA foreign_key_list({$table})";
+		$command=$this->getDbConnection()->createCommand($sql);
+		$fkeys=array();
 		foreach($command->query() as $col)
 		{
-			$fkeys[$col['table']]['keys'][$col['from']] = $col['to'];
-			$fkeys[$col['table']]['table'] = $col['table'];
+			$fkeys[$col['table']]['keys'][$col['from']]=$col['to'];
+			$fkeys[$col['table']]['table']=$col['table'];
 		}
 		return count($fkeys) > 0 ? array_values($fkeys) : $fkeys;
 	}

Braces +1 added lines, -2 removed lines

@@ -158,8 +158,7 @@
 				$e->setAttribute('maxOccurs','unbounded');
 				$sequence->appendChild($e);
 				$complexType->appendChild($sequence);
-			}
-			else
+			} else
 			{
 				$all = $dom->createElementNS('http://www.w3.org/2001/XMLSchema', 'xsd:all');
 				foreach($elements as $elem)

framework/Wsat/TWsatService.php

Indentation +33 added lines, -33 removed lines

@@ -36,46 +36,46 @@
 class TWsatService extends TPageService
 {
 
-        private $_pass = '';
+		private $_pass = '';
 
-        public function init($config)
-        {
-                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.");
+		public function init($config)
+		{
+				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))
-                        throw new TConfigurationException("You need to specify the Password attribute.");
+				if (empty($this->_pass))
+						throw new TConfigurationException("You need to specify the Password attribute.");
 
-                $this->setDefaultPage("TWsatHome");
-                $this->_startThemeManager();
-                parent::init($config);
-        }
+				$this->setDefaultPage("TWsatHome");
+				$this->_startThemeManager();
+				parent::init($config);
+		}
 
-        public function getBasePath()
-        {
-                $basePath = Prado::getPathOfNamespace("System.Wsat.pages");
-                return realpath($basePath);
-        }
+		public function getBasePath()
+		{
+				$basePath = Prado::getPathOfNamespace("System.Wsat.pages");
+				return realpath($basePath);
+		}
 
-        private function _startThemeManager()
-        {
-                $themeManager = new TThemeManager;
-                $themeManager->BasePath = "System.Wsat.themes";
-                $url = Prado::getApplication()->getAssetManager()->publishFilePath(Prado::getPathOfNamespace('System.Wsat'));
-                $themeManager->BaseUrl = "$url/themes";
+		private function _startThemeManager()
+		{
+				$themeManager = new TThemeManager;
+				$themeManager->BasePath = "System.Wsat.themes";
+				$url = Prado::getApplication()->getAssetManager()->publishFilePath(Prado::getPathOfNamespace('System.Wsat'));
+				$themeManager->BaseUrl = "$url/themes";
 
-                $themeManager->init(null);
-                $this->setThemeManager($themeManager);
-        }
+				$themeManager->init(null);
+				$this->setThemeManager($themeManager);
+		}
 
-        public function getPassword()
-        {
-                return $this->_pass;
-        }
+		public function getPassword()
+		{
+				return $this->_pass;
+		}
 
-        public function setPassword($_pass)
-        {
-                $this->_pass = $_pass;
-        }
+		public function setPassword($_pass)
+		{
+				$this->_pass = $_pass;
+		}
 
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -36,14 +36,14 @@ 
 class TWsatService extends TPageService
 {
 
-        private $_pass = '';
+        private $_pass='';
 
         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");
@@ -53,16 +53,16 @@ 
 
         public function getBasePath()
         {
-                $basePath = Prado::getPathOfNamespace("System.Wsat.pages");
+                $basePath=Prado::getPathOfNamespace("System.Wsat.pages");
                 return realpath($basePath);
         }
 
         private function _startThemeManager()
         {
-                $themeManager = new TThemeManager;
-                $themeManager->BasePath = "System.Wsat.themes";
-                $url = Prado::getApplication()->getAssetManager()->publishFilePath(Prado::getPathOfNamespace('System.Wsat'));
-                $themeManager->BaseUrl = "$url/themes";
+                $themeManager=new TThemeManager;
+                $themeManager->BasePath="System.Wsat.themes";
+                $url=Prado::getApplication()->getAssetManager()->publishFilePath(Prado::getPathOfNamespace('System.Wsat'));
+                $themeManager->BaseUrl="$url/themes";
 
                 $themeManager->init(null);
                 $this->setThemeManager($themeManager);
@@ -75,7 +75,7 @@ 
 
         public function setPassword($_pass)
         {
-                $this->_pass = $_pass;
+                $this->_pass=$_pass;
         }
 
 }
\ No newline at end of file

framework/Wsat/TWsatBaseGenerator.php

Indentation +57 added lines, -57 removed lines

@@ -14,69 +14,69 @@
 class TWsatBaseGenerator
 {
 
-    /**
-     * @return TDbMetaData for retrieving metadata information, such as
-     * table and columns information, from a database connection.
-     */
-    protected $_dbMetaData;
+	/**
+	 * @return TDbMetaData for retrieving metadata information, such as
+	 * table and columns information, from a database connection.
+	 */
+	protected $_dbMetaData;
 
-    /**
-     * Output folder where AR classes will be saved.
-     */
-    protected $_opFile;
+	/**
+	 * Output folder where AR classes will be saved.
+	 */
+	protected $_opFile;
 
-    function __construct()
-    {
-        if (!class_exists("TActiveRecordManager", false))
-            throw new Exception("You need to enable the ActiveRecord module in your application configuration file.");
-        $ar_manager = TActiveRecordManager::getInstance();
-        $_conn = $ar_manager->getDbConnection();
-        $_conn->Active = true;
-        $this->_dbMetaData = TDbMetaData::getInstance($_conn);
-    }
+	function __construct()
+	{
+		if (!class_exists("TActiveRecordManager", false))
+			throw new Exception("You need to enable the ActiveRecord module in your application configuration file.");
+		$ar_manager = TActiveRecordManager::getInstance();
+		$_conn = $ar_manager->getDbConnection();
+		$_conn->Active = true;
+		$this->_dbMetaData = TDbMetaData::getInstance($_conn);
+	}
 
-    public function setOpFile($op_file_namespace)
-    {
-        $op_file = Prado::getPathOfNamespace($op_file_namespace);
-        if (empty($op_file))
-            throw new Exception("You need to fix your output folder namespace.");
-        if (!is_dir($op_file))
-            mkdir($op_file, 0777, true);
-        $this->_opFile = $op_file;
-    }
+	public function setOpFile($op_file_namespace)
+	{
+		$op_file = Prado::getPathOfNamespace($op_file_namespace);
+		if (empty($op_file))
+			throw new Exception("You need to fix your output folder namespace.");
+		if (!is_dir($op_file))
+			mkdir($op_file, 0777, true);
+		$this->_opFile = $op_file;
+	}
 
-    public function renderAllTablesInformation()
-    {
-        foreach ($this->getAllTableNames() as $table_name)
-        {
-            echo $table_name . "<br>";
-            $tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-            echo "Table info:" . "<br>";
-            echo "<pre>";
-            print_r($tableInfo);
-            echo "</pre>";
-        }
-    }
+	public function renderAllTablesInformation()
+	{
+		foreach ($this->getAllTableNames() as $table_name)
+		{
+			echo $table_name . "<br>";
+			$tableInfo = $this->_dbMetaData->getTableInfo($table_name);
+			echo "Table info:" . "<br>";
+			echo "<pre>";
+			print_r($tableInfo);
+			echo "</pre>";
+		}
+	}
 
-    public function getAllTableNames()
-    {
-        $tableNames = $this->_dbMetaData->findTableNames();
-        $index = array_search('pradocache', $tableNames);
-        if ($index)
-            array_splice($tableNames, $index, 1);
-        return $tableNames;
-    }
+	public function getAllTableNames()
+	{
+		$tableNames = $this->_dbMetaData->findTableNames();
+		$index = array_search('pradocache', $tableNames);
+		if ($index)
+			array_splice($tableNames, $index, 1);
+		return $tableNames;
+	}
 
-    public static function pr($data)
-    {
-        echo "<pre>";
-        print_r($data);
-        echo "</pre>";
-    }
+	public static function pr($data)
+	{
+		echo "<pre>";
+		print_r($data);
+		echo "</pre>";
+	}
 
-    protected function eq($data)
-    {
-        return '"' . $data . '"';
-    }
+	protected function eq($data)
+	{
+		return '"' . $data . '"';
+	}
 
 }

Spacing +17 added lines, -17 removed lines

@@ -27,31 +27,31 @@ 
 
     function __construct()
     {
-        if (!class_exists("TActiveRecordManager", false))
+        if(!class_exists("TActiveRecordManager", false))
             throw new Exception("You need to enable the ActiveRecord module in your application configuration file.");
-        $ar_manager = TActiveRecordManager::getInstance();
-        $_conn = $ar_manager->getDbConnection();
-        $_conn->Active = true;
-        $this->_dbMetaData = TDbMetaData::getInstance($_conn);
+        $ar_manager=TActiveRecordManager::getInstance();
+        $_conn=$ar_manager->getDbConnection();
+        $_conn->Active=true;
+        $this->_dbMetaData=TDbMetaData::getInstance($_conn);
     }
 
     public function setOpFile($op_file_namespace)
     {
-        $op_file = Prado::getPathOfNamespace($op_file_namespace);
-        if (empty($op_file))
+        $op_file=Prado::getPathOfNamespace($op_file_namespace);
+        if(empty($op_file))
             throw new Exception("You need to fix your output folder namespace.");
-        if (!is_dir($op_file))
+        if(!is_dir($op_file))
             mkdir($op_file, 0777, true);
-        $this->_opFile = $op_file;
+        $this->_opFile=$op_file;
     }
 
     public function renderAllTablesInformation()
     {
-        foreach ($this->getAllTableNames() as $table_name)
+        foreach($this->getAllTableNames() as $table_name)
         {
-            echo $table_name . "<br>";
-            $tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-            echo "Table info:" . "<br>";
+            echo $table_name."<br>";
+            $tableInfo=$this->_dbMetaData->getTableInfo($table_name);
+            echo "Table info:"."<br>";
             echo "<pre>";
             print_r($tableInfo);
             echo "</pre>";
@@ -60,9 +60,9 @@ 
 
     public function getAllTableNames()
     {
-        $tableNames = $this->_dbMetaData->findTableNames();
-        $index = array_search('pradocache', $tableNames);
-        if ($index)
+        $tableNames=$this->_dbMetaData->findTableNames();
+        $index=array_search('pradocache', $tableNames);
+        if($index)
             array_splice($tableNames, $index, 1);
         return $tableNames;
     }
@@ -76,7 +76,7 @@ 
 
     protected function eq($data)
     {
-        return '"' . $data . '"';
+        return '"'.$data.'"';
     }
 
 }

framework/Wsat/pages/TWsatScaffolding.php

Indentation +51 added lines, -51 removed lines

@@ -14,59 +14,59 @@
 class TWsatScaffolding extends TPage
 {
 
-        public function onInit($param)
-        {
-                parent::onInit($param);
-                $this->startVisual();
-        }
+		public function onInit($param)
+		{
+				parent::onInit($param);
+				$this->startVisual();
+		}
 
-        private function startVisual()
-        {
-                $scf_generator = new TWsatScaffoldingGenerator();
-                foreach ($scf_generator->getAllTableNames() as $tableName)
-                {
-                        $dynChb = new TCheckBox();
-                        $dynChb->ID = "cb_$tableName";
-                        $dynChb->Text = ucfirst($tableName);
-                        $dynChb->Checked = true;
-                        $this->registerObject("cb_$tableName", $dynChb);
-                        $this->tableNames->getControls()->add($dynChb);
-                        $this->tableNames->getControls()->add("</br>");
-                }
-        }
+		private function startVisual()
+		{
+				$scf_generator = new TWsatScaffoldingGenerator();
+				foreach ($scf_generator->getAllTableNames() as $tableName)
+				{
+						$dynChb = new TCheckBox();
+						$dynChb->ID = "cb_$tableName";
+						$dynChb->Text = ucfirst($tableName);
+						$dynChb->Checked = true;
+						$this->registerObject("cb_$tableName", $dynChb);
+						$this->tableNames->getControls()->add($dynChb);
+						$this->tableNames->getControls()->add("</br>");
+				}
+		}
 
-        /**
-         * Generate Scaffolding code for selected tables
-         * @param type $sender
-         */
-        public function generate($sender)
-        {
-                if ($this->IsValid)
-                {
-                        try
-                        {
-                                $scf_generator = new TWsatScaffoldingGenerator();
-                                $scf_generator->setOpFile($this->output_folder->Text);
-                                foreach ($scf_generator->getAllTableNames() as $tableName)
-                                {
-                                        $id = "cb_$tableName";
-                                        $obj = $this->tableNames->findControl($id);
-                                        if($obj!==null && $obj->Checked)
-                                        {
-                                                $scf_generator->generateCRUD($tableName);
-                                        }
-                                }
+		/**
+		 * Generate Scaffolding code for selected tables
+		 * @param type $sender
+		 */
+		public function generate($sender)
+		{
+				if ($this->IsValid)
+				{
+						try
+						{
+								$scf_generator = new TWsatScaffoldingGenerator();
+								$scf_generator->setOpFile($this->output_folder->Text);
+								foreach ($scf_generator->getAllTableNames() as $tableName)
+								{
+										$id = "cb_$tableName";
+										$obj = $this->tableNames->findControl($id);
+										if($obj!==null && $obj->Checked)
+										{
+												$scf_generator->generateCRUD($tableName);
+										}
+								}
                                 
-                                $this->feedback_panel->CssClass = "green_panel";
-                                $this->generation_msg->Text = "The code has been generated successfully.";
-                        } catch (Exception $ex)
-                        {
-                                $this->feedback_panel->CssClass = "red_panel";
-                                $this->generation_msg->Text = $ex->getMessage();
-                        }
-                        $this->feedback_panel->Visible = true;
-                }
+								$this->feedback_panel->CssClass = "green_panel";
+								$this->generation_msg->Text = "The code has been generated successfully.";
+						} catch (Exception $ex)
+						{
+								$this->feedback_panel->CssClass = "red_panel";
+								$this->generation_msg->Text = $ex->getMessage();
+						}
+						$this->feedback_panel->Visible = true;
+				}
 
-                //   $scf_generator->renderAllTablesInformation();
-        }
+				//   $scf_generator->renderAllTablesInformation();
+		}
 }
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -22,13 +22,13 @@ 
 
         private function startVisual()
         {
-                $scf_generator = new TWsatScaffoldingGenerator();
-                foreach ($scf_generator->getAllTableNames() as $tableName)
+                $scf_generator=new TWsatScaffoldingGenerator();
+                foreach($scf_generator->getAllTableNames() as $tableName)
                 {
-                        $dynChb = new TCheckBox();
-                        $dynChb->ID = "cb_$tableName";
-                        $dynChb->Text = ucfirst($tableName);
-                        $dynChb->Checked = true;
+                        $dynChb=new TCheckBox();
+                        $dynChb->ID="cb_$tableName";
+                        $dynChb->Text=ucfirst($tableName);
+                        $dynChb->Checked=true;
                         $this->registerObject("cb_$tableName", $dynChb);
                         $this->tableNames->getControls()->add($dynChb);
                         $this->tableNames->getControls()->add("</br>");
@@ -41,30 +41,30 @@ 
          */
         public function generate($sender)
         {
-                if ($this->IsValid)
+                if($this->IsValid)
                 {
                         try
                         {
-                                $scf_generator = new TWsatScaffoldingGenerator();
+                                $scf_generator=new TWsatScaffoldingGenerator();
                                 $scf_generator->setOpFile($this->output_folder->Text);
-                                foreach ($scf_generator->getAllTableNames() as $tableName)
+                                foreach($scf_generator->getAllTableNames() as $tableName)
                                 {
-                                        $id = "cb_$tableName";
-                                        $obj = $this->tableNames->findControl($id);
+                                        $id="cb_$tableName";
+                                        $obj=$this->tableNames->findControl($id);
                                         if($obj!==null && $obj->Checked)
                                         {
                                                 $scf_generator->generateCRUD($tableName);
                                         }
                                 }
                                 
-                                $this->feedback_panel->CssClass = "green_panel";
-                                $this->generation_msg->Text = "The code has been generated successfully.";
-                        } catch (Exception $ex)
+                                $this->feedback_panel->CssClass="green_panel";
+                                $this->generation_msg->Text="The code has been generated successfully.";
+                        } catch(Exception $ex)
                         {
-                                $this->feedback_panel->CssClass = "red_panel";
-                                $this->generation_msg->Text = $ex->getMessage();
+                                $this->feedback_panel->CssClass="red_panel";
+                                $this->generation_msg->Text=$ex->getMessage();
                         }
-                        $this->feedback_panel->Visible = true;
+                        $this->feedback_panel->Visible=true;
                 }
 
                 //   $scf_generator->renderAllTablesInformation();

framework/Wsat/pages/layout/TWsatLayout.php

Indentation +22 added lines, -22 removed lines

@@ -8,29 +8,29 @@
 class TWsatLayout extends TTemplateControl
 {
 
-        public function onLoad($param)
-        {
-                parent::onLoad($param);
-                $this->validateSecurity();
-        }
+		public function onLoad($param)
+		{
+				parent::onLoad($param);
+				$this->validateSecurity();
+		}
 
-        private function validateSecurity()
-        {
-                if ($this->Session["wsat_password"] !== $this->getService()->getPassword())
-                {
-                        if (!$this->getPage() instanceof TWsatLogin)
-                        {
-                                $url = $this->Service->constructUrl('TWsatLogin');
-                                $this->Response->redirect($url);
-                        }
-                }
-        }
+		private function validateSecurity()
+		{
+				if ($this->Session["wsat_password"] !== $this->getService()->getPassword())
+				{
+						if (!$this->getPage() instanceof TWsatLogin)
+						{
+								$url = $this->Service->constructUrl('TWsatLogin');
+								$this->Response->redirect($url);
+						}
+				}
+		}
 
-        public function logout()
-        {
-                $this->Session["wsat_password"] = "";
-                $url = $this->Service->constructUrl('TWsatLogin');
-                $this->Response->redirect($url);
-        }
+		public function logout()
+		{
+				$this->Session["wsat_password"] = "";
+				$url = $this->Service->constructUrl('TWsatLogin');
+				$this->Response->redirect($url);
+		}
 
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -16,11 +16,11 @@ 
 
         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');
+                                $url=$this->Service->constructUrl('TWsatLogin');
                                 $this->Response->redirect($url);
                         }
                 }
@@ -28,8 +28,8 @@ 
 
         public function logout()
         {
-                $this->Session["wsat_password"] = "";
-                $url = $this->Service->constructUrl('TWsatLogin');
+                $this->Session["wsat_password"]="";
+                $url=$this->Service->constructUrl('TWsatLogin');
                 $this->Response->redirect($url);
         }