pradosoft / prado

framework/Web/UI/WebControls/TXmlTransform.php

Doc Comments +3 added lines

@@ -60,6 +60,7 @@ 
 
   /**
    * @param string The path to the XML style sheet.  It must be in namespace format.
+   * @param string $value
    */
   public function setTransformPath($value) {
     if(!is_file($value)) {
@@ -94,6 +95,7 @@ 
 
   /**
    * @param string Namespace or path to XML document
+   * @param string $value
    * @throws TInvalidDataValueException
    */
   public function setDocumentPath($value) {
@@ -165,6 +167,7 @@ 
   /**
    * Performs XSL transformation and render the output.
    * @param THtmlWriter The writer used for the rendering purpose
+   * @param THtmlWriter $writer
    */
   public function render($writer) {
     if(($document=$this->getSourceXmlDocument()) === null) {

Indentation +69 added lines, -69 removed lines

@@ -46,50 +46,50 @@ 
    * @throws TConfigurationException If XSL extension is not available
    */
   public function __construct() {
-    if(!class_exists('XSLTProcessor', false)) {
-      throw new TConfigurationException('xmltransform_xslextension_required');
-    }
+	if(!class_exists('XSLTProcessor', false)) {
+	  throw new TConfigurationException('xmltransform_xslextension_required');
+	}
   }
 
   /**
    * @return string The path to the XML style sheet.
    */
   public function getTransformPath() {
-    return $this->getViewState('TransformPath', '');
+	return $this->getViewState('TransformPath', '');
   }
 
   /**
    * @param string The path to the XML style sheet.  It must be in namespace format.
    */
   public function setTransformPath($value) {
-    if(!is_file($value)) {
-      $value = Prado::getPathOfNamespace($value, self::EXT_XSL_FILE);
-      if($value === null) {
+	if(!is_file($value)) {
+	  $value = Prado::getPathOfNamespace($value, self::EXT_XSL_FILE);
+	  if($value === null) {
 	throw new TInvalidDataValueException('xmltransform_transformpath_invalid', $value);
-      }
-    }
-    $this->setViewState('TransformPath', $value, '');
+	  }
+	}
+	$this->setViewState('TransformPath', $value, '');
   }
 
   /**
    * @return string XML style sheet as string
    */
   public function getTransformContent() {
-    return $this->getViewState('TransformContent', '');
+	return $this->getViewState('TransformContent', '');
   }
 
   /**
    * @param string $value XML style sheet as string
    */
   public function setTransformContent($value) {
-    $this->setViewState('TransformContent', $value, '');
+	$this->setViewState('TransformContent', $value, '');
   }
 
   /**
    * @return string The path to the XML document. It must be in namespace format.
    */
   public function getDocumentPath() {
-    return $this->getViewState('DocumentPath', '');
+	return $this->getViewState('DocumentPath', '');
   }
 
   /**
@@ -97,27 +97,27 @@ 
    * @throws TInvalidDataValueException
    */
   public function setDocumentPath($value) {
-    if(!is_file($value)) {
-      $value = Prado::getPathOfNamespace($value, self::EXT_XML_FILE);
-      if($value === null) {
+	if(!is_file($value)) {
+	  $value = Prado::getPathOfNamespace($value, self::EXT_XML_FILE);
+	  if($value === null) {
 	throw new TInvalidDataValueException('xmltransform_documentpath_invalid', $value);
-      }
-    }
-    $this->setViewState('DocumentPath', $value, '');
+	  }
+	}
+	$this->setViewState('DocumentPath', $value, '');
   }
 
   /**
    * @return string XML data
    */
   public function getDocumentContent() {
-    return $this->getViewState('DocumentContent', '');
+	return $this->getViewState('DocumentContent', '');
   }
 
   /**
    * @param string $value XML data. If not empty, it takes precedence over {@link setDocumentPath DocumentPath}.
    */
   public function setDocumentContent($value) {
-    $this->setViewState('DocumentContent', $value, '');
+	$this->setViewState('DocumentContent', $value, '');
   }
 
   /**
@@ -125,41 +125,41 @@ 
    * @return TAttributeCollection the list of custom parameters
    */
   public function getParameters() {
-    if($params = $this->getViewState('Parameters',null)) {
-      return $params;
-    } else {
-      $params = new TAttributeCollection();
-      $this->setViewState('Parameters', $params, null);
-      return $params;
-    }
+	if($params = $this->getViewState('Parameters',null)) {
+	  return $params;
+	} else {
+	  $params = new TAttributeCollection();
+	  $this->setViewState('Parameters', $params, null);
+	  return $params;
+	}
   }
 
   private function getTransformXmlDocument() {
-    if(($content = $this->getTransformContent()) !== '') {
-      $document = new DOMDocument();
-      $document->loadXML($content);
-      return $document;
-    } else if(($path = $this->getTransformPath()) !== '') {
-      $document = new DOMDocument();
-      $document->load($path);
-      return $document;
-    } else {
-      throw new TConfigurationException('xmltransform_transform_required');
-    }
+	if(($content = $this->getTransformContent()) !== '') {
+	  $document = new DOMDocument();
+	  $document->loadXML($content);
+	  return $document;
+	} else if(($path = $this->getTransformPath()) !== '') {
+	  $document = new DOMDocument();
+	  $document->load($path);
+	  return $document;
+	} else {
+	  throw new TConfigurationException('xmltransform_transform_required');
+	}
   }
 
   private function getSourceXmlDocument() {
-    if(($content = $this->getDocumentContent()) !== '') {
-      $document = new DOMDocument();
-      $document->loadXML($content);
-      return $document;
-    } else if(($path = $this->getDocumentPath()) !== '') {
-      $document = new DOMDocument();
-      $document->load($path);
-      return $document;
-    } else {
-      return null;
-    }
+	if(($content = $this->getDocumentContent()) !== '') {
+	  $document = new DOMDocument();
+	  $document->loadXML($content);
+	  return $document;
+	} else if(($path = $this->getDocumentPath()) !== '') {
+	  $document = new DOMDocument();
+	  $document->load($path);
+	  return $document;
+	} else {
+	  return null;
+	}
   }
 
   /**
@@ -167,27 +167,27 @@ 
    * @param THtmlWriter The writer used for the rendering purpose
    */
   public function render($writer) {
-    if(($document=$this->getSourceXmlDocument()) === null) {
+	if(($document=$this->getSourceXmlDocument()) === null) {
 	  $htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 	  parent::render($htmlWriter);
-      $document = new DOMDocument();
-      $document->loadXML($htmlWriter->flush());
-    }
-    $stylesheet = $this->getTransformXmlDocument();
-
-    // Perform XSL transformation
-    $xslt = new XSLTProcessor();
-    $xslt->importStyleSheet($stylesheet);
-
-    // Check for parameters
-    $parameters = $this->getParameters();
-    foreach($parameters as $name => $value) {
-      $xslt->setParameter('', $name, $value);
-    }
-    $output = $xslt->transformToXML($document);
-
-    // Write output
-    $writer->write($output);
+	  $document = new DOMDocument();
+	  $document->loadXML($htmlWriter->flush());
+	}
+	$stylesheet = $this->getTransformXmlDocument();
+
+	// Perform XSL transformation
+	$xslt = new XSLTProcessor();
+	$xslt->importStyleSheet($stylesheet);
+
+	// Check for parameters
+	$parameters = $this->getParameters();
+	foreach($parameters as $name => $value) {
+	  $xslt->setParameter('', $name, $value);
+	}
+	$output = $xslt->transformToXML($document);
+
+	// Write output
+	$writer->write($output);
   }
 }
 

Spacing +12 added lines, -12 removed lines

@@ -46,7 +46,7 @@ 
    * @throws TConfigurationException If XSL extension is not available
    */
   public function __construct() {
-    if(!class_exists('XSLTProcessor', false)) {
+    if (!class_exists('XSLTProcessor', false)) {
       throw new TConfigurationException('xmltransform_xslextension_required');
     }
   }
@@ -62,9 +62,9 @@ 
    * @param string The path to the XML style sheet.  It must be in namespace format.
    */
   public function setTransformPath($value) {
-    if(!is_file($value)) {
+    if (!is_file($value)) {
       $value = Prado::getPathOfNamespace($value, self::EXT_XSL_FILE);
-      if($value === null) {
+      if ($value === null) {
 	throw new TInvalidDataValueException('xmltransform_transformpath_invalid', $value);
       }
     }
@@ -97,9 +97,9 @@ 
    * @throws TInvalidDataValueException
    */
   public function setDocumentPath($value) {
-    if(!is_file($value)) {
+    if (!is_file($value)) {
       $value = Prado::getPathOfNamespace($value, self::EXT_XML_FILE);
-      if($value === null) {
+      if ($value === null) {
 	throw new TInvalidDataValueException('xmltransform_documentpath_invalid', $value);
       }
     }
@@ -125,7 +125,7 @@ 
    * @return TAttributeCollection the list of custom parameters
    */
   public function getParameters() {
-    if($params = $this->getViewState('Parameters',null)) {
+    if ($params = $this->getViewState('Parameters', null)) {
       return $params;
     } else {
       $params = new TAttributeCollection();
@@ -135,11 +135,11 @@ 
   }
 
   private function getTransformXmlDocument() {
-    if(($content = $this->getTransformContent()) !== '') {
+    if (($content = $this->getTransformContent()) !== '') {
       $document = new DOMDocument();
       $document->loadXML($content);
       return $document;
-    } else if(($path = $this->getTransformPath()) !== '') {
+    } else if (($path = $this->getTransformPath()) !== '') {
       $document = new DOMDocument();
       $document->load($path);
       return $document;
@@ -149,11 +149,11 @@ 
   }
 
   private function getSourceXmlDocument() {
-    if(($content = $this->getDocumentContent()) !== '') {
+    if (($content = $this->getDocumentContent()) !== '') {
       $document = new DOMDocument();
       $document->loadXML($content);
       return $document;
-    } else if(($path = $this->getDocumentPath()) !== '') {
+    } else if (($path = $this->getDocumentPath()) !== '') {
       $document = new DOMDocument();
       $document->load($path);
       return $document;
@@ -167,7 +167,7 @@ 
    * @param THtmlWriter The writer used for the rendering purpose
    */
   public function render($writer) {
-    if(($document=$this->getSourceXmlDocument()) === null) {
+    if (($document = $this->getSourceXmlDocument()) === null) {
 	  $htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 	  parent::render($htmlWriter);
       $document = new DOMDocument();
@@ -181,7 +181,7 @@ 
 
     // Check for parameters
     $parameters = $this->getParameters();
-    foreach($parameters as $name => $value) {
+    foreach ($parameters as $name => $value) {
       $xslt->setParameter('', $name, $value);
     }
     $output = $xslt->transformToXML($document);

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

Braces +24 added lines, -15 removed lines

@@ -66,8 +66,10 @@ 
                         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);
                 }
@@ -82,9 +84,11 @@ 
                         $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"];
 
                                 $this->_relations[$table_name_mm][] = array(
@@ -102,9 +106,11 @@ 
                                 );
                                 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"]);
 
@@ -131,13 +137,14 @@ 
 
         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
+                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);
+                        foreach ($tableInfo->getColumns() as $field => $metadata) {
+                                                        $properties[] = $this->generateProperty($field, $metadata);
+                        }
                         $toString = $this->_buildSmartToString($tableInfo);
                 }
 
@@ -170,12 +177,14 @@ 
 
         private function _renderRelations($tablename)
         {
-                if (!isset($this->_relations[$tablename]))
-                        return "";
+                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"] . "'),";
+                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);";
@@ -190,9 +199,9 @@ 
                 {
                         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);
                                         break;

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>
 }

framework/Xml/TXmlDocument.php

Doc Comments +11 added lines

@@ -66,6 +66,7 @@ 
 
 	/**
 	 * @param TXmlElement parent element of this element
+	 * @param TXmlElement|null $parent
 	 */
 	public function setParent($parent)
 	{
@@ -121,6 +122,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return string the attribute specified by the name, null if no such attribute
 	 */
 	public function getAttribute($name)
@@ -134,6 +136,8 @@ 
 	/**
 	 * @param string attribute name
 	 * @param string attribute value
+	 * @param string $name
+	 * @param string $value
 	 */
 	public function setAttribute($name,$value)
 	{
@@ -161,6 +165,7 @@ 
 	}
 
 	/**
+	 * @param string $tagName
 	 * @return TXmlElement the first child element that has the specified tag-name, null if not found
 	 */
 	public function getElementByTagName($tagName)
@@ -175,6 +180,7 @@ 
 	}
 
 	/**
+	 * @param string $tagName
 	 * @return TList list of all child elements that have the specified tag-name
 	 */
 	public function getElementsByTagName($tagName)
@@ -334,6 +340,7 @@ 
 
 	/**
 	 * @param string version of this XML document
+	 * @param string $version
 	 */
 	public function setVersion($version)
 	{
@@ -350,6 +357,7 @@ 
 
 	/**
 	 * @param string encoding of this XML document
+	 * @param string $encoding
 	 */
 	public function setEncoding($encoding)
 	{
@@ -426,6 +434,7 @@ 
 	/**
 	 * Saves this XML document as an XML file.
 	 * @param string the name of the file to be stored with XML output
+	 * @param string $file
 	 * @throws TIOException if the file cannot be written
 	 */
 	public function saveToFile($file)
@@ -532,6 +541,7 @@ 
 	 * operations for each newly added TXmlElement object.
 	 * @param integer the specified position.
 	 * @param mixed new item
+	 * @param integer $index
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TXmlElement object.
 	 */
 	public function insertAt($index,$item)
@@ -552,6 +562,7 @@ 
 	 * This overrides the parent implementation by performing additional
 	 * cleanup work when removing a TXmlElement object.
 	 * @param integer the index of the item to be removed.
+	 * @param integer $index
 	 * @return mixed the removed item.
 	 */
 	public function removeAt($index)

Spacing +79 added lines, -79 removed lines

@@ -29,23 +29,23 @@ 
 	/**
 	 * @var TXmlElement parent of this element
 	 */
-	private $_parent=null;
+	private $_parent = null;
 	/**
 	 * @var string tag-name of this element
 	 */
-	private $_tagName='unknown';
+	private $_tagName = 'unknown';
 	/**
 	 * @var string text enclosed between opening and closing tags of this element
 	 */
-	private $_value='';
+	private $_value = '';
 	/**
 	 * @var TXmlElementList list of child elements of this element
 	 */
-	private $_elements=null;
+	private $_elements = null;
 	/**
 	 * @var TMap attributes of this element
 	 */
-	private $_attributes=null;
+	private $_attributes = null;
 
 	/**
 	 * Constructor.
@@ -69,7 +69,7 @@ 
 	 */
 	public function setParent($parent)
 	{
-		$this->_parent=$parent;
+		$this->_parent = $parent;
 	}
 
 	/**
@@ -85,7 +85,7 @@ 
 	 */
 	public function setTagName($tagName)
 	{
-		$this->_tagName=$tagName;
+		$this->_tagName = $tagName;
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->_value=TPropertyValue::ensureString($value);
+		$this->_value = TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function getHasElement()
 	{
-		return $this->_elements!==null && $this->_elements->getCount()>0;
+		return $this->_elements !== null && $this->_elements->getCount() > 0;
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function getHasAttribute()
 	{
-		return $this->_attributes!==null && $this->_attributes->getCount()>0;
+		return $this->_attributes !== null && $this->_attributes->getCount() > 0;
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->_attributes!==null)
+		if ($this->_attributes !== null)
 			return $this->_attributes->itemAt($name);
 		else
 			return null;
@@ -135,9 +135,9 @@ 
 	 * @param string attribute name
 	 * @param string attribute value
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,TPropertyValue::ensureString($value));
+		$this->getAttributes()->add($name, TPropertyValue::ensureString($value));
 	}
 
 	/**
@@ -145,8 +145,8 @@ 
 	 */
 	public function getElements()
 	{
-		if(!$this->_elements)
-			$this->_elements=new TXmlElementList($this);
+		if (!$this->_elements)
+			$this->_elements = new TXmlElementList($this);
 		return $this->_elements;
 	}
 
@@ -155,8 +155,8 @@ 
 	 */
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
-			$this->_attributes=new TMap;
+		if (!$this->_attributes)
+			$this->_attributes = new TMap;
 		return $this->_attributes;
 	}
 
@@ -165,10 +165,10 @@ 
 	 */
 	public function getElementByTagName($tagName)
 	{
-		if($this->_elements)
+		if ($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName===$tagName)
+			foreach ($this->_elements as $element)
+				if ($element->_tagName === $tagName)
 					return $element;
 		}
 		return null;
@@ -179,11 +179,11 @@ 
 	 */
 	public function getElementsByTagName($tagName)
 	{
-		$list=new TList;
-		if($this->_elements)
+		$list = new TList;
+		if ($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName===$tagName)
+			foreach ($this->_elements as $element)
+				if ($element->_tagName === $tagName)
 					$list->add($element);
 		}
 		return $list;
@@ -192,33 +192,33 @@ 
 	/**
 	 * @return string string representation of this element
 	 */
-	public function toString($indent=0)
+	public function toString($indent = 0)
 	{
-		$attr='';
-		if($this->_attributes!==null)
+		$attr = '';
+		if ($this->_attributes !== null)
 		{
-			foreach($this->_attributes as $name=>$value)
+			foreach ($this->_attributes as $name=>$value)
 			{
-				$value=$this->xmlEncode($value);
-				$attr.=" $name=\"$value\"";
+				$value = $this->xmlEncode($value);
+				$attr .= " $name=\"$value\"";
 			}
 		}
-		$prefix=str_repeat(' ',$indent*4);
-		if($this->getHasElement())
+		$prefix = str_repeat(' ', $indent * 4);
+		if ($this->getHasElement())
 		{
-			$str=$prefix."<{$this->_tagName}$attr>\n";
-			foreach($this->getElements() as $element)
-				$str.=$element->toString($indent+1)."\n";
-			$str.=$prefix."</{$this->_tagName}>";
+			$str = $prefix . "<{$this->_tagName}$attr>\n";
+			foreach ($this->getElements() as $element)
+				$str .= $element->toString($indent + 1) . "\n";
+			$str .= $prefix . "</{$this->_tagName}>";
 			return $str;
 		}
-		else if(($value=$this->getValue())!=='')
+		else if (($value = $this->getValue()) !== '')
 		{
-			$value=$this->xmlEncode($value);
-			return $prefix."<{$this->_tagName}$attr>$value</{$this->_tagName}>";
+			$value = $this->xmlEncode($value);
+			return $prefix . "<{$this->_tagName}$attr>$value</{$this->_tagName}>";
 		}
 		else
-			return $prefix."<{$this->_tagName}$attr />";
+			return $prefix . "<{$this->_tagName}$attr />";
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 
 	private function xmlEncode($str)
 	{
-		return strtr($str,array(
+		return strtr($str, array(
 			'>'=>'&gt;',
 			'<'=>'&lt;',
 			'&'=>'&amp;',
@@ -317,7 +317,7 @@ 
 	 * @param string version of this XML document
 	 * @param string encoding of this XML document
 	 */
-	public function __construct($version='1.0',$encoding='')
+	public function __construct($version = '1.0', $encoding = '')
 	{
 		parent::__construct('');
 		$this->setVersion($version);
@@ -337,7 +337,7 @@ 
 	 */
 	public function setVersion($version)
 	{
-		$this->_version=$version;
+		$this->_version = $version;
 	}
 
 	/**
@@ -353,7 +353,7 @@ 
 	 */
 	public function setEncoding($encoding)
 	{
-		$this->_encoding=$encoding;
+		$this->_encoding = $encoding;
 	}
 
 	/**
@@ -364,10 +364,10 @@ 
 	 */
 	public function loadFromFile($file)
 	{
-		if(($str=@file_get_contents($file))!==false)
+		if (($str = @file_get_contents($file)) !== false)
 			return $this->loadFromString($str);
 		else
-			throw new TIOException('xmldocument_file_read_failed',$file);
+			throw new TIOException('xmldocument_file_read_failed', $file);
 	}
 
 	/**
@@ -379,44 +379,44 @@ 
 	public function loadFromString($string)
 	{
 		// TODO: since PHP 5.1, we can get parsing errors and throw them as exception
-		$doc=new DOMDocument();
-		if($doc->loadXML($string)===false)
+		$doc = new DOMDocument();
+		if ($doc->loadXML($string) === false)
 			return false;
 
 		$this->setEncoding($doc->encoding);
 		$this->setVersion($doc->version);
 
-		$element=$doc->documentElement;
+		$element = $doc->documentElement;
 		$this->setTagName($element->tagName);
 		$this->setValue($element->nodeValue);
-		$elements=$this->getElements();
-		$attributes=$this->getAttributes();
+		$elements = $this->getElements();
+		$attributes = $this->getAttributes();
 		$elements->clear();
 		$attributes->clear();
 
 		static $bSimpleXml;
-		if($bSimpleXml === null)
-			$bSimpleXml = (boolean)function_exists('simplexml_load_string');
+		if ($bSimpleXml === null)
+			$bSimpleXml = (boolean) function_exists('simplexml_load_string');
 
-		if($bSimpleXml)
+		if ($bSimpleXml)
 		{
 			$simpleDoc = simplexml_load_string($string);
 			$docNamespaces = $simpleDoc->getDocNamespaces(false);
 			$simpleDoc = null;
-			foreach($docNamespaces as $prefix => $uri)
+			foreach ($docNamespaces as $prefix => $uri)
 			{
- 				if($prefix === '')
+ 				if ($prefix === '')
    					$attributes->add('xmlns', $uri);
    				else
-   					$attributes->add('xmlns:'.$prefix, $uri);
+   					$attributes->add('xmlns:' . $prefix, $uri);
 			}
 		}
 
-		foreach($element->attributes as $name=>$attr)
-			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') .$name,$attr->value);
-		foreach($element->childNodes as $child)
+		foreach ($element->attributes as $name=>$attr)
+			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name, $attr->value);
+		foreach ($element->childNodes as $child)
 		{
-			if($child instanceof DOMElement)
+			if ($child instanceof DOMElement)
 				$elements->add($this->buildElement($child));
 		}
 
@@ -430,13 +430,13 @@ 
 	 */
 	public function saveToFile($file)
 	{
-		if(($fw=fopen($file,'w'))!==false)
+		if (($fw = fopen($file, 'w')) !== false)
 		{
-			fwrite($fw,$this->saveToString());
+			fwrite($fw, $this->saveToString());
 			fclose($fw);
 		}
 		else
-			throw new TIOException('xmldocument_file_write_failed',$file);
+			throw new TIOException('xmldocument_file_write_failed', $file);
 	}
 
 	/**
@@ -445,9 +445,9 @@ 
 	 */
 	public function saveToString()
 	{
-		$version=empty($this->_version)?' version="1.0"':' version="'.$this->_version.'"';
-		$encoding=empty($this->_encoding)?'':' encoding="'.$this->_encoding.'"';
-		return "<?xml{$version}{$encoding}?>\n".$this->toString(0);
+		$version = empty($this->_version) ? ' version="1.0"' : ' version="' . $this->_version . '"';
+		$encoding = empty($this->_encoding) ? '' : ' encoding="' . $this->_encoding . '"';
+		return "<?xml{$version}{$encoding}?>\n" . $this->toString(0);
 	}
 
 	/**
@@ -477,14 +477,14 @@ 
 	 */
 	protected function buildElement($node)
 	{
-		$element=new TXmlElement($node->tagName);
+		$element = new TXmlElement($node->tagName);
 		$element->setValue($node->nodeValue);
-		foreach($node->attributes as $name=>$attr)
-			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name,$attr->value);
+		foreach ($node->attributes as $name=>$attr)
+			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name, $attr->value);
 
-		foreach($node->childNodes as $child)
+		foreach ($node->childNodes as $child)
 		{
-			if($child instanceof DOMElement)
+			if ($child instanceof DOMElement)
 				$element->getElements()->add($this->buildElement($child));
 		}
 		return $element;
@@ -515,7 +515,7 @@ 
 	 */
 	public function __construct(TXmlElement $owner)
 	{
-		$this->_o=$owner;
+		$this->_o = $owner;
 	}
 
 	/**
@@ -534,12 +534,12 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TXmlElement object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof TXmlElement)
+		if ($item instanceof TXmlElement)
 		{
-			parent::insertAt($index,$item);
-			if($item->getParent()!==null)
+			parent::insertAt($index, $item);
+			if ($item->getParent() !== null)
 				$item->getParent()->getElements()->remove($item);
 			$item->setParent($this->_o);
 		}
@@ -556,8 +556,8 @@ 
 	 */
 	public function removeAt($index)
 	{
-		$item=parent::removeAt($index);
-		if($item instanceof TXmlElement)
+		$item = parent::removeAt($index);
+		if ($item instanceof TXmlElement)
 			$item->setParent(null);
 		return $item;
 	}

Braces +61 added lines, -46 removed lines

@@ -125,10 +125,11 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->_attributes!==null)
-			return $this->_attributes->itemAt($name);
-		else
-			return null;
+		if($this->_attributes!==null) {
+					return $this->_attributes->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -145,8 +146,9 @@ 
 	 */
 	public function getElements()
 	{
-		if(!$this->_elements)
-			$this->_elements=new TXmlElementList($this);
+		if(!$this->_elements) {
+					$this->_elements=new TXmlElementList($this);
+		}
 		return $this->_elements;
 	}
 
@@ -155,8 +157,9 @@ 
 	 */
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
-			$this->_attributes=new TMap;
+		if(!$this->_attributes) {
+					$this->_attributes=new TMap;
+		}
 		return $this->_attributes;
 	}
 
@@ -167,9 +170,10 @@ 
 	{
 		if($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName===$tagName)
+			foreach($this->_elements as $element) {
+							if($element->_tagName===$tagName)
 					return $element;
+			}
 		}
 		return null;
 	}
@@ -182,9 +186,10 @@ 
 		$list=new TList;
 		if($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName===$tagName)
+			foreach($this->_elements as $element) {
+							if($element->_tagName===$tagName)
 					$list->add($element);
+			}
 		}
 		return $list;
 	}
@@ -207,18 +212,18 @@ 
 		if($this->getHasElement())
 		{
 			$str=$prefix."<{$this->_tagName}$attr>\n";
-			foreach($this->getElements() as $element)
-				$str.=$element->toString($indent+1)."\n";
+			foreach($this->getElements() as $element) {
+							$str.=$element->toString($indent+1)."\n";
+			}
 			$str.=$prefix."</{$this->_tagName}>";
 			return $str;
-		}
-		else if(($value=$this->getValue())!=='')
+		} else if(($value=$this->getValue())!=='')
 		{
 			$value=$this->xmlEncode($value);
 			return $prefix."<{$this->_tagName}$attr>$value</{$this->_tagName}>";
+		} else {
+					return $prefix."<{$this->_tagName}$attr />";
 		}
-		else
-			return $prefix."<{$this->_tagName}$attr />";
 	}
 
 	/**
@@ -364,10 +369,11 @@ 
 	 */
 	public function loadFromFile($file)
 	{
-		if(($str=@file_get_contents($file))!==false)
-			return $this->loadFromString($str);
-		else
-			throw new TIOException('xmldocument_file_read_failed',$file);
+		if(($str=@file_get_contents($file))!==false) {
+					return $this->loadFromString($str);
+		} else {
+					throw new TIOException('xmldocument_file_read_failed',$file);
+		}
 	}
 
 	/**
@@ -380,8 +386,9 @@ 
 	{
 		// TODO: since PHP 5.1, we can get parsing errors and throw them as exception
 		$doc=new DOMDocument();
-		if($doc->loadXML($string)===false)
-			return false;
+		if($doc->loadXML($string)===false) {
+					return false;
+		}
 
 		$this->setEncoding($doc->encoding);
 		$this->setVersion($doc->version);
@@ -395,8 +402,9 @@ 
 		$attributes->clear();
 
 		static $bSimpleXml;
-		if($bSimpleXml === null)
-			$bSimpleXml = (boolean)function_exists('simplexml_load_string');
+		if($bSimpleXml === null) {
+					$bSimpleXml = (boolean)function_exists('simplexml_load_string');
+		}
 
 		if($bSimpleXml)
 		{
@@ -405,19 +413,22 @@ 
 			$simpleDoc = null;
 			foreach($docNamespaces as $prefix => $uri)
 			{
- 				if($prefix === '')
-   					$attributes->add('xmlns', $uri);
-   				else
-   					$attributes->add('xmlns:'.$prefix, $uri);
+ 				if($prefix === '') {
+ 				   					$attributes->add('xmlns', $uri);
+ 				} else {
+   				   					$attributes->add('xmlns:'.$prefix, $uri);
+   				}
 			}
 		}
 
-		foreach($element->attributes as $name=>$attr)
-			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') .$name,$attr->value);
+		foreach($element->attributes as $name=>$attr) {
+					$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') .$name,$attr->value);
+		}
 		foreach($element->childNodes as $child)
 		{
-			if($child instanceof DOMElement)
-				$elements->add($this->buildElement($child));
+			if($child instanceof DOMElement) {
+							$elements->add($this->buildElement($child));
+			}
 		}
 
 		return true;
@@ -434,9 +445,9 @@ 
 		{
 			fwrite($fw,$this->saveToString());
 			fclose($fw);
+		} else {
+					throw new TIOException('xmldocument_file_write_failed',$file);
 		}
-		else
-			throw new TIOException('xmldocument_file_write_failed',$file);
 	}
 
 	/**
@@ -479,13 +490,15 @@ 
 	{
 		$element=new TXmlElement($node->tagName);
 		$element->setValue($node->nodeValue);
-		foreach($node->attributes as $name=>$attr)
-			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name,$attr->value);
+		foreach($node->attributes as $name=>$attr) {
+					$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name,$attr->value);
+		}
 
 		foreach($node->childNodes as $child)
 		{
-			if($child instanceof DOMElement)
-				$element->getElements()->add($this->buildElement($child));
+			if($child instanceof DOMElement) {
+							$element->getElements()->add($this->buildElement($child));
+			}
 		}
 		return $element;
 	}
@@ -539,12 +552,13 @@ 
 		if($item instanceof TXmlElement)
 		{
 			parent::insertAt($index,$item);
-			if($item->getParent()!==null)
-				$item->getParent()->getElements()->remove($item);
+			if($item->getParent()!==null) {
+							$item->getParent()->getElements()->remove($item);
+			}
 			$item->setParent($this->_o);
+		} else {
+					throw new TInvalidDataTypeException('xmlelementlist_xmlelement_required');
 		}
-		else
-			throw new TInvalidDataTypeException('xmlelementlist_xmlelement_required');
 	}
 
 	/**
@@ -557,8 +571,9 @@ 
 	public function removeAt($index)
 	{
 		$item=parent::removeAt($index);
-		if($item instanceof TXmlElement)
-			$item->setParent(null);
+		if($item instanceof TXmlElement) {
+					$item->setParent(null);
+		}
 		return $item;
 	}
 }

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

Doc Comments +3 added lines

@@ -19,6 +19,9 @@
 			$this->setVisible(false);
     }
     
+    /**
+     * @param boolean $value
+     */
     public function setVisible($value)
     {
 		$this->ensureChildControls();

Indentation +44 added lines, -44 removed lines

@@ -2,60 +2,60 @@
 
 class DMessagesPanel extends TTemplateControl
 {
-    private $_panelCssClass = '';
+	private $_panelCssClass = '';
     
-    public function onInit($param)
-    {
-        parent::onInit($param);
-    	$this->MessagesPanelEffect->Text = "";
-    }
+	public function onInit($param)
+	{
+		parent::onInit($param);
+		$this->MessagesPanelEffect->Text = "";
+	}
     
-    public function setMessage($value)
-    {
-        $this->Message->Text = $value;
-        if ($value != '') 
+	public function setMessage($value)
+	{
+		$this->Message->Text = $value;
+		if ($value != '') 
 			$this->setVisible(true);
-        else 
+		else 
 			$this->setVisible(false);
-    }
+	}
     
-    public function setVisible($value)
-    {
+	public function setVisible($value)
+	{
 		$this->ensureChildControls();
-        if ($value === true) {
+		if ($value === true) {
 			echo "set visible";
-            $this->MessagesPanel->Visible = true;
-    	    $this->Message->Visible = true;
-    	    $this->setEffect(null);
-        } else {
-            $this->MessagesPanel->Visible = false;
-        }
-    }
+			$this->MessagesPanel->Visible = true;
+			$this->Message->Visible = true;
+			$this->setEffect(null);
+		} else {
+			$this->MessagesPanel->Visible = false;
+		}
+	}
     
-    public function setEffect($effect = null)
-    {
-        if ($effect !== null) {
-            $text = "<script type=\"text/javascript\" language=\"javascript\">\r\n";
-            $text .= "// <![CDATA[\r\n";
-            //$text .= "new Effect.$effect(\"" . $this->Page->DMessagesPanel->MessagesPanel->ClientID . "\");\r\n";
-            $text .= "new Effect.$effect(\"" . $this->ClientID . "\");\r\n";
-            $text .= "// ]]>\r\n";
-            $text .= "</script>";
-            $this->MessagesPanelEffect->Text = $text;
-        } else {
-            $this->MessagesPanelEffect->Text = '';
-        }
-    }
+	public function setEffect($effect = null)
+	{
+		if ($effect !== null) {
+			$text = "<script type=\"text/javascript\" language=\"javascript\">\r\n";
+			$text .= "// <![CDATA[\r\n";
+			//$text .= "new Effect.$effect(\"" . $this->Page->DMessagesPanel->MessagesPanel->ClientID . "\");\r\n";
+			$text .= "new Effect.$effect(\"" . $this->ClientID . "\");\r\n";
+			$text .= "// ]]>\r\n";
+			$text .= "</script>";
+			$this->MessagesPanelEffect->Text = $text;
+		} else {
+			$this->MessagesPanelEffect->Text = '';
+		}
+	}
     
-    public function setPanelCssClass($value)
-    {
+	public function setPanelCssClass($value)
+	{
 		$this->ensureChildControls();
-    	$this->MessagesPanel->CssClass = $value;
-    }
+		$this->MessagesPanel->CssClass = $value;
+	}
     
-    public function setMessageCssClass($value)
-    {
+	public function setMessageCssClass($value)
+	{
 		$this->ensureChildControls();
-    	$this->Message->CssClass = $value;
-    }
+		$this->Message->CssClass = $value;
+	}
 }

Braces +5 added lines, -4 removed lines

@@ -13,10 +13,11 @@
     public function setMessage($value)
     {
         $this->Message->Text = $value;
-        if ($value != '') 
-			$this->setVisible(true);
-        else 
-			$this->setVisible(false);
+        if ($value != '') {
+        			$this->setVisible(true);
+        } else {
+        			$this->setVisible(false);
+        }
     }
     
     public function setVisible($value)

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

Doc Comments +3 added lines

@@ -4,6 +4,9 @@
 {
 	private $panels = array('pnlContentsA', 'pnlContentsB', 'pnlContentsC', );
 
+	/**
+	 * @param string $id
+	 */
 	private function showPanel($id, $param) 
 	{
 		foreach($this->panels as $panel) 

Spacing +3 added lines, -3 removed lines

@@ -2,13 +2,13 @@
 
 class MyTabPanelTest extends TPage 
 {
-	private $panels = array('pnlContentsA', 'pnlContentsB', 'pnlContentsC', );
+	private $panels = array('pnlContentsA', 'pnlContentsB', 'pnlContentsC',);
 
 	private function showPanel($id, $param) 
 	{
-		foreach($this->panels as $panel) 
+		foreach ($this->panels as $panel) 
 		{
-			if($id == $panel) 
+			if ($id == $panel) 
 			{
 				$this->$panel->setAttribute('style', 'display: block;');
 				$this->$panel->setVisible(true);

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
 				$this->$panel->setAttribute('style', 'display: block;');
 				$this->$panel->setVisible(true);
 				$this->$panel->render($param->NewWriter);
-			} 
-			else 
+			} else 
 			{
 				$this->$panel->setVisible(false);
 			}

tests/FunctionalTests/active-controlstests/ActiveRatingListTestCase.php

Doc Comments +3 added lines

@@ -247,6 +247,9 @@
 		$this->byXPath("//input[@id='{$clientID}']/../..")->click();
 	}
 
+	/**
+	 * @param integer[] $checks
+	 */
 	function assertCheckBoxes($clientID, $checks, $total = 5)
 	{
 		for($i = 0; $i < $total; $i++)

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * ActiveRatingListTestCase.php
- *
- * @author Bradley Booms <Bradley.Booms@nsighttel.com>
- * @version Creation Date: Oct 22, 2008
- */
+	 * ActiveRatingListTestCase.php
+	 *
+	 * @author Bradley Booms <Bradley.Booms@nsighttel.com>
+	 * @version Creation Date: Oct 22, 2008
+	 */
 
 /**
  * ActiveRatingListTestCase.php class

Spacing +11 added lines, -11 removed lines

@@ -23,7 +23,7 @@ 
 {
 	function testCheckBoxes()
 	{
-		$base='ctl0_Content_';
+		$base = 'ctl0_Content_';
 		// Verify we're on the right page.
 		$this->url("active-controls/index.php?page=ActiveRatingListCheckBoxesTest");
 		$this->assertSourceContains("TActiveRatingList Check Boxes Test Case");
@@ -41,7 +41,7 @@ 
 
 	function testRating()
 	{
-		$base='ctl0_Content_';
+		$base = 'ctl0_Content_';
 		// Verify we're on the right page.
 		$this->url("active-controls/index.php?page=ActiveRatingListRatingTest");
 		$this->assertSourceContains("TActiveRatingList Rating Test Case");
@@ -62,7 +62,7 @@ 
 
 	function testSelectedIndex()
 	{
-		$base='ctl0_Content_';
+		$base = 'ctl0_Content_';
 		// Verify we're on the right page.
 		$this->url("active-controls/index.php?page=ActiveRatingListSelectedIndexTest");
 		$this->assertSourceContains("TActiveRatingList SelectedIndex Test Case");
@@ -81,7 +81,7 @@ 
 
 	function testAutoPostBack()
 	{
-		$base='ctl0_Content_';
+		$base = 'ctl0_Content_';
 		// Verify we're on the right page.
 		$this->url("active-controls/index.php?page=ActiveRatingListAutoPostBackTest");
 		$this->assertSourceContains("TActiveRatingList AutoPostBack Test Case");
@@ -100,7 +100,7 @@ 
 
 	function testAllowInput()
 	{
-		$base='ctl0_Content_';
+		$base = 'ctl0_Content_';
 		// Verify we're on the right page.
 		$this->url("active-controls/index.php?page=ActiveRatingListAllowInputTest");
 		$this->assertSourceContains("TActiveRatingList AllowInput Test Case");
@@ -116,7 +116,7 @@ 
 
 	function testReadOnly()
 	{
-		$base='ctl0_Content_';
+		$base = 'ctl0_Content_';
 		// Verify we're on the right page.
 		$this->url("active-controls/index.php?page=ActiveRatingListReadOnlyTest");
 		$this->assertSourceContains("TActiveRatingList ReadOnly Test Case");
@@ -155,7 +155,7 @@ 
 
 	function testEnabled()
 	{
-		$base='ctl0_Content_';
+		$base = 'ctl0_Content_';
 		// Verify we're on the right page.
 		$this->url("active-controls/index.php?page=ActiveRatingListEnabledTest");
 		$this->assertSourceContains("TActiveRatingList Enabled Test Case");
@@ -194,7 +194,7 @@ 
 
 	function testHoverCaption()
 	{
-		$base='ctl0_Content_';
+		$base = 'ctl0_Content_';
 		// Verify we're on the right page.
 		$this->url("active-controls/index.php?page=ActiveRatingListHoverCaptionTest");
 		$this->assertSourceContains("TActiveRatingList Hover Caption Test Case");
@@ -243,15 +243,15 @@ 
 		$this->assertElementPresent("//input[@id='{$base}RatingList_c5']/../../../td[contains(@class, 'rating')]");
 	}
 
-	function clickTD($clientID){
+	function clickTD($clientID) {
 		$this->byXPath("//input[@id='{$clientID}']/../..")->click();
 	}
 
 	function assertCheckBoxes($clientID, $checks, $total = 5)
 	{
-		for($i = 0; $i < $total; $i++)
+		for ($i = 0; $i < $total; $i++)
 		{
-			if(in_array($i, $checks))
+			if (in_array($i, $checks))
 				$this->assertTrue($this->byId("{$clientID}_c{$i}")->selected());
 			else
 				$this->assertFalse($this->byId("{$clientID}_c{$i}")->selected());

Braces +5 added lines, -4 removed lines

@@ -251,10 +251,11 @@
 	{
 		for($i = 0; $i < $total; $i++)
 		{
-			if(in_array($i, $checks))
-				$this->assertTrue($this->byId("{$clientID}_c{$i}")->selected());
-			else
-				$this->assertFalse($this->byId("{$clientID}_c{$i}")->selected());
+			if(in_array($i, $checks)) {
+							$this->assertTrue($this->byId("{$clientID}_c{$i}")->selected());
+			} else {
+							$this->assertFalse($this->byId("{$clientID}_c{$i}")->selected());
+			}
 		}
 	}
 }
\ No newline at end of file

tests/FunctionalTests/features/protected/pages/FeatureList.php

Doc Comments +4 added lines

@@ -10,6 +10,10 @@
 		$this->List->dataBind();
 	}
 
+	/**
+	 * @param string $directory
+	 * @param string $basePath
+	 */
 	protected function getPageList($directory,$basePath)
 	{
 		$list=array();

Spacing +11 added lines, -11 removed lines

@@ -5,26 +5,26 @@
 	public function onLoad($param)
 	{
 		parent::onLoad($param);
-		$list=$this->getPageList(dirname(__FILE__),'');
-		$this->List->DataSource=$list;
+		$list = $this->getPageList(dirname(__FILE__), '');
+		$this->List->DataSource = $list;
 		$this->List->dataBind();
 	}
 
-	protected function getPageList($directory,$basePath)
+	protected function getPageList($directory, $basePath)
 	{
-		$list=array();
-		$folder=@opendir($directory);
-		while($entry=@readdir($folder))
+		$list = array();
+		$folder = @opendir($directory);
+		while ($entry = @readdir($folder))
 		{
-			if($entry[0]==='.')
+			if ($entry[0] === '.')
 				continue;
-			else if(is_file($directory.'/'.$entry))
+			else if (is_file($directory . '/' . $entry))
 			{
-				if(($page=basename($entry,'.page'))!==$entry && strpos($page,'.')===false)
-					$list['?page='.$basePath.$page]=$basePath.$page;
+				if (($page = basename($entry, '.page')) !== $entry && strpos($page, '.') === false)
+					$list['?page=' . $basePath . $page] = $basePath . $page;
 			}
 			else
-				$list=array_merge($list,$this->getPageList($directory.'/'.$entry,$basePath.$entry.'.'));
+				$list = array_merge($list, $this->getPageList($directory . '/' . $entry, $basePath . $entry . '.'));
 		}
 		closedir($folder);
 		return $list;

Braces +8 added lines, -7 removed lines

@@ -16,15 +16,16 @@
 		$folder=@opendir($directory);
 		while($entry=@readdir($folder))
 		{
-			if($entry[0]==='.')
-				continue;
-			else if(is_file($directory.'/'.$entry))
+			if($entry[0]==='.') {
+							continue;
+			} else if(is_file($directory.'/'.$entry))
 			{
-				if(($page=basename($entry,'.page'))!==$entry && strpos($page,'.')===false)
-					$list['?page='.$basePath.$page]=$basePath.$page;
+				if(($page=basename($entry,'.page'))!==$entry && strpos($page,'.')===false) {
+									$list['?page='.$basePath.$page]=$basePath.$page;
+				}
+			} else {
+							$list=array_merge($list,$this->getPageList($directory.'/'.$entry,$basePath.$entry.'.'));
 			}
-			else
-				$list=array_merge($list,$this->getPageList($directory.'/'.$entry,$basePath.$entry.'.'));
 		}
 		closedir($folder);
 		return $list;

tests/FunctionalTests/tickets/tests/Ticket700TestCase.php

Doc Comments +3 added lines

@@ -74,6 +74,9 @@
 		$this->byId('ctl0_Logout')->click();
 	}
 
+	/**
+	 * @param string $title
+	 */
 	public function assertTitleEquals($title)
 	{
 		$this->pause(50);

Spacing +6 added lines, -6 removed lines

@@ -18,8 +18,8 @@ 
 		// page: admin.Home
 		$this->byId('pageAdminHome')->click();
 		$this->assertTitleEquals('UserLogin');
-		$this->type('ctl0_Main_Username','AdminUser');
-		$this->type('ctl0_Main_Password','demo');
+		$this->type('ctl0_Main_Username', 'AdminUser');
+		$this->type('ctl0_Main_Password', 'demo');
 		$this->byId('ctl0_Main_LoginButton')->click();
 		$this->pause(50);
 		$this->byId('pageAdminHome')->click();
@@ -41,14 +41,14 @@ 
 		// page: admin.users.Home
 		$this->byId('pageAdminUsersHome')->click();
 		$this->assertTitleEquals('UserLogin');
-		$this->type('ctl0_Main_Username','NormalUser');
-		$this->type('ctl0_Main_Password','demo');
+		$this->type('ctl0_Main_Username', 'NormalUser');
+		$this->type('ctl0_Main_Password', 'demo');
 		$this->byId('ctl0_Main_LoginButton')->click();
 		$this->pause(50);
 		$this->byId('pageAdminUsersHome')->click();
 		$this->assertTitleEquals('UserLogin');
-		$this->type('ctl0_Main_Username','AdminUser');
-		$this->type('ctl0_Main_Password','demo');
+		$this->type('ctl0_Main_Username', 'AdminUser');
+		$this->type('ctl0_Main_Password', 'demo');
 		$this->byId('ctl0_Main_LoginButton')->click();
 		$this->pause(50);
 		$this->byId('pageAdminUsersHome')->click();