pradosoft / prado

framework/Web/UI/WebControls/TTable.php

Doc Comments +2 added lines

@@ -144,6 +144,7 @@ 
 
 	/**
 	 * @param string table caption
+	 * @param string $value
 	 */
 	public function setCaption($value)
 	{
@@ -160,6 +161,7 @@ 
 
 	/**
 	 * @param TTableCaptionAlign table caption alignment.
+	 * @param TTableCaptionAlign $value
 	 */
 	public function setCaptionAlign($value)
 	{

Braces +4 added lines, -8 removed lines

@@ -306,8 +306,7 @@ 
 					{
 						if($index===0 && $currentSection===TTableRowSection::Header)
 							$writer->renderBeginTag('thead');
-					}
-					else
+					} else
 					{
 						if($currentSection===TTableRowSection::Header)
 						{
@@ -318,8 +317,7 @@ 
 							else
 								$writer->renderBeginTag('tfoot');
 							$currentSection=$section;
-						}
-						else if($currentSection===TTableRowSection::Body)
+						} else if($currentSection===TTableRowSection::Body)
 						{
 							$writer->renderEndTag();
 							if($section===TTableRowSection::Footer)
@@ -327,16 +325,14 @@ 
 							else
 								throw new TConfigurationException('table_tablesection_outoforder');
 							$currentSection=$section;
-						}
-						else // Footer
+						} else // Footer
 							throw new TConfigurationException('table_tablesection_outoforder');
 					}
 					$row->renderControl($writer);
 					$writer->writeLine();
 				}
 				$writer->renderEndTag();
-			}
-			else
+			} else
 			{
 				$writer->writeLine();
 				foreach($this->getControls() as $row)

Spacing +8 added lines, -8 removed lines

@@ -109,10 +109,10 @@ 
 				if(($border=$this->getBorderWidth())==='')
 					$border=1;
 				else
-					$border=(int)$border;
+					$border=(int) $border;
 			}
 		}
-		$writer->addAttribute('border',"$border");
+		$writer->addAttribute('border', "$border");
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function getCaption()
 	{
-		return $this->getViewState('Caption','');
+		return $this->getViewState('Caption', '');
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function setCaption($value)
 	{
-		$this->setViewState('Caption',$value,'');
+		$this->setViewState('Caption', $value, '');
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 */
 	public function getCaptionAlign()
 	{
-		return $this->getViewState('CaptionAlign',TTableCaptionAlign::NotSet);
+		return $this->getViewState('CaptionAlign', TTableCaptionAlign::NotSet);
 	}
 
 	/**
@@ -162,7 +162,7 @@ 
 	 */
 	public function setCaptionAlign($value)
 	{
-		$this->setViewState('CaptionAlign',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TTableCaptionAlign'),TTableCaptionAlign::NotSet);
+		$this->setViewState('CaptionAlign', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TTableCaptionAlign'), TTableCaptionAlign::NotSet);
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 		if(($caption=$this->getCaption())!=='')
 		{
 			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet)
-				$writer->addAttribute('align',strtolower($align));
+				$writer->addAttribute('align', strtolower($align));
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
 			$writer->renderEndTag();
@@ -310,7 +310,7 @@ 
 					{
 						if($currentSection===TTableRowSection::Header)
 						{
-							if($index>0)
+							if($index > 0)
 								$writer->renderEndTag();
 							if($section===TTableRowSection::Body)
 								$writer->renderBeginTag('tbody');

framework/Web/UI/WebControls/TTemplateColumn.php

Doc Comments +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
 	}
 
 	/**
-	 * @return ITemplate the item template
+	 * @return string the item template
 	 */
 	public function getItemTemplate()
 	{

Spacing +15 added lines, -15 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	public function getItemRenderer()
 	{
-		return $this->getViewState('ItemRenderer','');
+		return $this->getViewState('ItemRenderer', '');
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 */
 	public function setItemRenderer($value)
 	{
-		$this->setViewState('ItemRenderer',$value,'');
+		$this->setViewState('ItemRenderer', $value, '');
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 */
 	public function getEditItemRenderer()
 	{
-		return $this->getViewState('EditItemRenderer','');
+		return $this->getViewState('EditItemRenderer', '');
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function setEditItemRenderer($value)
 	{
-		$this->setViewState('EditItemRenderer',$value,'');
+		$this->setViewState('EditItemRenderer', $value, '');
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_editItemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','EditItemTemplate');
+			throw new TInvalidDataTypeException('templatecolumn_template_required', 'EditItemTemplate');
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_itemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','ItemTemplate');
+			throw new TInvalidDataTypeException('templatecolumn_template_required', 'ItemTemplate');
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_headerTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','HeaderTemplate');
+			throw new TInvalidDataTypeException('templatecolumn_template_required', 'HeaderTemplate');
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_footerTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','FooterTemplate');
+			throw new TInvalidDataTypeException('templatecolumn_template_required', 'FooterTemplate');
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem || $itemType===TListItemType::EditItem)
 		{
@@ -213,7 +213,7 @@ 
 					$control->setItemType($itemType);
 				}
 				if($control instanceof \Prado\IDataRenderer)
-					$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+					$control->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 			}
 			else if($template!==null)
 				$template->instantiateIn($cell);
@@ -223,20 +223,20 @@ 
 		else if($itemType===TListItemType::Header)
 		{
 			if(($classPath=$this->getHeaderRenderer())!=='')
-				$this->initializeHeaderCell($cell,$columnIndex);
+				$this->initializeHeaderCell($cell, $columnIndex);
 			else if($this->_headerTemplate!==null)
 				$this->_headerTemplate->instantiateIn($cell);
 			else
-				$this->initializeHeaderCell($cell,$columnIndex);
+				$this->initializeHeaderCell($cell, $columnIndex);
 		}
 		else if($itemType===TListItemType::Footer)
 		{
 			if(($classPath=$this->getFooterRenderer())!=='')
-				$this->initializeFooterCell($cell,$columnIndex);
+				$this->initializeFooterCell($cell, $columnIndex);
 			else if($this->_footerTemplate!==null)
 				$this->_footerTemplate->instantiateIn($cell);
 			else
-				$this->initializeFooterCell($cell,$columnIndex);
+				$this->initializeFooterCell($cell, $columnIndex);
 		}
 	}
 
@@ -245,7 +245,7 @@ 
 	 * This method is invoked when datagrid performs databinding.
 	 * It populates the content of the cell with the relevant data from data source.
 	 */
-	public function dataBindColumn($sender,$param)
+	public function dataBindColumn($sender, $param)
 	{
 		$item=$sender->getNamingContainer();
 		$sender->setData($item->getData());

Braces +4 added lines, -8 removed lines

@@ -197,8 +197,7 @@ 
 					$classPath=$this->getItemRenderer();
 					$template=$this->_itemTemplate;
 				}
-			}
-			else
+			} else
 			{
 				$template=$this->_itemTemplate;
 				$classPath=$this->getItemRenderer();
@@ -214,13 +213,11 @@ 
 				}
 				if($control instanceof \Prado\IDataRenderer)
 					$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
-			}
-			else if($template!==null)
+			} else if($template!==null)
 				$template->instantiateIn($cell);
 			else if($itemType!==TListItemType::EditItem)
 				$cell->setText(' ');
-		}
-		else if($itemType===TListItemType::Header)
+		} else if($itemType===TListItemType::Header)
 		{
 			if(($classPath=$this->getHeaderRenderer())!=='')
 				$this->initializeHeaderCell($cell,$columnIndex);
@@ -228,8 +225,7 @@ 
 				$this->_headerTemplate->instantiateIn($cell);
 			else
 				$this->initializeHeaderCell($cell,$columnIndex);
-		}
-		else if($itemType===TListItemType::Footer)
+		} else if($itemType===TListItemType::Footer)
 		{
 			if(($classPath=$this->getFooterRenderer())!=='')
 				$this->initializeFooterCell($cell,$columnIndex);

framework/Web/UI/WebControls/TWizardNavigationButtonStyle.php

Doc Comments +1 added lines

@@ -113,6 +113,7 @@
 
 	/**
 	 * @param string button caption
+	 * @param string $value
 	 */
 	public function setButtonText($value)
 	{

Spacing +4 added lines, -4 removed lines

@@ -89,7 +89,7 @@ 
 	 */
 	public function getImageUrl()
 	{
-		return $this->_imageUrl===null?'':$this->_imageUrl;
+		return $this->_imageUrl===null ? '' : $this->_imageUrl;
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function getButtonText()
 	{
-		return $this->_buttonText===null?'':$this->_buttonText;
+		return $this->_buttonText===null ? '' : $this->_buttonText;
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->_buttonType===null? TWizardNavigationButtonType::Button :$this->_buttonType;
+		return $this->_buttonType===null ? TWizardNavigationButtonType::Button : $this->_buttonType;
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function setButtonType($value)
 	{
-		$this->_buttonType=TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TWizardNavigationButtonType');
+		$this->_buttonType=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TWizardNavigationButtonType');
 	}
 
 	/**

framework/Wsat/TWsatARGenerator.php

Doc Comments +4 added lines

@@ -207,6 +207,10 @@
                 return $code;
         }
 
+        /**
+         * @param string $classname
+         * @param string $toString
+         */
         protected function generateClass($properties, $tablename, $classname, $toString)
         {
                 $props = implode("\n", $properties);

Indentation +193 added lines, -193 removed lines

@@ -14,206 +14,206 @@ 
 class TWsatARGenerator extends TWsatBaseGenerator
 {
 
-        /**
-         * Class name prefix
-         */
-        private $_clasPrefix;
-
-        /**
-         * Class name sufix
-         */
-        private $_classSufix;
-
-        /**
-         * all table relations array
-         */
-        private $_relations;
-
-        /**
-         * unquote chars
-         * @var array
-         */
-        private $uqChars = array('[', ']', '"', '`', "'");
-
-        function __construct()
-        {
-                parent::__construct();
-        }
-
-        public function setClasPrefix($_clas_prefix)
-        {
-                $this->_clasPrefix = $_clas_prefix;
-        }
-
-        public function setClassSufix($_clas_sufix)
-        {
-                $this->_classSufix = $_clas_sufix;
-        }
+		/**
+		 * Class name prefix
+		 */
+		private $_clasPrefix;
+
+		/**
+		 * Class name sufix
+		 */
+		private $_classSufix;
+
+		/**
+		 * all table relations array
+		 */
+		private $_relations;
+
+		/**
+		 * unquote chars
+		 * @var array
+		 */
+		private $uqChars = array('[', ']', '"', '`', "'");
+
+		function __construct()
+		{
+				parent::__construct();
+		}
+
+		public function setClasPrefix($_clas_prefix)
+		{
+				$this->_clasPrefix = $_clas_prefix;
+		}
+
+		public function setClassSufix($_clas_sufix)
+		{
+				$this->_classSufix = $_clas_sufix;
+		}
 
 //-----------------------------------------------------------------------------
-        // <editor-fold defaultstate="collapsed" desc="Main APIs">
-        public function generate($tableName)
-        {
-                $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-                $this->_commonGenerate($tableName, $tableInfo);
-        }
-
-        public function generateAll()
-        {
-                foreach ($this->getAllTableNames() as $tableName)
-                {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-                        if (!empty($this->_relations))
-                        {
-                                // Cancel generation of M-M relationships middle table
-                                if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
-                                        continue;
-                        }
-                        $this->_commonGenerate($tableName, $tableInfo);
-                }
-        }
-
-        public function buildRelations()
-        {
-                $this->_relations = array();
-                foreach ($this->getAllTableNames() as $table_name)
-                {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-                        $pks = $tableInfo->getPrimaryKeys();
-                        $fks = $tableInfo->getForeignKeys();
-
-                        if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
-                        {
-                                $table_name_mm = $fks[0]["table"];
-                                $table_name_mm2 = $fks[1]["table"];
-
-                                $this->_relations[$table_name_mm][] = array(
-                                        "prop_name" => strtolower($table_name_mm2),
-                                        "rel_type" => "self::MANY_TO_MANY",
-                                        "ref_class_name" => $this->_getProperClassName($table_name_mm2),
-                                        "prop_ref" => $table_name
-                                );
-
-                                $this->_relations[$table_name_mm2][] = array(
-                                        "prop_name" => strtolower($table_name_mm),
-                                        "rel_type" => "self::MANY_TO_MANY",
-                                        "ref_class_name" => $this->_getProperClassName($table_name_mm),
-                                        "prop_ref" => $table_name
-                                );
-                                continue;
-                        }
-                        foreach ($fks as $fk_data)//1-M relationships
-                        {
-                                $owner_table = $fk_data["table"];
-                                $slave_table = $table_name;
-                                $fk_prop = key($fk_data["keys"]);
-
-                                $this->_relations[$owner_table][] = array(
-                                        "prop_name" => strtolower($slave_table),
-                                        "rel_type" => "self::HAS_MANY",
-                                        "ref_class_name" => $this->_getProperClassName($slave_table),
-                                        "prop_ref" => $fk_prop
-                                );
-
-                                $this->_relations[$slave_table][] = array(
-                                        "prop_name" => strtolower($owner_table),
-                                        "rel_type" => "self::BELONGS_TO",
-                                        "ref_class_name" => $this->_getProperClassName($owner_table),
-                                        "prop_ref" => $fk_prop
-                                );
-                        }
-                }
-        }
+		// <editor-fold defaultstate="collapsed" desc="Main APIs">
+		public function generate($tableName)
+		{
+				$tableInfo = $this->_dbMetaData->getTableInfo($tableName);
+				$this->_commonGenerate($tableName, $tableInfo);
+		}
+
+		public function generateAll()
+		{
+				foreach ($this->getAllTableNames() as $tableName)
+				{
+						$tableInfo = $this->_dbMetaData->getTableInfo($tableName);
+						if (!empty($this->_relations))
+						{
+								// Cancel generation of M-M relationships middle table
+								if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+										continue;
+						}
+						$this->_commonGenerate($tableName, $tableInfo);
+				}
+		}
+
+		public function buildRelations()
+		{
+				$this->_relations = array();
+				foreach ($this->getAllTableNames() as $table_name)
+				{
+						$tableInfo = $this->_dbMetaData->getTableInfo($table_name);
+						$pks = $tableInfo->getPrimaryKeys();
+						$fks = $tableInfo->getForeignKeys();
+
+						if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+						{
+								$table_name_mm = $fks[0]["table"];
+								$table_name_mm2 = $fks[1]["table"];
+
+								$this->_relations[$table_name_mm][] = array(
+										"prop_name" => strtolower($table_name_mm2),
+										"rel_type" => "self::MANY_TO_MANY",
+										"ref_class_name" => $this->_getProperClassName($table_name_mm2),
+										"prop_ref" => $table_name
+								);
+
+								$this->_relations[$table_name_mm2][] = array(
+										"prop_name" => strtolower($table_name_mm),
+										"rel_type" => "self::MANY_TO_MANY",
+										"ref_class_name" => $this->_getProperClassName($table_name_mm),
+										"prop_ref" => $table_name
+								);
+								continue;
+						}
+						foreach ($fks as $fk_data)//1-M relationships
+						{
+								$owner_table = $fk_data["table"];
+								$slave_table = $table_name;
+								$fk_prop = key($fk_data["keys"]);
+
+								$this->_relations[$owner_table][] = array(
+										"prop_name" => strtolower($slave_table),
+										"rel_type" => "self::HAS_MANY",
+										"ref_class_name" => $this->_getProperClassName($slave_table),
+										"prop_ref" => $fk_prop
+								);
+
+								$this->_relations[$slave_table][] = array(
+										"prop_name" => strtolower($owner_table),
+										"rel_type" => "self::BELONGS_TO",
+										"ref_class_name" => $this->_getProperClassName($owner_table),
+										"prop_ref" => $fk_prop
+								);
+						}
+				}
+		}
 
 // </editor-fold>
 //-----------------------------------------------------------------------------
-        // <editor-fold defaultstate="collapsed" desc="Common Methods">
-
-        private function _commonGenerate($tableName, $tableInfo)
-        {
-                if (count($tableInfo->getColumns()) === 0)
-                        throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
-                else
-                {
-                        $properties = array();
-                        foreach ($tableInfo->getColumns() as $field => $metadata)
-                                $properties[] = $this->generateProperty($field, $metadata);
-                        $toString = $this->_buildSmartToString($tableInfo);
-                }
-
-                $clasName = $this->_getProperClassName($tableName);
-                $class = $this->generateClass($properties, $tableName, $clasName, $toString);
-                $output = $this->_opFile . DIRECTORY_SEPARATOR . $clasName . ".php";
-                file_put_contents($output, $class);
-        }
-
-        private function _getProperClassName($tableName)
-        {
-                $table_name_words = str_replace("_", " ", strtolower($tableName));
-                $final_conversion = str_replace(" ", "", ucwords($table_name_words));
-                return $this->_clasPrefix . $final_conversion . $this->_classSufix;
-        }
+		// <editor-fold defaultstate="collapsed" desc="Common Methods">
+
+		private function _commonGenerate($tableName, $tableInfo)
+		{
+				if (count($tableInfo->getColumns()) === 0)
+						throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
+				else
+				{
+						$properties = array();
+						foreach ($tableInfo->getColumns() as $field => $metadata)
+								$properties[] = $this->generateProperty($field, $metadata);
+						$toString = $this->_buildSmartToString($tableInfo);
+				}
+
+				$clasName = $this->_getProperClassName($tableName);
+				$class = $this->generateClass($properties, $tableName, $clasName, $toString);
+				$output = $this->_opFile . DIRECTORY_SEPARATOR . $clasName . ".php";
+				file_put_contents($output, $class);
+		}
+
+		private function _getProperClassName($tableName)
+		{
+				$table_name_words = str_replace("_", " ", strtolower($tableName));
+				$final_conversion = str_replace(" ", "", ucwords($table_name_words));
+				return $this->_clasPrefix . $final_conversion . $this->_classSufix;
+		}
 
 //-----------------------------------------------------------------------------
 
-        protected function generateProperty($field, $metadata)
-        {
-                $prop = '';
-                $name = '$' . $field;
-
-                /* TODO use in version 2.0 */
-                // $type = $column->getPHPType();
-
-                $prop .= "\tpublic $name;";
-                return $prop;
-        }
-
-        private function _renderRelations($tablename)
-        {
-                if (!isset($this->_relations[$tablename]))
-                        return "";
-
-                $code = "\tpublic static \$RELATIONS = array (";
-                foreach ($this->_relations[$tablename] as $rel_data)
-                        $code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
-
-                $code = substr($code, 0, -1);
-                $code .= "\n\t);";
-                return $code;
-        }
-
-        private function _buildSmartToString($tableInfo)
-        {
-                $code = "\tpublic function __toString() {";
-                $property = "throw new THttpException(500, 'Not implemented yet.');";
-                try
-                {
-                        foreach ($tableInfo->getColumns() as $column)
-                        {
-                                if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
-                                elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
-                                {
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
-                                        break;
-                                }
-                        }
-                } catch (Exception $ex)
-                {
-                        Prado::trace($ex->getMessage());
-                }
-                $code .= "\n\t\treturn \$this->$property;";
-                $code .= "\n\t}";
-                return $code;
-        }
-
-        protected function generateClass($properties, $tablename, $classname, $toString)
-        {
-                $props = implode("\n", $properties);
-                $relations = $this->_renderRelations($tablename);
-                $date = date('Y-m-d h:i:s');
-                $env_user = getenv("username");
-                return <<<EOD
+		protected function generateProperty($field, $metadata)
+		{
+				$prop = '';
+				$name = '$' . $field;
+
+				/* TODO use in version 2.0 */
+				// $type = $column->getPHPType();
+
+				$prop .= "\tpublic $name;";
+				return $prop;
+		}
+
+		private function _renderRelations($tablename)
+		{
+				if (!isset($this->_relations[$tablename]))
+						return "";
+
+				$code = "\tpublic static \$RELATIONS = array (";
+				foreach ($this->_relations[$tablename] as $rel_data)
+						$code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+
+				$code = substr($code, 0, -1);
+				$code .= "\n\t);";
+				return $code;
+		}
+
+		private function _buildSmartToString($tableInfo)
+		{
+				$code = "\tpublic function __toString() {";
+				$property = "throw new THttpException(500, 'Not implemented yet.');";
+				try
+				{
+						foreach ($tableInfo->getColumns() as $column)
+						{
+								if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
+										$property = str_replace($this->uqChars, "", $column->ColumnName);
+								elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
+								{
+										$property = str_replace($this->uqChars, "", $column->ColumnName);
+										break;
+								}
+						}
+				} catch (Exception $ex)
+				{
+						Prado::trace($ex->getMessage());
+				}
+				$code .= "\n\t\treturn \$this->$property;";
+				$code .= "\n\t}";
+				return $code;
+		}
+
+		protected function generateClass($properties, $tablename, $classname, $toString)
+		{
+				$props = implode("\n", $properties);
+				$relations = $this->_renderRelations($tablename);
+				$date = date('Y-m-d h:i:s');
+				$env_user = getenv("username");
+				return <<<EOD
 <?php
 /**
  * Auto generated by PRADO - WSAT on $date.
@@ -234,7 +234,7 @@ 
 $toString
 }
 EOD;
-        }
+		}
 
 // </editor-fold>
 }
\ No newline at end of file

Spacing +59 added lines, -59 removed lines

@@ -33,7 +33,7 @@ 
          * unquote chars
          * @var array
          */
-        private $uqChars = array('[', ']', '"', '`', "'");
+        private $uqChars=array('[', ']', '"', '`', "'");
 
         function __construct()
         {
@@ -42,31 +42,31 @@ 
 
         public function setClasPrefix($_clas_prefix)
         {
-                $this->_clasPrefix = $_clas_prefix;
+                $this->_clasPrefix=$_clas_prefix;
         }
 
         public function setClassSufix($_clas_sufix)
         {
-                $this->_classSufix = $_clas_sufix;
+                $this->_classSufix=$_clas_sufix;
         }
 
 //-----------------------------------------------------------------------------
         // <editor-fold defaultstate="collapsed" desc="Main APIs">
         public function generate($tableName)
         {
-                $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
+                $tableInfo=$this->_dbMetaData->getTableInfo($tableName);
                 $this->_commonGenerate($tableName, $tableInfo);
         }
 
         public function generateAll()
         {
-                foreach ($this->getAllTableNames() as $tableName)
+                foreach($this->getAllTableNames() as $tableName)
                 {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-                        if (!empty($this->_relations))
+                        $tableInfo=$this->_dbMetaData->getTableInfo($tableName);
+                        if(!empty($this->_relations))
                         {
                                 // Cancel generation of M-M relationships middle table
-                                if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+                                if(count($tableInfo->getPrimaryKeys())===2 && count($tableInfo->getColumns())===2)//M-M relationships
                                         continue;
                         }
                         $this->_commonGenerate($tableName, $tableInfo);
@@ -75,26 +75,26 @@ 
 
         public function buildRelations()
         {
-                $this->_relations = array();
-                foreach ($this->getAllTableNames() as $table_name)
+                $this->_relations=array();
+                foreach($this->getAllTableNames() as $table_name)
                 {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-                        $pks = $tableInfo->getPrimaryKeys();
-                        $fks = $tableInfo->getForeignKeys();
+                        $tableInfo=$this->_dbMetaData->getTableInfo($table_name);
+                        $pks=$tableInfo->getPrimaryKeys();
+                        $fks=$tableInfo->getForeignKeys();
 
-                        if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+                        if(count($pks)===2 && count($tableInfo->getColumns())===2)//M-M relationships
                         {
-                                $table_name_mm = $fks[0]["table"];
-                                $table_name_mm2 = $fks[1]["table"];
+                                $table_name_mm=$fks[0]["table"];
+                                $table_name_mm2=$fks[1]["table"];
 
-                                $this->_relations[$table_name_mm][] = array(
+                                $this->_relations[$table_name_mm][]=array(
                                         "prop_name" => strtolower($table_name_mm2),
                                         "rel_type" => "self::MANY_TO_MANY",
                                         "ref_class_name" => $this->_getProperClassName($table_name_mm2),
                                         "prop_ref" => $table_name
                                 );
 
-                                $this->_relations[$table_name_mm2][] = array(
+                                $this->_relations[$table_name_mm2][]=array(
                                         "prop_name" => strtolower($table_name_mm),
                                         "rel_type" => "self::MANY_TO_MANY",
                                         "ref_class_name" => $this->_getProperClassName($table_name_mm),
@@ -102,20 +102,20 @@ 
                                 );
                                 continue;
                         }
-                        foreach ($fks as $fk_data)//1-M relationships
+                        foreach($fks as $fk_data)//1-M relationships
                         {
-                                $owner_table = $fk_data["table"];
-                                $slave_table = $table_name;
-                                $fk_prop = key($fk_data["keys"]);
+                                $owner_table=$fk_data["table"];
+                                $slave_table=$table_name;
+                                $fk_prop=key($fk_data["keys"]);
 
-                                $this->_relations[$owner_table][] = array(
+                                $this->_relations[$owner_table][]=array(
                                         "prop_name" => strtolower($slave_table),
                                         "rel_type" => "self::HAS_MANY",
                                         "ref_class_name" => $this->_getProperClassName($slave_table),
                                         "prop_ref" => $fk_prop
                                 );
 
-                                $this->_relations[$slave_table][] = array(
+                                $this->_relations[$slave_table][]=array(
                                         "prop_name" => strtolower($owner_table),
                                         "rel_type" => "self::BELONGS_TO",
                                         "ref_class_name" => $this->_getProperClassName($owner_table),
@@ -131,88 +131,88 @@ 
 
         private function _commonGenerate($tableName, $tableInfo)
         {
-                if (count($tableInfo->getColumns()) === 0)
-                        throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
+                if(count($tableInfo->getColumns())===0)
+                        throw new Exception("Unable to find table or view $tableName in ".$this->_dbMetaData->getDbConnection()->getConnectionString().".");
                 else
                 {
-                        $properties = array();
-                        foreach ($tableInfo->getColumns() as $field => $metadata)
-                                $properties[] = $this->generateProperty($field, $metadata);
-                        $toString = $this->_buildSmartToString($tableInfo);
+                        $properties=array();
+                        foreach($tableInfo->getColumns() as $field => $metadata)
+                                $properties[]=$this->generateProperty($field, $metadata);
+                        $toString=$this->_buildSmartToString($tableInfo);
                 }
 
-                $clasName = $this->_getProperClassName($tableName);
-                $class = $this->generateClass($properties, $tableName, $clasName, $toString);
-                $output = $this->_opFile . DIRECTORY_SEPARATOR . $clasName . ".php";
+                $clasName=$this->_getProperClassName($tableName);
+                $class=$this->generateClass($properties, $tableName, $clasName, $toString);
+                $output=$this->_opFile.DIRECTORY_SEPARATOR.$clasName.".php";
                 file_put_contents($output, $class);
         }
 
         private function _getProperClassName($tableName)
         {
-                $table_name_words = str_replace("_", " ", strtolower($tableName));
-                $final_conversion = str_replace(" ", "", ucwords($table_name_words));
-                return $this->_clasPrefix . $final_conversion . $this->_classSufix;
+                $table_name_words=str_replace("_", " ", strtolower($tableName));
+                $final_conversion=str_replace(" ", "", ucwords($table_name_words));
+                return $this->_clasPrefix.$final_conversion.$this->_classSufix;
         }
 
 //-----------------------------------------------------------------------------
 
         protected function generateProperty($field, $metadata)
         {
-                $prop = '';
-                $name = '$' . $field;
+                $prop='';
+                $name='$'.$field;
 
                 /* TODO use in version 2.0 */
                 // $type = $column->getPHPType();
 
-                $prop .= "\tpublic $name;";
+                $prop.="\tpublic $name;";
                 return $prop;
         }
 
         private function _renderRelations($tablename)
         {
-                if (!isset($this->_relations[$tablename]))
+                if(!isset($this->_relations[$tablename]))
                         return "";
 
-                $code = "\tpublic static \$RELATIONS = array (";
-                foreach ($this->_relations[$tablename] as $rel_data)
-                        $code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+                $code="\tpublic static \$RELATIONS = array (";
+                foreach($this->_relations[$tablename] as $rel_data)
+                        $code.="\n\t\t'".$rel_data["prop_name"]."' => array(".$rel_data["rel_type"].", '".$rel_data["ref_class_name"]."', '".$rel_data["prop_ref"]."'),";
 
-                $code = substr($code, 0, -1);
-                $code .= "\n\t);";
+                $code=substr($code, 0, -1);
+                $code.="\n\t);";
                 return $code;
         }
 
         private function _buildSmartToString($tableInfo)
         {
-                $code = "\tpublic function __toString() {";
-                $property = "throw new THttpException(500, 'Not implemented yet.');";
+                $code="\tpublic function __toString() {";
+                $property="throw new THttpException(500, 'Not implemented yet.');";
                 try
                 {
-                        foreach ($tableInfo->getColumns() as $column)
+                        foreach($tableInfo->getColumns() as $column)
                         {
-                                if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
-                                elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
+                                if(isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
+                                        $property=str_replace($this->uqChars, "", $column->ColumnName);
+                                elseif($column->PdoType==PDO::PARAM_STR && $column->DBType!="date")
                                 {
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
+                                        $property=str_replace($this->uqChars, "", $column->ColumnName);
                                         break;
                                 }
                         }
-                } catch (Exception $ex)
+                } catch(Exception $ex)
                 {
                         Prado::trace($ex->getMessage());
                 }
-                $code .= "\n\t\treturn \$this->$property;";
-                $code .= "\n\t}";
+                $code.="\n\t\treturn \$this->$property;";
+                $code.="\n\t}";
                 return $code;
         }
 
         protected function generateClass($properties, $tablename, $classname, $toString)
         {
-                $props = implode("\n", $properties);
-                $relations = $this->_renderRelations($tablename);
-                $date = date('Y-m-d h:i:s');
-                $env_user = getenv("username");
+                $props=implode("\n", $properties);
+                $relations=$this->_renderRelations($tablename);
+                $date=date('Y-m-d h:i:s');
+                $env_user=getenv("username");
                 return <<<EOD
 <?php
 /**

framework/Wsat/TWsatScaffoldingGenerator.php

Doc Comments +8 added lines

@@ -44,6 +44,10 @@ 
 
     //---------------------------------------------------------------------
     // <editor-fold defaultstate="collapsed" desc="Page Generation">
+
+    /**
+     * @param integer $viewType
+     */
     public function generate($tableName, $viewType)
     {
         switch ($viewType)
@@ -141,6 +145,10 @@ 
 // </editor-fold>
     //---------------------------------------------------------------------
     // <editor-fold defaultstate="collapsed" desc="Code Behind Generation">
+
+    /**
+     * @param string $classname
+     */
     private function generateClass($classname)
     {
         $date = date('Y-m-d h:i:s');

Indentation +124 added lines, -124 removed lines

@@ -14,138 +14,138 @@ 
 class TWsatScaffoldingGenerator extends TWsatBaseGenerator
 {
 
-    /**
-     * Const View Types for generation
-     */
-    const LIST_TYPE = 0;
-    const ADD_TYPE = 1;
-    const SHOW_TYPE = 2;
-
-    /**
-     * Bootstrap option
-     */
-    private $_bootstrap;
-
-    function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Generates CRUD Operations for a single DB table
-     * @param type $tableName
-     */
-    public function generateCRUD($tableName)
-    {
-        $this->generate($tableName, self::ADD_TYPE);
-        $this->generate($tableName, self::LIST_TYPE);
-        $this->generate($tableName, self::SHOW_TYPE);
-    }
-
-    //---------------------------------------------------------------------
-    // <editor-fold defaultstate="collapsed" desc="Page Generation">
-    public function generate($tableName, $viewType)
-    {
-        switch ($viewType)
-        {
-            default:
-            case self::LIST_TYPE:
-                $unitName = "list" . ucfirst($tableName);
-                break;
-
-            case self::ADD_TYPE:
-                $unitName = "add" . ucfirst($tableName);
-                break;
-
-            case self::SHOW_TYPE:
-                $unitName = "show" . ucfirst($tableName);
-                break;
-        }
-
-        $class = $this->generateClass($unitName);
-        $outputClass = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".php";
-        file_put_contents($outputClass, $class);
-
-        $outputPage = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".page";
-        $page = $this->generatePage($tableName, $viewType);
-        file_put_contents($outputPage, $page);
-    }
-
-    private function generatePage($tableName, $type, $tContentId = "Content")
-    {
-        $pageContent = $this->getPageContent($tableName, $type);
-        return <<<EOD
+	/**
+	 * Const View Types for generation
+	 */
+	const LIST_TYPE = 0;
+	const ADD_TYPE = 1;
+	const SHOW_TYPE = 2;
+
+	/**
+	 * Bootstrap option
+	 */
+	private $_bootstrap;
+
+	function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Generates CRUD Operations for a single DB table
+	 * @param type $tableName
+	 */
+	public function generateCRUD($tableName)
+	{
+		$this->generate($tableName, self::ADD_TYPE);
+		$this->generate($tableName, self::LIST_TYPE);
+		$this->generate($tableName, self::SHOW_TYPE);
+	}
+
+	//---------------------------------------------------------------------
+	// <editor-fold defaultstate="collapsed" desc="Page Generation">
+	public function generate($tableName, $viewType)
+	{
+		switch ($viewType)
+		{
+			default:
+			case self::LIST_TYPE:
+				$unitName = "list" . ucfirst($tableName);
+				break;
+
+			case self::ADD_TYPE:
+				$unitName = "add" . ucfirst($tableName);
+				break;
+
+			case self::SHOW_TYPE:
+				$unitName = "show" . ucfirst($tableName);
+				break;
+		}
+
+		$class = $this->generateClass($unitName);
+		$outputClass = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".php";
+		file_put_contents($outputClass, $class);
+
+		$outputPage = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".page";
+		$page = $this->generatePage($tableName, $viewType);
+		file_put_contents($outputPage, $page);
+	}
+
+	private function generatePage($tableName, $type, $tContentId = "Content")
+	{
+		$pageContent = $this->getPageContent($tableName, $type);
+		return <<<EOD
 <com:TContent ID="$tContentId">   
                      
        $pageContent
                
 </com:TContent>
 EOD;
-    }
-
-    private function getPageContent($tableName, $type)
-    {
-        $code = "";
-        $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-        switch ($type)
-        {
-            case self::LIST_TYPE:
-                break;
-            case self::ADD_TYPE:
-                foreach ($tableInfo->getColumns() as $colField => $colMetadata)
-                {
-                    if (!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
-                    {
-                        $code .= $this->generateControl($colMetadata);
-                        $code .= $this->generateValidators($colMetadata);
-                        $code .= "\n";
-                    }
-                }
-                foreach ($tableInfo->getForeignKeys() as $colField => $colMetadata)
-                {
-                    $colField = $this->eq($colMetadata["table"]);
-                    $code .= "\t<com:TTextBox ID=$colField />\n";
-                    $code .= "\n";
-                    //  TWsatBaseGenerator::pr($tableInfo);
-                }
-                $code .= "\t<com:TButton Text=\"Accept\" />\n";
-
-            case self::SHOW_TYPE:
-                break;
-        }
-        return $code;
-    }
-
-    private function generateControl($colMetadata)
-    {
-        $controlType = "TTextBox";
-        switch ($colMetadata->DbType)
-        {
+	}
+
+	private function getPageContent($tableName, $type)
+	{
+		$code = "";
+		$tableInfo = $this->_dbMetaData->getTableInfo($tableName);
+		switch ($type)
+		{
+			case self::LIST_TYPE:
+				break;
+			case self::ADD_TYPE:
+				foreach ($tableInfo->getColumns() as $colField => $colMetadata)
+				{
+					if (!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
+					{
+						$code .= $this->generateControl($colMetadata);
+						$code .= $this->generateValidators($colMetadata);
+						$code .= "\n";
+					}
+				}
+				foreach ($tableInfo->getForeignKeys() as $colField => $colMetadata)
+				{
+					$colField = $this->eq($colMetadata["table"]);
+					$code .= "\t<com:TTextBox ID=$colField />\n";
+					$code .= "\n";
+					//  TWsatBaseGenerator::pr($tableInfo);
+				}
+				$code .= "\t<com:TButton Text=\"Accept\" />\n";
+
+			case self::SHOW_TYPE:
+				break;
+		}
+		return $code;
+	}
+
+	private function generateControl($colMetadata)
+	{
+		$controlType = "TTextBox";
+		switch ($colMetadata->DbType)
+		{
             
-        }
-        $controlId = $colMetadata->ColumnId;
-        return "\t<com:$controlType ID=\"$controlId\" />\n";
-    }
-
-    private function generateValidators($colMetadata)
-    {
-        $controlId = $colMetadata->ColumnId;
-        $code = "";
-        if (!$colMetadata->AllowNull)
-        {
-            $code .= "\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
-        }
-        return $code;
-    }
+		}
+		$controlId = $colMetadata->ColumnId;
+		return "\t<com:$controlType ID=\"$controlId\" />\n";
+	}
+
+	private function generateValidators($colMetadata)
+	{
+		$controlId = $colMetadata->ColumnId;
+		$code = "";
+		if (!$colMetadata->AllowNull)
+		{
+			$code .= "\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
+		}
+		return $code;
+	}
 
 // </editor-fold>
-    //---------------------------------------------------------------------
-    // <editor-fold defaultstate="collapsed" desc="Code Behind Generation">
-    private function generateClass($classname)
-    {
-        $date = date('Y-m-d h:i:s');
-        $env_user = getenv("username");
-        return <<<EOD
+	//---------------------------------------------------------------------
+	// <editor-fold defaultstate="collapsed" desc="Code Behind Generation">
+	private function generateClass($classname)
+	{
+		$date = date('Y-m-d h:i:s');
+		$env_user = getenv("username");
+		return <<<EOD
 <?php
 /**
  * Auto generated by PRADO - WSAT on $date.
@@ -156,7 +156,7 @@ 
 
 }
 EOD;
-    }
+	}
 
 // </editor-fold>
 }

Spacing +35 added lines, -35 removed lines

@@ -17,9 +17,9 @@ 
     /**
      * Const View Types for generation
      */
-    const LIST_TYPE = 0;
-    const ADD_TYPE = 1;
-    const SHOW_TYPE = 2;
+    const LIST_TYPE=0;
+    const ADD_TYPE=1;
+    const SHOW_TYPE=2;
 
     /**
      * Bootstrap option
@@ -46,34 +46,34 @@ 
     // <editor-fold defaultstate="collapsed" desc="Page Generation">
     public function generate($tableName, $viewType)
     {
-        switch ($viewType)
+        switch($viewType)
         {
             default:
             case self::LIST_TYPE:
-                $unitName = "list" . ucfirst($tableName);
+                $unitName="list".ucfirst($tableName);
                 break;
 
             case self::ADD_TYPE:
-                $unitName = "add" . ucfirst($tableName);
+                $unitName="add".ucfirst($tableName);
                 break;
 
             case self::SHOW_TYPE:
-                $unitName = "show" . ucfirst($tableName);
+                $unitName="show".ucfirst($tableName);
                 break;
         }
 
-        $class = $this->generateClass($unitName);
-        $outputClass = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".php";
+        $class=$this->generateClass($unitName);
+        $outputClass=$this->_opFile.DIRECTORY_SEPARATOR.$unitName.".php";
         file_put_contents($outputClass, $class);
 
-        $outputPage = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".page";
-        $page = $this->generatePage($tableName, $viewType);
+        $outputPage=$this->_opFile.DIRECTORY_SEPARATOR.$unitName.".page";
+        $page=$this->generatePage($tableName, $viewType);
         file_put_contents($outputPage, $page);
     }
 
-    private function generatePage($tableName, $type, $tContentId = "Content")
+    private function generatePage($tableName, $type, $tContentId="Content")
     {
-        $pageContent = $this->getPageContent($tableName, $type);
+        $pageContent=$this->getPageContent($tableName, $type);
         return <<<EOD
 <com:TContent ID="$tContentId">   
                      
@@ -85,30 +85,30 @@ 
 
     private function getPageContent($tableName, $type)
     {
-        $code = "";
-        $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-        switch ($type)
+        $code="";
+        $tableInfo=$this->_dbMetaData->getTableInfo($tableName);
+        switch($type)
         {
             case self::LIST_TYPE:
                 break;
             case self::ADD_TYPE:
-                foreach ($tableInfo->getColumns() as $colField => $colMetadata)
+                foreach($tableInfo->getColumns() as $colField => $colMetadata)
                 {
-                    if (!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
+                    if(!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
                     {
-                        $code .= $this->generateControl($colMetadata);
-                        $code .= $this->generateValidators($colMetadata);
-                        $code .= "\n";
+                        $code.=$this->generateControl($colMetadata);
+                        $code.=$this->generateValidators($colMetadata);
+                        $code.="\n";
                     }
                 }
-                foreach ($tableInfo->getForeignKeys() as $colField => $colMetadata)
+                foreach($tableInfo->getForeignKeys() as $colField => $colMetadata)
                 {
-                    $colField = $this->eq($colMetadata["table"]);
-                    $code .= "\t<com:TTextBox ID=$colField />\n";
-                    $code .= "\n";
+                    $colField=$this->eq($colMetadata["table"]);
+                    $code.="\t<com:TTextBox ID=$colField />\n";
+                    $code.="\n";
                     //  TWsatBaseGenerator::pr($tableInfo);
                 }
-                $code .= "\t<com:TButton Text=\"Accept\" />\n";
+                $code.="\t<com:TButton Text=\"Accept\" />\n";
 
             case self::SHOW_TYPE:
                 break;
@@ -118,22 +118,22 @@ 
 
     private function generateControl($colMetadata)
     {
-        $controlType = "TTextBox";
-        switch ($colMetadata->DbType)
+        $controlType="TTextBox";
+        switch($colMetadata->DbType)
         {
             
         }
-        $controlId = $colMetadata->ColumnId;
+        $controlId=$colMetadata->ColumnId;
         return "\t<com:$controlType ID=\"$controlId\" />\n";
     }
 
     private function generateValidators($colMetadata)
     {
-        $controlId = $colMetadata->ColumnId;
-        $code = "";
-        if (!$colMetadata->AllowNull)
+        $controlId=$colMetadata->ColumnId;
+        $code="";
+        if(!$colMetadata->AllowNull)
         {
-            $code .= "\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
+            $code.="\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
         }
         return $code;
     }
@@ -143,8 +143,8 @@ 
     // <editor-fold defaultstate="collapsed" desc="Code Behind Generation">
     private function generateClass($classname)
     {
-        $date = date('Y-m-d h:i:s');
-        $env_user = getenv("username");
+        $date=date('Y-m-d h:i:s');
+        $env_user=getenv("username");
         return <<<EOD
 <?php
 /**

framework/Security/TAuthManager.php

Indentation +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
 
 		// check for authentication expiration
 		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() &&
-        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
+		($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
 
 		// try authenticating through cookie if possible
 		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))

Spacing +24 added lines, -24 removed lines

@@ -94,14 +94,14 @@ 
 		if(is_string($this->_userManager))
 		{
 			if(($users=$application->getModule($this->_userManager))===null)
-				throw new TConfigurationException('authmanager_usermanager_inexistent',$this->_userManager);
+				throw new TConfigurationException('authmanager_usermanager_inexistent', $this->_userManager);
 			if(!($users instanceof IUserManager))
-				throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
+				throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
 			$this->_userManager=$users;
 		}
-		$application->attachEventHandler('OnAuthentication',array($this,'doAuthentication'));
-		$application->attachEventHandler('OnEndRequest',array($this,'leave'));
-		$application->attachEventHandler('OnAuthorization',array($this,'doAuthorization'));
+		$application->attachEventHandler('OnAuthentication', array($this, 'doAuthentication'));
+		$application->attachEventHandler('OnEndRequest', array($this, 'leave'));
+		$application->attachEventHandler('OnAuthorization', array($this, 'doAuthorization'));
 		$this->_initialized=true;
 	}
 
@@ -122,7 +122,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
 		if(!is_string($provider) && !($provider instanceof IUserManager))
-			throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
+			throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
 		$this->_userManager=$provider;
 	}
 
@@ -152,7 +152,7 @@ 
 	 * @param mixed sender of the Authentication event
 	 * @param mixed event parameter
 	 */
-	public function doAuthentication($sender,$param)
+	public function doAuthentication($sender, $param)
 	{
 		$this->onAuthenticate($param);
 
@@ -168,7 +168,7 @@ 
 	 * @param mixed sender of the Authorization event
 	 * @param mixed event parameter
 	 */
-	public function doAuthorization($sender,$param)
+	public function doAuthorization($sender, $param)
 	{
 		if(!$this->_skipAuthorization)
 		{
@@ -183,7 +183,7 @@ 
 	 * @param mixed sender of the event
 	 * @param mixed event parameter
 	 */
-	public function leave($sender,$param)
+	public function leave($sender, $param)
 	{
 		$application=$this->getApplication();
 		if($application->getResponse()->getStatusCode()===401)
@@ -229,7 +229,7 @@ 
 	 */
 	public function setReturnUrl($value)
 	{
-		$this->getSession()->add($this->getReturnUrlVarName(),$value);
+		$this->getSession()->add($this->getReturnUrlVarName(), $value);
 	}
 
 	/**
@@ -288,8 +288,8 @@ 
 		$user=$this->_userManager->getUser(null)->loadFromString($sessionInfo);
 
 		// check for authentication expiration
-		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() &&
-        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
+		$isAuthExpired=$this->_authExpire > 0 && !$user->getIsGuest() &&
+        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime < time();
 
 		// try authenticating through cookie if possible
 		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))
@@ -302,7 +302,7 @@ 
 					$user=$user2;
 					$this->updateSessionUser($user);
 					// user is restored from cookie, auth may not expire
-					$isAuthExpired = false;
+					$isAuthExpired=false;
 				}
 			}
 		}
@@ -317,7 +317,7 @@ 
 
 		// event handler gets a chance to do further auth work
 		if($this->hasEventHandler('OnAuthenticate'))
-			$this->raiseEvent('OnAuthenticate',$this,$application);
+			$this->raiseEvent('OnAuthenticate', $this, $application);
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	{
 		$this->logout();
 		if($this->hasEventHandler('OnAuthExpire'))
-			$this->raiseEvent('OnAuthExpire',$this,$param);
+			$this->raiseEvent('OnAuthExpire', $this, $param);
 	}
 
 	/**
@@ -343,8 +343,8 @@ 
 	{
 		$application=$this->getApplication();
 		if($this->hasEventHandler('OnAuthorize'))
-			$this->raiseEvent('OnAuthorize',$this,$application);
-		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(),$application->getRequest()->getRequestType(),$application->getRequest()->getUserHostAddress()))
+			$this->raiseEvent('OnAuthorize', $this, $application);
+		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(), $application->getRequest()->getRequestType(), $application->getRequest()->getUserHostAddress()))
 		{
 			$application->getResponse()->setStatusCode(401);
 			$application->completeRequest();
@@ -383,7 +383,7 @@ 
 			if(($session=$this->getSession())===null)
 				throw new TConfigurationException('authmanager_session_required');
 			else
-				$session->add($this->getUserKey(),$user->saveToString());
+				$session->add($this->getUserKey(), $user->saveToString());
 		}
 	}
 
@@ -411,19 +411,19 @@ 
 	 * @param integer number of seconds that automatic login will remain effective. If 0, it means user logs out when session ends. This parameter is added since 3.1.1.
 	 * @return boolean if login is successful
 	 */
-	public function login($username,$password,$expire=0)
+	public function login($username, $password, $expire=0)
 	{
-		if($this->_userManager->validateUser($username,$password))
+		if($this->_userManager->validateUser($username, $password))
 		{
 			if(($user=$this->_userManager->getUser($username))===null)
 				return false;
 			$this->updateSessionUser($user);
 			$this->getApplication()->setUser($user);
 
-			if($expire>0)
+			if($expire > 0)
 			{
-				$cookie=new THttpCookie($this->getUserKey(),'');
-				$cookie->setExpire(time()+$expire);
+				$cookie=new THttpCookie($this->getUserKey(), '');
+				$cookie->setExpire(time() + $expire);
 				$this->_userManager->saveUserToCookie($cookie);
 				$this->getResponse()->getCookies()->add($cookie);
 			}
@@ -446,7 +446,7 @@ 
 		$session->destroy();
 		if($this->getAllowAutoLogin())
 		{
-			$cookie=new THttpCookie($this->getUserKey(),'');
+			$cookie=new THttpCookie($this->getUserKey(), '');
 			$this->getResponse()->getCookies()->add($cookie);
 		}
 	}

Doc Comments +2 added lines

@@ -228,6 +228,7 @@ 
 	/**
 	 * Sets the URL that the browser should be redirected to when login succeeds.
 	 * @param string the URL to be redirected to.
+	 * @param string $value
 	 */
 	public function setReturnUrl($value)
 	{
@@ -376,6 +377,7 @@ 
 	/**
 	 * Updates the user data stored in session.
 	 * @param IUser user object
+	 * @param TUser $user
 	 * @throws new TConfigurationException if session module is not loaded.
 	 */
 	public function updateSessionUser($user)

Braces +1 added lines, -2 removed lines

@@ -430,8 +430,7 @@
 				$this->getResponse()->getCookies()->add($cookie);
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/I18N/core/DateFormat.php

Indentation +20 added lines, -20 removed lines

@@ -79,7 +79,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -308,8 +308,8 @@ 
 
 	/**
 	 * Get the year.
- 	 * "yy" will return the last two digits of year.
- 	 * "yyyy" will return the full integer year.
+	 * "yy" will return the last two digits of year.
+	 * "yyyy" will return the full integer year.
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string year
@@ -330,10 +330,10 @@ 
 
 	/**
 	 * Get the month.
- 	 * "M" will return integer 1 through 12
- 	 * "MM" will return the narrow month name, e.g. "J"
- 	 * "MMM" will return the abrreviated month name, e.g. "Jan"
- 	 * "MMMM" will return the month name, e.g. "January"
+	 * "M" will return integer 1 through 12
+	 * "MM" will return the narrow month name, e.g. "J"
+	 * "MMM" will return the abrreviated month name, e.g. "Jan"
+	 * "MMMM" will return the month name, e.g. "January"
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string month name
@@ -361,10 +361,10 @@ 
 
 	/**
 	 * Get the day of the week.
- 	 * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
- 	 * "EE" will return the narrow day of the week, e.g. "M"
- 	 * "EEE" will return the abrreviated day of the week, e.g. "Mon"
- 	 * "EEEE" will return the day of the week, e.g. "Monday"
+	 * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
+	 * "EE" will return the narrow day of the week, e.g. "M"
+	 * "EEE" will return the abrreviated day of the week, e.g. "Mon"
+	 * "EEEE" will return the day of the week, e.g. "Monday"
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string day of the week.
@@ -394,7 +394,7 @@ 
 
 	/**
 	 * Get the day of the month.
- 	 * "d" for non-padding, "dd" will always return 2 characters.
+	 * "d" for non-padding, "dd" will always return 2 characters.
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string day of the month
@@ -581,14 +581,14 @@ 
 	protected function getDayInMonth($date, $pattern='FF')
 	{
 		switch ($pattern) {
-		    case 'F':
-		      return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-		      break;
-		    case 'FF':
-		      return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-		      break;
-		    default:
-		      throw new Exception('The pattern for day in month is "F" or "FF".');
+			case 'F':
+			  return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+			  break;
+			case 'FF':
+			  return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+			  break;
+			default:
+			  throw new Exception('The pattern for day in month is "F" or "FF".');
 		}
 	}
 

Doc Comments +4 added lines

@@ -87,6 +87,7 @@ 
 	 * Initialize a new DateFormat.
 	 * @param mixed either, null, a CultureInfo instance,
 	 * a DateTimeFormatInfo instance, or a locale.
+	 * @param string $formatInfo
 	 * @return DateFormat instance
 	 */
 	function __construct($formatInfo=null)
@@ -106,6 +107,7 @@ 
 	/**
 	 * Format a date according to the pattern.
 	 * @param mixed the time as integer or string in strtotime format.
+	 * @param string $time
 	 * @return string formatted date time.
 	 */
 	public function format($time, $pattern='F', $charset='UTF-8')
@@ -179,6 +181,7 @@ 
 	 * DateTimeFormatInfo::formatDateTime
 	 * See the tutorial documentation for futher details on the patterns.
 	 * @param mixed a pattern.
+	 * @param string $pattern
 	 * @return string a pattern.
 	 * @see DateTimeFormatInfo::formatDateTime()
 	 */
@@ -269,6 +272,7 @@ 
 	 * Any substrings, starting and ending with a single quote (')
 	 * will be treated as a single token.
 	 * @param string pattern.
+	 * @param string $pattern
 	 * @return array string tokens in an array.
 	 */
 	protected function getTokens($pattern)

Braces +4 added lines, -8 removed lines

@@ -134,12 +134,10 @@ 
 			{
 				$sub = preg_replace('/(^\')|(\'$)/','',$pattern);
 				$tokens[$i] =  str_replace('``````','\'',$sub);
-			}
-			else if($pattern == '``````')
+			} else if($pattern == '``````')
 			{
 				$tokens[$i] = '\'';
-			}
-			else
+			} else
 			{
 				$function = $this->getFunctionName($pattern);
 				if($function != null)
@@ -149,8 +147,7 @@ 
 					{
 						$rs = $this->$fName($date, $pattern);
 						$tokens[$i] = $rs;
-					}
-					else
+					} else
 						throw new
 						Exception('function '.$function.' not found.');
 				}
@@ -285,8 +282,7 @@ 
 			if($char==null || $pattern{$i} == $char || $text)
 			{
 				$token .= $pattern{$i};
-			}
-			else
+			} else
 			{
 				$tokens[] = str_replace("","'",$token);
 				$token = $pattern{$i};

Spacing +82 added lines, -82 removed lines

@@ -51,7 +51,7 @@ 
 	 * A list of tokens and their function call.
 	 * @var array
 	 */
-	protected $tokens = array(
+	protected $tokens=array(
 			'G'=>'Era',
 			'y'=>'Year',
 			'M'=>'Month',
@@ -75,7 +75,7 @@ 
 	 * A list of methods, to be used by the token function calls.
 	 * @var array
 	 */
-	protected $methods = array();
+	protected $methods=array();
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
@@ -91,16 +91,16 @@ 
 	 */
 	function __construct($formatInfo=null)
 	{
-		if($formatInfo === null)
-			$this->formatInfo = DateTimeFormatInfo::getInvariantInfo();
+		if($formatInfo===null)
+			$this->formatInfo=DateTimeFormatInfo::getInvariantInfo();
 		else if($formatInfo instanceof CultureInfo)
-			$this->formatInfo = $formatInfo->DateTimeFormat;
+			$this->formatInfo=$formatInfo->DateTimeFormat;
 		else if($formatInfo instanceof DateTimeFormatInfo)
-			$this->formatInfo = $formatInfo;
+			$this->formatInfo=$formatInfo;
 		else
-			$this->formatInfo = DateTimeFormatInfo::getInstance($formatInfo);
+			$this->formatInfo=DateTimeFormatInfo::getInstance($formatInfo);
 
-		$this->methods = get_class_methods($this);
+		$this->methods=get_class_methods($this);
 	}
 
 	/**
@@ -110,45 +110,45 @@ 
 	 */
 	public function format($time, $pattern='F', $charset='UTF-8')
 	{
-		if (is_numeric($time)) //assumes unix epoch
-			$time = floatval($time);
+		if(is_numeric($time)) //assumes unix epoch
+			$time=floatval($time);
 		else if(is_string($time))
-			$time = @strtotime($time);
+			$time=@strtotime($time);
 
-		if($pattern === null)
-			$pattern = 'F';
+		if($pattern===null)
+			$pattern='F';
 
-		$s = Prado::createComponent('System.Util.TDateTimeStamp');
+		$s=Prado::createComponent('System.Util.TDateTimeStamp');
 
-		$date = $s->getDate($time);
+		$date=$s->getDate($time);
 
-		$pattern = $this->getPattern($pattern);
+		$pattern=$this->getPattern($pattern);
 
-		$tokens = $this->getTokens($pattern);
+		$tokens=$this->getTokens($pattern);
 
-		for($i = 0, $k = count($tokens); $i<$k; ++$i)
+		for($i=0, $k=count($tokens); $i < $k; ++$i)
 		{
-			$pattern = $tokens[$i];
-			if($pattern{0} == "'"
-				&& $pattern{strlen($pattern)-1} == "'")
+			$pattern=$tokens[$i];
+			if($pattern{0}=="'"
+				&& $pattern{strlen($pattern) - 1}=="'")
 			{
-				$sub = preg_replace('/(^\')|(\'$)/','',$pattern);
-				$tokens[$i] =  str_replace('``````','\'',$sub);
+				$sub=preg_replace('/(^\')|(\'$)/', '', $pattern);
+				$tokens[$i]=str_replace('``````', '\'', $sub);
 			}
-			else if($pattern == '``````')
+			else if($pattern=='``````')
 			{
-				$tokens[$i] = '\'';
+				$tokens[$i]='\'';
 			}
 			else
 			{
-				$function = $this->getFunctionName($pattern);
-				if($function != null)
+				$function=$this->getFunctionName($pattern);
+				if($function!=null)
 				{
-					$fName = 'get'.$function;
+					$fName='get'.$function;
 					if(in_array($fName, $this->methods))
 					{
-						$rs = $this->$fName($date, $pattern);
-						$tokens[$i] = $rs;
+						$rs=$this->$fName($date, $pattern);
+						$tokens[$i]=$rs;
 					}
 					else
 						throw new
@@ -157,7 +157,7 @@ 
 			}			
 		}
 
-		return I18N_toEncoding(implode('',$tokens), $charset);
+		return I18N_toEncoding(implode('', $tokens), $charset);
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	protected function getPattern($pattern)
 	{
-		if(is_array($pattern) && count($pattern) == 2)
+		if(is_array($pattern) && count($pattern)==2)
 		{
 			return $this->formatInfo->formatDateTime(
 							$this->getPattern($pattern[0]),
@@ -273,36 +273,36 @@ 
 	 */
 	protected function getTokens($pattern)
 	{
-		$char = null;
-		$tokens = array();
-		$token = null;
+		$char=null;
+		$tokens=array();
+		$token=null;
 
-		$text = false;
-		$pattern = preg_replace("/''/", '``````', $pattern);
+		$text=false;
+		$pattern=preg_replace("/''/", '``````', $pattern);
 
-		for($i = 0; $i < strlen($pattern); $i++)
+		for($i=0; $i < strlen($pattern); $i++)
 		{
-			if($char==null || $pattern{$i} == $char || $text)
+			if($char==null || $pattern{$i}==$char || $text)
 			{
-				$token .= $pattern{$i};
+				$token.=$pattern{$i};
 			}
 			else
 			{
-				$tokens[] = str_replace("","'",$token);
-				$token = $pattern{$i};
+				$tokens[]=str_replace("", "'", $token);
+				$token=$pattern{$i};
 			}
 
-			if($pattern{$i} == "'" && $text == false)
-				$text = true;
-			else if($text && $pattern{$i} == "'" && $char == "'")
-				$text = true;
-			else if($text && $char != "'" && $pattern{$i} == "'")
-				$text = false;
+			if($pattern{$i}=="'" && $text==false)
+				$text=true;
+			else if($text && $pattern{$i}=="'" && $char=="'")
+				$text=true;
+			else if($text && $char!="'" && $pattern{$i}=="'")
+				$text=false;
 
-			$char = $pattern{$i};
+			$char=$pattern{$i};
 
 		}
-		$tokens[] = $token;
+		$tokens[]=$token;
 		return $tokens;
 	}
 
@@ -316,11 +316,11 @@ 
 	 */
 	protected function getYear($date, $pattern='yyyy')
 	{
-		$year = $date['year'];
+		$year=$date['year'];
 		switch($pattern)
 		{
 			case 'yy':
-				return substr($year,2);
+				return substr($year, 2);
 			case 'yyyy':
 				return $year;
 			default:
@@ -340,19 +340,19 @@ 
 	 */
 	protected function getMonth($date, $pattern='M')
 	{
-		$month = $date['mon'];
+		$month=$date['mon'];
 
 		switch($pattern)
 		{
 			case 'M':
 				return $month;
 			case 'MM':
-				return str_pad($month, 2,'0',STR_PAD_LEFT);
+				return str_pad($month, 2, '0', STR_PAD_LEFT);
 			case 'MMM':
-				return $this->formatInfo->AbbreviatedMonthNames[$month-1];
+				return $this->formatInfo->AbbreviatedMonthNames[$month - 1];
 				break;
 			case 'MMMM':
-				return $this->formatInfo->MonthNames[$month-1];
+				return $this->formatInfo->MonthNames[$month - 1];
 			default:
 				throw new Exception('The pattern for month '.
 						'is "M", "MM", "MMM", or "MMMM".');
@@ -371,7 +371,7 @@ 
 	 */
 	protected function getDayInWeek($date, $pattern='EEEE')
 	{
-		$day = $date['wday'];
+		$day=$date['wday'];
 
 		switch($pattern)
 		{
@@ -401,14 +401,14 @@ 
 	 */
 	protected function getDay($date, $pattern='d')
 	{
-		$day = $date['mday'];
+		$day=$date['mday'];
 
 		switch($pattern)
 		{
 			case 'd':
 				return $day;
 			case 'dd':
-				return str_pad($day, 2,'0',STR_PAD_LEFT);
+				return str_pad($day, 2, '0', STR_PAD_LEFT);
 			default:
 				throw new Exception('The pattern for day of '.
 						'the month is "d" or "dd".');
@@ -426,10 +426,10 @@ 
 	protected function getEra($date, $pattern='G')
 	{
 
-		if($pattern != 'G')
+		if($pattern!='G')
 			throw new Exception('The pattern for era is "G".');
 
-		$year = $date['year'];
+		$year=$date['year'];
 		if($year > 0)
 			return $this->formatInfo->getEra(1);
 		else
@@ -445,14 +445,14 @@ 
 	 */
 	protected function getHour24($date, $pattern='H')
 	{
-		$hour = $date['hours'];
+		$hour=$date['hours'];
 
 		switch($pattern)
 		{
 			case 'H':
 				return $hour;
 			case 'HH':
-				return str_pad($hour, 2,'0',STR_PAD_LEFT);
+				return str_pad($hour, 2, '0', STR_PAD_LEFT);
 			default:
 				throw new Exception('The pattern for 24 hour '.
 						'format is "H" or "HH".');
@@ -467,11 +467,11 @@ 
 	 */
 	protected function getAMPM($date, $pattern='a')
 	{
-		if($pattern != 'a')
+		if($pattern!='a')
 			throw new Exception('The pattern for AM/PM marker is "a".');
 
-		$hour = $date['hours'];
-		$ampm = (int)($hour/12);
+		$hour=$date['hours'];
+		$ampm=(int) ($hour / 12);
 		return $this->formatInfo->AMPMMarkers[$ampm];
 	}
 
@@ -484,15 +484,15 @@ 
 	 */
 	protected function getHour12($date, $pattern='h')
 	{
-		$hour = $date['hours'];
-		$hour = ($hour==12|$hour==0)?12:($hour)%12;
+		$hour=$date['hours'];
+		$hour=($hour==12 | $hour==0) ? 12 : ($hour) % 12;
 
 		switch($pattern)
 		{
 			case 'h':
 				return $hour;
 			case 'hh':
-				return str_pad($hour, 2,'0',STR_PAD_LEFT);
+				return str_pad($hour, 2, '0', STR_PAD_LEFT);
 			default:
 				throw new Exception('The pattern for 24 hour '.
 						'format is "H" or "HH".');
@@ -508,14 +508,14 @@ 
 	 */
 	protected function getMinutes($date, $pattern='m')
 	{
-		$minutes = $date['minutes'];
+		$minutes=$date['minutes'];
 
 		switch($pattern)
 		{
 			case 'm':
 				return $minutes;
 			case 'mm':
-				return str_pad($minutes, 2,'0',STR_PAD_LEFT);
+				return str_pad($minutes, 2, '0', STR_PAD_LEFT);
 			default:
 			throw new Exception('The pattern for minutes is "m" or "mm".');
 		}
@@ -530,14 +530,14 @@ 
 	 */
 	protected function getSeconds($date, $pattern='s')
 	{
-		$seconds = $date['seconds'];
+		$seconds=$date['seconds'];
 
 		switch($pattern)
 		{
 			case 's':
 				return $seconds;
 			case 'ss':
-				return str_pad($seconds, 2,'0',STR_PAD_LEFT);
+				return str_pad($seconds, 2, '0', STR_PAD_LEFT);
 			default:
 			throw new Exception('The pattern for seconds is "s" or "ss".');
 		}
@@ -552,7 +552,7 @@ 
 	 */
 	protected function getTimeZone($date, $pattern='z')
 	{
-		if($pattern != 'z')
+		if($pattern!='z')
 			throw new Exception('The pattern for time zone is "z".');
 
 		return @date('T', @mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year']));
@@ -566,7 +566,7 @@ 
 	 */
 	protected function getDayInYear($date, $pattern='D')
 	{
-		if($pattern != 'D')
+		if($pattern!='D')
 			throw new Exception('The pattern for day in year is "D".');
 
 		return $date['yday'];
@@ -580,7 +580,7 @@ 
 	 */
 	protected function getDayInMonth($date, $pattern='FF')
 	{
-		switch ($pattern) {
+		switch($pattern) {
 		    case 'F':
 		      return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
 		      break;
@@ -600,7 +600,7 @@ 
 	 */
 	protected function getWeekInYear($date, $pattern='w')
 	{
-		if($pattern != 'w')
+		if($pattern!='w')
 			throw new Exception('The pattern for week in year is "w".');
 
 		return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
@@ -613,7 +613,7 @@ 
 	 */
 	protected function getWeekInMonth($date, $pattern='W')
 	{
-		if($pattern != 'W')
+		if($pattern!='W')
 			throw new Exception('The pattern for week in month is "W".');
 
 		return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year'])) - date('W', mktime(0, 0, 0, $date['mon'], 1, $date['year']));
@@ -627,10 +627,10 @@ 
 	 */
 	protected function getHourInDay($date, $pattern='k')
 	{
-		if($pattern != 'k')
+		if($pattern!='k')
 			throw new Exception('The pattern for hour in day is "k".');
 
-		return $date['hours']+1;
+		return $date['hours'] + 1;
 	}
 
 	/**
@@ -641,10 +641,10 @@ 
 	 */
 	protected function getHourInAMPM($date, $pattern='K')
 	{
-		if($pattern != 'K')
+		if($pattern!='K')
 			throw new Exception('The pattern for hour in AM/PM is "K".');
 
-		return ($date['hours']+1)%12;
+		return ($date['hours'] + 1) % 12;
 	}
 
 }

framework/I18N/core/NumberFormat.php

Indentation +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -116,7 +116,7 @@ 
 	function format($number, $pattern='d', $currency='USD', $charset='UTF-8')
 	{
 		$oldLocale=setLocale(LC_NUMERIC, '0');
-	    setlocale(LC_NUMERIC, 'C');
+		setlocale(LC_NUMERIC, 'C');
 
 		$this->setPattern($pattern);
 

Doc Comments +4 added lines, -1 removed lines

@@ -86,6 +86,7 @@ 
 	 * a CultureInfo or NumberFormatInfo instance will instantiated a instance
 	 * for that particular culture.
 	 * @param mixed either null, a CultureInfo, a NumberFormatInfo, or string
+	 * @param string $formatInfo
 	 * @return NumberFormat
 	 */
 	function __construct($formatInfo=null)
@@ -111,6 +112,7 @@ 
 	 * 3 decimal places.
 	 * @param string 3-letter ISO 4217 code. For example, the code
 	 * "USD" represents the US Dollar and "EUR" represents the Euro currency.
+	 * @param string $number
 	 * @return string formatted number string
 	 */
 	function format($number, $pattern='d', $currency='USD', $charset='UTF-8')
@@ -232,7 +234,7 @@ 
 
 	/**
 	 * Format the decimal places.
-	 * @param string the decimal number in string form.
+	 * @param string string decimal number in string form.
 	 * @return string formatted decimal places.
 	 */
 	protected function formatDecimal($string)
@@ -280,6 +282,7 @@ 
 	 * Set the pattern to format against. The default patterns
 	 * are retrieved from the NumberFormatInfo instance.
 	 * @param string the requested patterns.
+	 * @param string $pattern
 	 * @return string a number format pattern.
 	 */
 	protected function setPattern($pattern)

Braces +7 added lines, -14 removed lines

@@ -203,16 +203,14 @@ 
 						$integer = $groupSeparator . $integer;
 						$count++;
 					}
-				}
-				else if($multiGroup && $count >= 1)
+				} else if($multiGroup && $count >= 1)
 				{
 					if($i != 0 && ($i-$groupSize[0])%$groupSize[1] == 0)
 					{
 						$integer = $groupSeparator . $integer;
 						$count++;
 					}
-				}
-				else
+				} else
 				{
 					if($i != 0 && $i%$groupSize[0] == 0)
 					{
@@ -223,8 +221,7 @@ 
 
 				$integer = $char . $integer;
 			}
-		}
-		else
+		} else
 			$integer = $string;
 
 		return $integer;
@@ -250,27 +247,23 @@ 
 			if($decimalDigits == -1)
 			{
 				$decimal = substr($string, $dp+1);
-			}
-			else if(is_int($decimalDigits))
+			} else if(is_int($decimalDigits))
 			{
 				$float = round((float)$string, $decimalDigits);
 				if(strpos((string)$float, '.') === false)
 				{
 					$decimal = str_pad($decimal,$decimalDigits,'0');
-				}
-				else
+				} else
 				{
 					$decimal = substr($float, strpos($float,'.')+1);
 					if(strlen($decimal)<$decimalDigits)
 						$decimal = str_pad($decimal,$decimalDigits,'0');
 				}
-			}
-			else
+			} else
 				return $decimal;
 
 			return $decimalSeparator.$decimal;
-		}
-		else if ($decimalDigits > 0)
+		} else if ($decimalDigits > 0)
 			return $decimalSeparator.str_pad($decimal,$decimalDigits,'0');
 
 		return $decimal;

Spacing +60 added lines, -60 removed lines

@@ -90,14 +90,14 @@ 
 	 */
 	function __construct($formatInfo=null)
 	{
-		if($formatInfo === null)
-			$this->formatInfo = NumberFormatInfo::getInvariantInfo();
+		if($formatInfo===null)
+			$this->formatInfo=NumberFormatInfo::getInvariantInfo();
 		else if($formatInfo instanceof CultureInfo)
-			$this->formatInfo = $formatInfo->NumberFormat;
+			$this->formatInfo=$formatInfo->NumberFormat;
 		else if($formatInfo instanceof NumberFormatInfo)
-			$this->formatInfo = $formatInfo;
+			$this->formatInfo=$formatInfo;
 		else
-			$this->formatInfo =
+			$this->formatInfo=
 				NumberFormatInfo::getInstance($formatInfo);
 	}
 
@@ -120,37 +120,37 @@ 
 
 		$this->setPattern($pattern);
 
-		if(strtolower($pattern) == 'p')
-			$number = $number * 100;
+		if(strtolower($pattern)=='p')
+			$number=$number * 100;
 
-		$string = (string)$number;
+		$string=(string) $number;
 
-		$decimal = $this->formatDecimal($string);
-		$integer = $this->formatInteger(abs($number));
+		$decimal=$this->formatDecimal($string);
+		$integer=$this->formatInteger(abs($number));
 
-		if(strlen($decimal)>0)
-			$result = $integer.$decimal;
+		if(strlen($decimal) > 0)
+			$result=$integer.$decimal;
 		else
-			$result = $integer;
+			$result=$integer;
 
 		//get the suffix
 		if($number >= 0)
-			$suffix = $this->formatInfo->PositivePattern;
+			$suffix=$this->formatInfo->PositivePattern;
 		else if($number < 0)
-			$suffix = $this->formatInfo->NegativePattern;
+			$suffix=$this->formatInfo->NegativePattern;
 		else
-			$suffix = array("","");
+			$suffix=array("", "");
 
 		//append and prepend suffix
-		$result = $suffix[0].$result.$suffix[1];
+		$result=$suffix[0].$result.$suffix[1];
 
 		//replace currency sign
-		$symbol = @$this->formatInfo->getCurrencySymbol($currency);
-		if($symbol === null) {
-			$symbol = $currency;
+		$symbol=@$this->formatInfo->getCurrencySymbol($currency);
+		if($symbol===null) {
+			$symbol=$currency;
 		}
 
-		$result = str_replace('¤',$symbol, $result);
+		$result=str_replace('¤', $symbol, $result);
 
 		setlocale(LC_NUMERIC, $oldLocale);
 
@@ -164,68 +164,68 @@ 
 	 */
 	protected function formatInteger($string)
 	{
-		$string = (string)$string;
+		$string=(string) $string;
 
-		$decimalDigits = $this->formatInfo->DecimalDigits;
+		$decimalDigits=$this->formatInfo->DecimalDigits;
 		//if not decimal digits, assume 0 decimal points.
 		if(is_int($decimalDigits) && $decimalDigits > 0)
-			$string = (string)round(floatval($string),$decimalDigits);
-		$dp = strpos($string, '.');
+			$string=(string) round(floatval($string), $decimalDigits);
+		$dp=strpos($string, '.');
 		if(is_int($dp))
-			$string = substr($string, 0, $dp);
-		$integer = '';
+			$string=substr($string, 0, $dp);
+		$integer='';
 
-		$digitSize = $this->formatInfo->getDigitSize();
+		$digitSize=$this->formatInfo->getDigitSize();
 
-		$string = str_pad($string, $digitSize, '0',STR_PAD_LEFT);
+		$string=str_pad($string, $digitSize, '0', STR_PAD_LEFT);
 
-		$len = strlen($string);
+		$len=strlen($string);
 
-		$groupSeparator = $this->formatInfo->GroupSeparator;
-		$groupSize = $this->formatInfo->GroupSizes;
+		$groupSeparator=$this->formatInfo->GroupSeparator;
+		$groupSize=$this->formatInfo->GroupSizes;
 
 
-		$firstGroup = true;
-		$multiGroup = is_int($groupSize[1]);
-		$count = 0;
+		$firstGroup=true;
+		$multiGroup=is_int($groupSize[1]);
+		$count=0;
 
 		if(is_int($groupSize[0]))
 		{
 			//now for the integer groupings
-			for($i=0; $i<$len; $i++)
+			for($i=0; $i < $len; $i++)
 			{
-				$char = $string{$len-$i-1};
+				$char=$string{$len - $i - 1};
 
-				if($multiGroup && $count == 0)
+				if($multiGroup && $count==0)
 				{
-					if($i != 0 && $i%$groupSize[0] == 0)
+					if($i!=0 && $i % $groupSize[0]==0)
 					{
-						$integer = $groupSeparator . $integer;
+						$integer=$groupSeparator.$integer;
 						$count++;
 					}
 				}
 				else if($multiGroup && $count >= 1)
 				{
-					if($i != 0 && ($i-$groupSize[0])%$groupSize[1] == 0)
+					if($i!=0 && ($i - $groupSize[0]) % $groupSize[1]==0)
 					{
-						$integer = $groupSeparator . $integer;
+						$integer=$groupSeparator.$integer;
 						$count++;
 					}
 				}
 				else
 				{
-					if($i != 0 && $i%$groupSize[0] == 0)
+					if($i!=0 && $i % $groupSize[0]==0)
 					{
-						$integer = $groupSeparator . $integer;
+						$integer=$groupSeparator.$integer;
 						$count++;
 					}
 				}
 
-				$integer = $char . $integer;
+				$integer=$char.$integer;
 			}
 		}
 		else
-			$integer = $string;
+			$integer=$string;
 
 		return $integer;
 	}
@@ -237,32 +237,32 @@ 
 	 */
 	protected function formatDecimal($string)
 	{
-		$dp = strpos($string, '.');
-		$decimal = '';
+		$dp=strpos($string, '.');
+		$decimal='';
 
-		$decimalDigits = $this->formatInfo->DecimalDigits;
-		$decimalSeparator = $this->formatInfo->DecimalSeparator;
+		$decimalDigits=$this->formatInfo->DecimalDigits;
+		$decimalSeparator=$this->formatInfo->DecimalSeparator;
 
 		//do the correct rounding here
 		//$string = round(floatval($string), $decimalDigits);
 		if(is_int($dp))
 		{
-			if($decimalDigits == -1)
+			if($decimalDigits==-1)
 			{
-				$decimal = substr($string, $dp+1);
+				$decimal=substr($string, $dp + 1);
 			}
 			else if(is_int($decimalDigits))
 			{
-				$float = round((float)$string, $decimalDigits);
-				if(strpos((string)$float, '.') === false)
+				$float=round((float) $string, $decimalDigits);
+				if(strpos((string) $float, '.')===false)
 				{
-					$decimal = str_pad($decimal,$decimalDigits,'0');
+					$decimal=str_pad($decimal, $decimalDigits, '0');
 				}
 				else
 				{
-					$decimal = substr($float, strpos($float,'.')+1);
-					if(strlen($decimal)<$decimalDigits)
-						$decimal = str_pad($decimal,$decimalDigits,'0');
+					$decimal=substr($float, strpos($float, '.') + 1);
+					if(strlen($decimal) < $decimalDigits)
+						$decimal=str_pad($decimal, $decimalDigits, '0');
 				}
 			}
 			else
@@ -270,8 +270,8 @@ 
 
 			return $decimalSeparator.$decimal;
 		}
-		else if ($decimalDigits > 0)
-			return $decimalSeparator.str_pad($decimal,$decimalDigits,'0');
+		else if($decimalDigits > 0)
+			return $decimalSeparator.str_pad($decimal, $decimalDigits, '0');
 
 		return $decimal;
 	}

framework/I18N/core/CultureInfo.php

Indentation +3 added lines, -3 removed lines

@@ -199,9 +199,9 @@
 	}
 
 	/**
-	* Gets the CultureInfo that for this culture string
-	* @return CultureInfo invariant culture info is "en".
-	*/
+	 * Gets the CultureInfo that for this culture string
+	 * @return CultureInfo invariant culture info is "en".
+	 */
 	public static function getInstance($culture)
 	{
 		static $instances = array();

Doc Comments +7 added lines, -1 removed lines

@@ -183,6 +183,7 @@ 
 
 	/**
 	* Gets the CultureInfo that for this culture string
+	* @param string $culture
 	* @return CultureInfo invariant culture info is "en".
 	*/
 	public static function getInstance($culture)
@@ -208,6 +209,7 @@ 
 	 * Set the culture for the current instance. The culture indentifier
 	 * must be of the form "<language>_(country/region)".
 	 * @param string culture identifier, e.g. "fr_FR".
+	 * @param string $culture
 	 */
 	protected function setCulture($culture)
 	{
@@ -223,6 +225,7 @@ 
 	/**
 	 * Load the ICU culture data resource bundles for the specific culture identifier.
 	 * @param string the culture identifier.
+	 * @param string $cultureName
 	 */
 	protected function loadCultureData($cultureName)
 	{
@@ -266,6 +269,7 @@ 
 	 * currency for "en_AU", you need to use findInfo("Currencies,true);.
 	 * @param string the data you want to find.
 	 * @param boolean merge the data from its parents.
+	 * @param string $key
 	 * @return mixed the specific ICU data.
 	 */
 	public function findInfo($path='/', $merge=false, $key = null)
@@ -358,6 +362,7 @@ 
 	/**
 	 * Set the date time format information.
 	 * @param DateTimeFormatInfo the new date time format info.
+	 * @param DateTimeFormatInfo $dateTimeFormat
 	 */
 	public function setDateTimeFormat($dateTimeFormat)
 	{
@@ -457,6 +462,7 @@ 
 	/**
 	 * Set the number format information.
 	 * @param NumberFormatInfo the new number format info.
+	 * @param NumberFormatInfo $numberFormat
 	 */
 	public function setNumberFormat($numberFormat)
 	{
@@ -595,7 +601,7 @@ 
 
 	/**
 	 * Get a list of timezones in the language of the localized version.
-	 * @return array list of localized timezones.
+	 * @return string[] list of localized timezones.
 	 */
 	public function getTimeZones()
 	{

Spacing +76 added lines, -76 removed lines

@@ -56,7 +56,7 @@ 
 	 * The ICU data array.
 	 * @var array
 	 */
-	private $data = array();
+	private $data=array();
 
 	/**
 	 * The current culture.
@@ -68,13 +68,13 @@ 
 	 * A list of CLDR resource bundles loaded
 	 * @var array
 	 */
-	private $resourceBundles = array();
+	private $resourceBundles=array();
 
 	/**
 	 * A list of resource bundles keys
 	 * @var array
 	 */
-	protected static $bundleNames = array(
+	protected static $bundleNames=array(
 		'Core' => null,
 		'Currencies' => 'ICUDATA-curr',
 		'Languages' => 'ICUDATA-lang',
@@ -98,28 +98,28 @@ 
 	 * A list of properties that are accessable/writable.
 	 * @var array
 	 */
-	protected $properties = array();
+	protected $properties=array();
 
 	/**
 	 * Culture type, all.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const ALL = 0;
+	const ALL=0;
 
 	/**
 	 * Culture type, neutral.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const NEUTRAL = 1;
+	const NEUTRAL=1;
 
 	/**
 	 * Culture type, specific.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const SPECIFIC = 2;
+	const SPECIFIC=2;
 
 	/**
 	 * Display the culture name.
@@ -139,7 +139,7 @@ 
 	 */
 	function __get($name)
 	{
-		$getProperty = 'get'.$name;
+		$getProperty='get'.$name;
 		if(in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
@@ -152,7 +152,7 @@ 
 	 */
 	function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
+		$setProperty='set'.$name;
 		if(in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
@@ -170,10 +170,10 @@ 
 	 */
 	function __construct($culture='en')
 	{
-		$this->properties = get_class_methods($this);
+		$this->properties=get_class_methods($this);
 
 		if(empty($culture))
-			$culture = 'en';
+			$culture='en';
 
 		$this->setCulture($culture);
 
@@ -187,9 +187,9 @@ 
 	*/
 	public static function getInstance($culture)
 	{
-		static $instances = array();
+		static $instances=array();
 		if(!isset($instances[$culture]))
-			$instances[$culture] = new CultureInfo($culture);
+			$instances[$culture]=new CultureInfo($culture);
 		return $instances[$culture];
 	}
 
@@ -213,11 +213,11 @@ 
 	{
 		if(!empty($culture))
 		{
-			if (!preg_match('/^[_\\w]+$/', $culture))
-				throw new Exception('Invalid culture supplied: ' . $culture);
+			if(!preg_match('/^[_\\w]+$/', $culture))
+				throw new Exception('Invalid culture supplied: '.$culture);
 		}
 
-		$this->culture = $culture;
+		$this->culture=$culture;
 	}
 
 	/**
@@ -226,20 +226,20 @@ 
 	 */
 	protected function loadCultureData($cultureName)
 	{
-		$culture_parts = explode('_', $cultureName);
-		$current_part = $culture_parts[0];
+		$culture_parts=explode('_', $cultureName);
+		$current_part=$culture_parts[0];
 
-		$culturesToLoad = array($current_part);
-		for($i = 1, $k = count($culture_parts); $i < $k; ++$i)
+		$culturesToLoad=array($current_part);
+		for($i=1, $k=count($culture_parts); $i < $k; ++$i)
 		{
-			$current_part .= '_'.$culture_parts[$i];
-			$culturesToLoad[] = $current_part;
+			$current_part.='_'.$culture_parts[$i];
+			$culturesToLoad[]=$current_part;
 		}
 
 		foreach(self::$bundleNames as $key => $bundleName)
 		{
 			if(!array_key_exists($key, $this->data))
-				$this->data[$key] = array();
+				$this->data[$key]=array();
 		}
 		foreach($culturesToLoad as $culture)
 		{
@@ -249,7 +249,7 @@ 
 			array_unshift($this->resourceBundles, $culture);
 			foreach(self::$bundleNames as $key => $bundleName)
 			{
-				$this->data[$key][$culture] = \ResourceBundle::create($culture, $bundleName, false);
+				$this->data[$key][$culture]=\ResourceBundle::create($culture, $bundleName, false);
 			}
 		}
 	}
@@ -268,19 +268,19 @@ 
 	 * @param boolean merge the data from its parents.
 	 * @return mixed the specific ICU data.
 	 */
-	public function findInfo($path='/', $merge=false, $key = null)
+	public function findInfo($path='/', $merge=false, $key=null)
 	{
-		$result = array();
+		$result=array();
 
-		if($key === null)
+		if($key===null)
 		{
 			// try to guess the bundle from the path. Always defaults to "Core".
-			$key = 'Core';
+			$key='Core';
 			foreach(self::$bundleNames as $bundleName => $icuBundleName)
 			{
-				if(strpos($path, $bundleName) === 0)
+				if(strpos($path, $bundleName)===0)
 				{
-					$key = $bundleName;
+					$key=$bundleName;
 					break;
 				}
 			}
@@ -290,14 +290,14 @@ 
 			return $result;
 		foreach($this->resourceBundles as $culture)
 		{
-			$res = $this->data[$key][$culture];
-			if($res === null)
+			$res=$this->data[$key][$culture];
+			if($res===null)
 				continue;
-			$info = $this->searchResources($res, $path);
+			$info=$this->searchResources($res, $path);
 			if($info)
 			{
 				if($merge)
-					$result = array_merge($result, $info);
+					$result=array_merge($result, $info);
 				else
 					return $info;
 			}
@@ -316,14 +316,14 @@ 
 	 */
 	private function searchResources($info, $path='/')
 	{
-		$index = explode('/',$path);
+		$index=explode('/', $path);
 
-		$resource = $info;
-		for($i = 0, $k = count($index); $i < $k; ++$i)
+		$resource=$info;
+		for($i=0, $k=count($index); $i < $k; ++$i)
 		{
 
-			$resource = $resource->get($index[$i], false);
-			if($resource === null)
+			$resource=$resource->get($index[$i], false);
+			if($resource===null)
 				return null;
 		}
 
@@ -347,7 +347,7 @@ 
 	 */
 	public function getDateTimeFormat()
 	{
-		if($this->dateTimeFormat === null)
+		if($this->dateTimeFormat===null)
 		{
 			$this->setDateTimeFormat(new DateTimeFormatInfo($this));
 		}
@@ -361,7 +361,7 @@ 
 	 */
 	public function setDateTimeFormat($dateTimeFormat)
 	{
-		$this->dateTimeFormat = $dateTimeFormat;
+		$this->dateTimeFormat=$dateTimeFormat;
 	}
 
 	/**
@@ -381,10 +381,10 @@ 
 	 */
 	public function getNativeName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
-		$language = $this->findInfo("Languages/{$lang}");
-		$region = $this->findInfo("Countries/{$reg}");
+		$lang=substr($this->culture, 0, 2);
+		$reg=substr($this->culture, 3, 2);
+		$language=$this->findInfo("Languages/{$lang}");
+		$region=$this->findInfo("Countries/{$reg}");
 		if($region)
 			return $language.' ('.$region.')';
 		else
@@ -399,15 +399,15 @@ 
 	 */
 	public function getEnglishName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
-		$culture = $this->getInvariantCulture();
+		$lang=substr($this->culture, 0, 2);
+		$reg=substr($this->culture, 3, 2);
+		$culture=$this->getInvariantCulture();
 
-		$language = $culture->findInfo("Languages/{$lang}");
-		if(count($language) == 0)
+		$language=$culture->findInfo("Languages/{$lang}");
+		if(count($language)==0)
 			return $this->culture;
 
-		$region = $culture->findInfo("Countries/{$reg}");
+		$region=$culture->findInfo("Countries/{$reg}");
 		if($region)
 			return $language.' ('.$region.')';
 		else
@@ -424,8 +424,8 @@ 
 	static public function getInvariantCulture()
 	{
 		static $invariant;
-		if($invariant === null)
-			$invariant = new CultureInfo();
+		if($invariant===null)
+			$invariant=new CultureInfo();
 		return $invariant;
 	}
 
@@ -437,7 +437,7 @@ 
 	 */
 	public function getIsNeutralCulture()
 	{
-		return strlen($this->culture) == 2;
+		return strlen($this->culture)==2;
 	}
 
 	/**
@@ -447,7 +447,7 @@ 
 	 */
 	public function getNumberFormat()
 	{
-		if($this->numberFormat === null)
+		if($this->numberFormat===null)
 		{
 			$this->setNumberFormat(new NumberFormatInfo($this));
 		}
@@ -460,7 +460,7 @@ 
 	 */
 	public function setNumberFormat($numberFormat)
 	{
-		$this->numberFormat = $numberFormat;
+		$this->numberFormat=$numberFormat;
 	}
 
 	/**
@@ -479,10 +479,10 @@ 
 	 */
 	public function getParent()
 	{
-		if(strlen($this->culture) == 2)
+		if(strlen($this->culture)==2)
 			return $this->getInvariantCulture();
 
-		$lang = substr($this->culture,0,2);
+		$lang=substr($this->culture, 0, 2);
 			return new CultureInfo($lang);
 	}
 
@@ -497,7 +497,7 @@ 
 	 */
 	static public function getCultures($type=CultureInfo::ALL)
 	{
-		$all = \ResourceBundle::getLocales('');
+		$all=\ResourceBundle::getLocales('');
 
 		switch($type)
 		{
@@ -506,14 +506,14 @@ 
 			case CultureInfo::NEUTRAL :
 				foreach($all as $key => $culture)
 				{
-					if(strlen($culture) != 2)
+					if(strlen($culture)!=2)
 						unset($all[$key]);
 				}
 				return $all;
 			case CultureInfo::SPECIFIC :
 				foreach($all as $key => $culture)
 				{
-					if(strlen($culture) == 2)
+					if(strlen($culture)==2)
 						unset($all[$key]);
 				}
 				return $all;
@@ -532,19 +532,19 @@ 
 		if(is_scalar($obj)) {
 			return $obj;
 		} elseif($obj instanceof \ResourceBundle) {
-			$array = array();
+			$array=array();
 			foreach($obj as $k => $v)
-				$array[$k] = $v;
+				$array[$k]=$v;
 		} else {
-			$array = $obj;
+			$array=$obj;
 		}
 
-		for($i = 0, $k = count($array); $i<$k; ++$i)
+		for($i=0, $k=count($array); $i < $k; ++$i)
 		{
-			$key = key($array);
+			$key=key($array);
 			if(is_array($array[$key])
-				&& count($array[$key]) == 1)
-				$array[$key] = $array[$key][0];
+				&& count($array[$key])==1)
+				$array[$key]=$array[$key][0];
 			next($array);
 		}
 		return $array;
@@ -566,11 +566,11 @@ 
 	public function getCurrencies()
 	{
 		static $arr;
-		if($arr === null)
+		if($arr===null)
 		{
-			$arr = $this->findInfo('Currencies', true, 'Currencies');
+			$arr=$this->findInfo('Currencies', true, 'Currencies');
 			foreach($arr as $k => $v)
-				$arr[$k] = $this->simplify($v);
+				$arr[$k]=$this->simplify($v);
 		}
 		return $arr;
 	}
@@ -600,17 +600,17 @@ 
 	public function getTimeZones()
 	{
 		static $arr;
-		if($arr === null)
+		if($arr===null)
 		{
-			$validPrefixes = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Etc', 'Europe', 'Indian', 'Pacific');
-			$tmp = $this->findInfo('zoneStrings', true, 'zoneStrings');
+			$validPrefixes=array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Etc', 'Europe', 'Indian', 'Pacific');
+			$tmp=$this->findInfo('zoneStrings', true, 'zoneStrings');
 			foreach($tmp as $k => $v)
 			{
 				foreach($validPrefixes as $prefix)
 				{
-					if(strpos($k, $prefix) === 0)
+					if(strpos($k, $prefix)===0)
 					{
-						$arr[] = str_replace(':', '/', $k);
+						$arr[]=str_replace(':', '/', $k);
 						break;
 					}
 				}