bb-drummer / my-application

module/Application/src/Application/Model/DbStructUpdater.php

Indentation +90 added lines, -90 removed lines

@@ -60,20 +60,20 @@ 
     var $config = array();//updater configuration
 
     /**
-    * Constructor
+     * Constructor
      *
-    * @access public
-    */
+     * @access public
+     */
     public function __construct()
     {
         $this->init();
     }
 
     /**
-    * Constructor
+     * Constructor
      *
-    * @access public
-    */
+     * @access public
+     */
     public function dbStructUpdater()
     {
         $this->init();
@@ -96,10 +96,10 @@ 
     }
 
     /**
-    * merges current updater config with the given one
+     * merges current updater config with the given one
      *
-    * @param assoc_array $config new configuration values
-    */
+     * @param assoc_array $config new configuration values
+     */
     public function setConfig($config=array())
     {
         if (is_array($config)) {
@@ -108,14 +108,14 @@ 
     }
 
     /**
-    * Returns array of update SQL with default options, $source, $dest - database structures
+     * Returns array of update SQL with default options, $source, $dest - database structures
      *
-    * @access public
-    * @param  string $source   structure dump of database to update
-    * @param  string $dest     structure dump of the reference database
-    * @param  bool   $asString if true - result will be a string, otherwise - array
-    * @return array|string update sql statements - in array or string (separated with ';')
-    */
+     * @access public
+     * @param  string $source   structure dump of database to update
+     * @param  string $dest     structure dump of the reference database
+     * @param  bool   $asString if true - result will be a string, otherwise - array
+     * @return array|string update sql statements - in array or string (separated with ';')
+     */
     public function getUpdates($source, $dest, $asString=false)
     {
         $result = $asString?'':array();
@@ -135,8 +135,8 @@ 
     }
 
     /**
-    * Filters comparison result and lefts only sync actions allowed by 'updateTypes' option
-    */
+     * Filters comparison result and lefts only sync actions allowed by 'updateTypes' option
+     */
     public function filterDiffs($compRes)
     {
         $result = array();
@@ -185,9 +185,9 @@ 
     }
     

     /**
-    * Gets structured general info about the databases diff :
-    * array(sourceOrphans=>array(...), destOrphans=>array(...), different=>array(...))
-    */
+     * Gets structured general info about the databases diff :
+     * array(sourceOrphans=>array(...), destOrphans=>array(...), different=>array(...))
+     */
     public function getDiffInfo($compRes)
     {        

         if (!is_array($compRes)) {
@@ -211,20 +211,20 @@ 
     }
 
     /**
-    * Makes comparison of the given database structures, support some options
+     * Makes comparison of the given database structures, support some options
      *
-    * @access private
-    * @param  string $source and $dest are strings - database tables structures
-    * @return array
-    * - table (array)
-    *        - destOrphan (boolean)
-    *        - sourceOrphan (boolean)
-    *        - differs (array) OR (boolean) false if no diffs
-    *            - [0](array)
-    *                - source (string) structure definition line in the out-of-date table
-    *                - dest (string) structure definition line in the reference table
-    *            - [1](array) ...
-    */
+     * @access private
+     * @param  string $source and $dest are strings - database tables structures
+     * @return array
+     * - table (array)
+     *        - destOrphan (boolean)
+     *        - sourceOrphan (boolean)
+     *        - differs (array) OR (boolean) false if no diffs
+     *            - [0](array)
+     *                - source (string) structure definition line in the out-of-date table
+     *                - dest (string) structure definition line in the reference table
+     *            - [1](array) ...
+     */
     private function compare($source, $dest)
     {
         $this->sourceStruct = $source;
@@ -270,11 +270,11 @@ 
     }
 
     /**
-    * Retrieves list of table names from the database structure dump
+     * Retrieves list of table names from the database structure dump
      *
-    * @access private
-    * @param  string $struct database structure listing
-    */
+     * @access private
+     * @param  string $struct database structure listing
+     */
     private function getTableList($struct)
     {
         $result = array();
@@ -288,14 +288,14 @@ 
     }
 
     /**
-    * Retrieves table structure definition from the database structure dump
+     * Retrieves table structure definition from the database structure dump
      *
-    * @access private
-    * @param  string $struct         database structure listing
-    * @param  string $tab            table name
-    * @param  bool   $removeDatabase - either to remove database name in "CREATE TABLE database.tab"-like declarations
-    * @return string table structure definition
-    */
+     * @access private
+     * @param  string $struct         database structure listing
+     * @param  string $tab            table name
+     * @param  bool   $removeDatabase - either to remove database name in "CREATE TABLE database.tab"-like declarations
+     * @return string table structure definition
+     */
     private function getTabSql($struct, $tab, $removeDatabase=true)
     {
         $result = '';
@@ -323,8 +323,8 @@ 
     }
     

     /**
-    * Splits table sql into indexed array
-    */
+     * Splits table sql into indexed array
+     */
     public function splitTabSql($sql)
     {
         $result = array();
@@ -365,18 +365,18 @@ 
     }
 
     /**
-    * returns array of fields or keys definitions that differs in the given tables structure
+     * returns array of fields or keys definitions that differs in the given tables structure
      *
-    * @access private
-    * @param  sring $sourceSql table structure
-    * @param  sring $destSql   right table structure supports some $options
-    * supports some $options
-    * @return array
-    *     - [0]
-    *         - source (string) out-of-date table field definition
-    *         - dest (string) reference table field definition
-    *     - [1]...
-    */
+     * @access private
+     * @param  sring $sourceSql table structure
+     * @param  sring $destSql   right table structure supports some $options
+     * supports some $options
+     * @return array
+     *     - [0]
+     *         - source (string) out-of-date table field definition
+     *         - dest (string) reference table field definition
+     *     - [1]...
+     */
     private function compareSql($sourceSql, $destSql)//$sourceSql, $destSql
     {
         $result = array();        

@@ -439,14 +439,14 @@ 
     }
 
     /**
-    * Transforms table structure defnition line into key=>value pair where the key is a string that uniquely
-    * defines field or key desribed
+     * Transforms table structure defnition line into key=>value pair where the key is a string that uniquely
+     * defines field or key desribed
      *
-    * @access private
-    * @param  string $line field definition string
-    * @return array array with single key=>value pair as described in the description
-    * implements some options
-    */
+     * @access private
+     * @param  string $line field definition string
+     * @return array array with single key=>value pair as described in the description
+     * implements some options
+     */
     private function processLine($line)
     {
         $options = $this->config;
@@ -484,14 +484,14 @@ 
     }
 
     /**
-    * Takes an output of compare() method to generate the set of sql needed to update source table to make it
-    * look as a destination one
+     * Takes an output of compare() method to generate the set of sql needed to update source table to make it
+     * look as a destination one
      *
-    * @access private
-    * @param  array $diff compare() method output
-    * @return array list of sql statements
-    * supports query generation options
-    */
+     * @access private
+     * @param  array $diff compare() method output
+     * @return array list of sql statements
+     * supports query generation options
+     */
     private function getDiffSql($diff)//maybe add option to ommit or force 'IF NOT EXISTS', skip autoincrement
     {
         $options = $this->config;
@@ -548,14 +548,14 @@ 
     }
 
     /**
-    * Compiles update sql
+     * Compiles update sql
      *
-    * @access private
-    * @param  string $action - 'drop', 'add' or 'modify'
-    * @param  string $tab    table name
-    * @param  string $sql    definition of the element to change
-    * @return string update sql
-    */
+     * @access private
+     * @param  string $action - 'drop', 'add' or 'modify'
+     * @param  string $tab    table name
+     * @param  string $sql    definition of the element to change
+     * @return string update sql
+     */
     private function getActionSql($action, $tab, $sql)
     {
         $result = 'ALTER TABLE `'.$tab.'` ';
@@ -621,14 +621,14 @@ 
     }
 
     /**
-    * Searches for the position of the next delimiter which is not inside string literal like 'this ; ' or
-    * like "this ; ".
-    *
-    * Handles escaped \" and \'. Also handles sql comments.
-    * Actualy it is regex-based Finit State Machine (FSN)
-    *
-    * $skipInBrackets - if true, delimiter will be skipped if located inside (brackets) which are not string literals or comment parts
-    */
+     * Searches for the position of the next delimiter which is not inside string literal like 'this ; ' or
+     * like "this ; ".
+     *
+     * Handles escaped \" and \'. Also handles sql comments.
+     * Actualy it is regex-based Finit State Machine (FSN)
+     *
+     * $skipInBrackets - if true, delimiter will be skipped if located inside (brackets) which are not string literals or comment parts
+     */
     public function getDelimPos($string, $offset=0, $delim=';', $skipInBrackets=false)
     {
         $stack = array();
@@ -701,9 +701,9 @@ 
     }
     

     /**
-    * works the same as getDelimPos except returns position of the first occurence of the delimiter starting from
-    * the end of the string
-    */
+     * works the same as getDelimPos except returns position of the first occurence of the delimiter starting from
+     * the end of the string
+     */
     public function getDelimRpos($string, $offset=0, $delim=';', $skipInBrackets=false)
     {
         $pos = $this->getDelimPos($string, $offset, $delim, $skipInBrackets);

module/UIComponents/src/UIComponents/View/Helper/Components/Table.php

Indentation +224 added lines, -224 removed lines

@@ -25,23 +25,23 @@ 
 class Table extends Element 
 {
     /** @var \UIComponents\Template\Template $template */
-	public $template = null;
+    public $template = null;
 
-	/** @var array $data */
-	public $data = array();
+    /** @var array $data */
+    public $data = array();
 
-	/** @var array $options */
-	public $options = array();
+    /** @var array $options */
+    public $options = array();
 
-	/** @var array $tags */
-	public $tags = array(
-		"container" =>	"table",
-		"row"		=>	"tr",
-		"cell"		=>	"td",
-		"headcell"	=>	"th"
-	);
+    /** @var array $tags */
+    public $tags = array(
+        "container" =>	"table",
+        "row"		=>	"tr",
+        "cell"		=>	"td",
+        "headcell"	=>	"th"
+    );
 	
-	/**
+    /**
      * View helper entry point:
      * Retrieves helper and optionally sets component options to operate on
      *
@@ -106,235 +106,235 @@ 
      */
     public function render()
     {
-    	return $this->buildMarkup();
+        return $this->buildMarkup();
     }
     
-	/**
-	 * generate table header HTML
-	 * @param mixed $aHTMLTableColumns
-	 * @return self
-	 */
-	public function buildHeaderCells ($aHTMLTableColumns) {
-		$sHTMLTableHeader = "";
-		$sHTMLTableColumnGroup = "";
-		$aColumns = array();
-		foreach ((array)$aHTMLTableColumns as $iColumn => $aColumn) {
-			if ($aColumn["field"]) {
-				$aColumns[] = $aColumn["field"];
-				$sHTMLTableHeader .= "<".$this->tags->headcell." class=\"".$aColumn["field"]."\">".$aColumn["title"]."</".$this->tags->headcell.">";
-				$sHTMLTableColumnGroup .= "<column class=\"".$aColumn["field"]."\" />";
-			} else {
-				$sHTMLTableHeader .= "<".$this->tags->headcell." class=\"col_".$iColumn."\">".$aColumn["title"]."</".$this->tags->headcell.">";
-				$sHTMLTableColumnGroup .= "<column class=\"col_".$iColumn."\" />";
-			}
-		}
-		$this->getTemplate()->set('s', 'HEADERCELLS', $sHTMLTableHeader);
-		$this->getTemplate()->set('s', 'COLUMNGROUP', "<columns>".$sHTMLTableColumnGroup."</columns>");
-		return ($this);
-	}
+    /**
+     * generate table header HTML
+     * @param mixed $aHTMLTableColumns
+     * @return self
+     */
+    public function buildHeaderCells ($aHTMLTableColumns) {
+        $sHTMLTableHeader = "";
+        $sHTMLTableColumnGroup = "";
+        $aColumns = array();
+        foreach ((array)$aHTMLTableColumns as $iColumn => $aColumn) {
+            if ($aColumn["field"]) {
+                $aColumns[] = $aColumn["field"];
+                $sHTMLTableHeader .= "<".$this->tags->headcell." class=\"".$aColumn["field"]."\">".$aColumn["title"]."</".$this->tags->headcell.">";
+                $sHTMLTableColumnGroup .= "<column class=\"".$aColumn["field"]."\" />";
+            } else {
+                $sHTMLTableHeader .= "<".$this->tags->headcell." class=\"col_".$iColumn."\">".$aColumn["title"]."</".$this->tags->headcell.">";
+                $sHTMLTableColumnGroup .= "<column class=\"col_".$iColumn."\" />";
+            }
+        }
+        $this->getTemplate()->set('s', 'HEADERCELLS', $sHTMLTableHeader);
+        $this->getTemplate()->set('s', 'COLUMNGROUP', "<columns>".$sHTMLTableColumnGroup."</columns>");
+        return ($this);
+    }
 		
-	/**
-	 * generate table footer HTML
-	 * @param mixed $aHTMLTableColumns
-	 * @return self
-	 */
-	public function buildFooterCells ($aHTMLTableColumns) {
-		$sHTMLTableFooter = "";
-		$aColumns = array();
-		foreach ((array)$aHTMLTableColumns as $iColumn => $aColumn) {
-			if ($aColumn["field"]) {
-				$aColumns[] = $aColumn["field"];
-				$sHTMLTableFooter .= "<".$this->tags->cell." class=\"".$aColumn["field"]."\">".$aColumn["title"]."</".$this->tags->cell.">";
-			} else {
-				$sHTMLTableFooter .= "<".$this->tags->cell." class=\"col_".$iColumn."\">".$aColumn["title"]."</".$this->tags->cell.">";
-			}
-		}
-		$this->getTemplate()->set('s', 'FOOTERCELLS', $sHTMLTableFooter);
-		return ($this);
-	}
+    /**
+     * generate table footer HTML
+     * @param mixed $aHTMLTableColumns
+     * @return self
+     */
+    public function buildFooterCells ($aHTMLTableColumns) {
+        $sHTMLTableFooter = "";
+        $aColumns = array();
+        foreach ((array)$aHTMLTableColumns as $iColumn => $aColumn) {
+            if ($aColumn["field"]) {
+                $aColumns[] = $aColumn["field"];
+                $sHTMLTableFooter .= "<".$this->tags->cell." class=\"".$aColumn["field"]."\">".$aColumn["title"]."</".$this->tags->cell.">";
+            } else {
+                $sHTMLTableFooter .= "<".$this->tags->cell." class=\"col_".$iColumn."\">".$aColumn["title"]."</".$this->tags->cell.">";
+            }
+        }
+        $this->getTemplate()->set('s', 'FOOTERCELLS', $sHTMLTableFooter);
+        return ($this);
+    }
 	
-	/**
-	 * generate table body HTML
-	 * @param array $aRowData
-	 * @param mixed $aHTMLTableColumns
-	 * @return array
-	 */
-	public function buildBodyCells ($aRowData, $aHTMLTableColumns) {
-		$aRows = array();
-		foreach ( (array)$aRowData as $iRow => $oRowData ) {
-			$sCells = "";
-			foreach ((array)$aHTMLTableColumns as $iColumn => $aColumn) {
-				$mCellValue = $oRowData[$aColumn["field"]];
-				if (!empty($aColumn["callback"]) && function_exists($aColumn["callback"])) {
-					$mCellValue = call_user_func($aColumn["callback"], $oRowData, $aColumn, $iColumn, $iRow);
-				}
-				if ( isset($aColumn["field"]) && isset($oRowData[$aColumn["field"]]) ) {
-					$sClassname = $aColumn["field"];
-				} else {
-					$sClassname = "col_".$iColumn;
-				}
-				$sCells .= "<".$this->tags->cell." class=\"".$sClassname."\">".
-					$mCellValue.
-				"</".$this->tags->cell.">";
-			}
+    /**
+     * generate table body HTML
+     * @param array $aRowData
+     * @param mixed $aHTMLTableColumns
+     * @return array
+     */
+    public function buildBodyCells ($aRowData, $aHTMLTableColumns) {
+        $aRows = array();
+        foreach ( (array)$aRowData as $iRow => $oRowData ) {
+            $sCells = "";
+            foreach ((array)$aHTMLTableColumns as $iColumn => $aColumn) {
+                $mCellValue = $oRowData[$aColumn["field"]];
+                if (!empty($aColumn["callback"]) && function_exists($aColumn["callback"])) {
+                    $mCellValue = call_user_func($aColumn["callback"], $oRowData, $aColumn, $iColumn, $iRow);
+                }
+                if ( isset($aColumn["field"]) && isset($oRowData[$aColumn["field"]]) ) {
+                    $sClassname = $aColumn["field"];
+                } else {
+                    $sClassname = "col_".$iColumn;
+                }
+                $sCells .= "<".$this->tags->cell." class=\"".$sClassname."\">".
+                    $mCellValue.
+                "</".$this->tags->cell.">";
+            }
 			
-			$aRows[] = $sCells;
-		}
+            $aRows[] = $sCells;
+        }
 		
-		foreach ($aRows as $iRow => $sRow) {
-			$this->getTemplate()->set('d', 'ROWID', "row_".$aRowData[$iRow]["productID"]);
-			$this->getTemplate()->set('d', 'BODYCELLS', $sRow);
-			if (($iRow % 2) == 0) {
-				$this->getTemplate()->set('d', 'CSS_CLASS', 'even');
-			} else {
-				$this->getTemplate()->set('d', 'CSS_CLASS', 'odd');
-			}
-			$this->getTemplate()->next();
+        foreach ($aRows as $iRow => $sRow) {
+            $this->getTemplate()->set('d', 'ROWID', "row_".$aRowData[$iRow]["productID"]);
+            $this->getTemplate()->set('d', 'BODYCELLS', $sRow);
+            if (($iRow % 2) == 0) {
+                $this->getTemplate()->set('d', 'CSS_CLASS', 'even');
+            } else {
+                $this->getTemplate()->set('d', 'CSS_CLASS', 'odd');
+            }
+            $this->getTemplate()->next();
 		
-		}
-	}
+        }
+    }
 	
-	/**
-	 * generate mini table mark-up template
-	 * @return string
-	 */
-	public function buildMarkupTemplate () {
-		$aHTML = array(
-			"<".$this->tags->container.">",
-				"<".$this->tags->row.">",
-					"{HEADERCELLS}",
-				"</".$this->tags->row.">",
-					"<!-- BEGIN:BLOCK -->",
-						"<".$this->tags->row.">",
-							"{BODYCELLS}",
-						"</".$this->tags->row.">",
-					"<!-- END:BLOCK -->",
-				"<".$this->tags->row.">",
-					"{FOOTERCELLS}",
-				"</".$this->tags->row.">",
-			"</".$this->tags->container.">"
-		);
-		$sHTML = implode("", $aHTML);
-		return $sHTML;
-	}
+    /**
+     * generate mini table mark-up template
+     * @return string
+     */
+    public function buildMarkupTemplate () {
+        $aHTML = array(
+            "<".$this->tags->container.">",
+                "<".$this->tags->row.">",
+                    "{HEADERCELLS}",
+                "</".$this->tags->row.">",
+                    "<!-- BEGIN:BLOCK -->",
+                        "<".$this->tags->row.">",
+                            "{BODYCELLS}",
+                        "</".$this->tags->row.">",
+                    "<!-- END:BLOCK -->",
+                "<".$this->tags->row.">",
+                    "{FOOTERCELLS}",
+                "</".$this->tags->row.">",
+            "</".$this->tags->container.">"
+        );
+        $sHTML = implode("", $aHTML);
+        return $sHTML;
+    }
 	
-	/**
-	 * generate table mark-up
-	 * @return string
-	 */
-	public function buildMarkup () {
-		$sHTML = "";
+    /**
+     * generate table mark-up
+     * @return string
+     */
+    public function buildMarkup () {
+        $sHTML = "";
 		
-		$sTableID = $this->getOptions("formID");
-		if (!$sTableID) {
-			$sTableID = "table" . md5(microtime());
-			$this->options["formID"] = $sTableID;
-		}
+        $sTableID = $this->getOptions("formID");
+        if (!$sTableID) {
+            $sTableID = "table" . md5(microtime());
+            $this->options["formID"] = $sTableID;
+        }
 		
-		$this->getTemplate()->reset();
-		$this->getTemplate()->set('s', 'TABLEID',			$sTableID );
-		$this->buildHeaderCells( $this->getOptions("columns") );
-		$this->buildFooterCells( $this->getOptions("footer") );
-		$this->buildBodyCells( $this->getData(), $this->getOptions("columns") );
-		$sTemplate = $this->getOptions("template");
-		if ($sTemplate == "") {
-			$sTemplate = $this->buildMarkupTemplate();
-		}
-		$sHTML = $this->getTemplate()->generate( $sTemplate, true );
-		return $sHTML;
-	}
+        $this->getTemplate()->reset();
+        $this->getTemplate()->set('s', 'TABLEID',			$sTableID );
+        $this->buildHeaderCells( $this->getOptions("columns") );
+        $this->buildFooterCells( $this->getOptions("footer") );
+        $this->buildBodyCells( $this->getData(), $this->getOptions("columns") );
+        $sTemplate = $this->getOptions("template");
+        if ($sTemplate == "") {
+            $sTemplate = $this->buildMarkupTemplate();
+        }
+        $sHTML = $this->getTemplate()->generate( $sTemplate, true );
+        return $sHTML;
+    }
 	
-	/**
-	 * generate table JSON data
-	 * @return string
-	 */
-	public function buildData () {
-		$sJSON = "[]";
-		if (!empty($this->data)) {
-			$sJSON = json_encode($this->data);
-		}
-		return $sJSON;
-	}
+    /**
+     * generate table JSON data
+     * @return string
+     */
+    public function buildData () {
+        $sJSON = "[]";
+        if (!empty($this->data)) {
+            $sJSON = json_encode($this->data);
+        }
+        return $sJSON;
+    }
 	
-	/**
-	 * return template object
-	 * @return Template
-	 */
-	public function getTemplate() {
-		if ($this->template == null) {
-			$this->setTemplate();
-		}
-		return $this->template;
-	}
+    /**
+     * return template object
+     * @return Template
+     */
+    public function getTemplate() {
+        if ($this->template == null) {
+            $this->setTemplate();
+        }
+        return $this->template;
+    }
 
-	/**
-	 * generate template object
-	 * @param Template $template
-	 * @return ProductTable
-	 */
-	public function setTemplate( $template = null ) {
-		if ($template == null) {
-			$this->template = new Template;
-		} else {
-			$this->template = $template;
-		}
-		return ($this);
-	}
+    /**
+     * generate template object
+     * @param Template $template
+     * @return ProductTable
+     */
+    public function setTemplate( $template = null ) {
+        if ($template == null) {
+            $this->template = new Template;
+        } else {
+            $this->template = $template;
+        }
+        return ($this);
+    }
 	
-	/**
-	 * return table data
-	 * @return mixed
-	 */
-	public function getData() {
-		return $this->data;
-	}
+    /**
+     * return table data
+     * @return mixed
+     */
+    public function getData() {
+        return $this->data;
+    }
 
-	/**
-	 * set new table data
-	 * @param mixed $data
-	 * @return ProductTable
-	 */
-	public function setData( $data = null) {
-		if ( is_array($data) ) {
-			$this->data = $data;
-		}
-		return $this;
-	}
+    /**
+     * set new table data
+     * @param mixed $data
+     * @return ProductTable
+     */
+    public function setData( $data = null) {
+        if ( is_array($data) ) {
+            $this->data = $data;
+        }
+        return $this;
+    }
 
-	/**
-	 * return option by key or complete option set
-	 * @param	string $key	
-	 * @return	mixed
-	 */
-	public function getOptions( $key = "" ) {
-		if ( !empty($key) ) { 
-			if ( isset($this->options[$key]) ) {
-				return $this->options[$key];
-			} else {
-				return false;
-			}
-		}
-		return $this->options;
-	}
+    /**
+     * return option by key or complete option set
+     * @param	string $key	
+     * @return	mixed
+     */
+    public function getOptions( $key = "" ) {
+        if ( !empty($key) ) { 
+            if ( isset($this->options[$key]) ) {
+                return $this->options[$key];
+            } else {
+                return false;
+            }
+        }
+        return $this->options;
+    }
 
-	/**
-	 * @param object|array $options
-	 * @return ProductTable
-	 */
-	public function setOptions($options) {
-		if ( is_array($options) ) {
-			$this->options = $options;
-		} else if ( is_object($options) ) {
-			$this->options = (array)$options;
-		} else {
-			throw new \Exception("invalid table options");
-		}
-		if ( isset($this->options["data"]) ) {
-			$this->setData($this->getOptions("data"));
-			unset( $this->options->data );
-		}
-		return $this;
-	}
+    /**
+     * @param object|array $options
+     * @return ProductTable
+     */
+    public function setOptions($options) {
+        if ( is_array($options) ) {
+            $this->options = $options;
+        } else if ( is_object($options) ) {
+            $this->options = (array)$options;
+        } else {
+            throw new \Exception("invalid table options");
+        }
+        if ( isset($this->options["data"]) ) {
+            $this->setData($this->getOptions("data"));
+            unset( $this->options->data );
+        }
+        return $this;
+    }
 
 
 }
\ No newline at end of file

module/UIComponents/src/UIComponents/View/Helper/Components/PluginManager.php

Indentation +13 added lines, -13 removed lines

@@ -33,8 +33,8 @@ 
      */
     protected $invokableClasses = [
 
-    	// panels
-    	//
+        // panels
+        //
         'element'              => 'UIComponents\View\Helper\Components\Element',
         'block'             => 'UIComponents\View\Helper\Components\Block',
         //'well'              => 'UIComponents\View\Helper\Components\Well',
@@ -43,33 +43,33 @@ 
         'widget'            => 'UIComponents\View\Helper\Components\Widget',
         'dashboard'         => 'UIComponents\View\Helper\Components\Dashboard',
 
-    	// page components
-    	//
+        // page components
+        //
         'nav'               => 'UIComponents\View\Helper\Components\Navbar', // set 'alias to' or combine with 'Navbars' !
         'topbar'            => 'UIComponents\View\Helper\Components\Navbar', // set 'alias to' or combine with 'Navbars' !
         'breadcrumbs'       => 'UIComponents\View\Helper\Components\Breadcrumbs',
         'languagemenu'      => 'UIComponents\View\Helper\Components\Languagemenu',
-    	'toolbar'           => 'UIComponents\View\Helper\Components\Toolbar',
+        'toolbar'           => 'UIComponents\View\Helper\Components\Toolbar',
 
         // controls
         //
         'button'            => 'UIComponents\View\Helper\Components\Button', // default, drop-down/up, splitted
         'buttongroup'       => 'UIComponents\View\Helper\Components\Buttongroup',
-    	//'inputgroup'        => 'UIComponents\View\Helper\Components\Inputgroup',
+        //'inputgroup'        => 'UIComponents\View\Helper\Components\Inputgroup',
         //'progressbar'       => 'UIComponents\View\Helper\Components\Progressbar',
 
-    	// forms
-    	//
+        // forms
+        //
         'formgroup'         => 'UIComponents\View\Helper\Components\Formgroup',
 
-    	// lists/tables
-    	//
+        // lists/tables
+        //
         //'listgroup'         => 'UIComponents\View\Helper\Components\Listgroup',
         'table'         	=> 'UIComponents\View\Helper\Components\Listgroup',
-    	//'pagination'        => 'UIComponents\View\Helper\Components\Pagination',
+        //'pagination'        => 'UIComponents\View\Helper\Components\Pagination',
 
-    	// widgets
-    	//
+        // widgets
+        //
         //'label'             => 'UIComponents\View\Helper\Components\Label',
         //'badge'             => 'UIComponents\View\Helper\Components\Badge',
         //'pageheader'        => 'UIComponents\View\Helper\Components\Pageheader',

module/UIComponents/src/UIComponents/View/Helper/AbstractProxyHelper.php

Indentation +23 added lines, -23 removed lines

@@ -235,29 +235,29 @@
      */
     protected function inject(\Zend\View\Helper\AbstractHelper $helper)
     {
-		if (
-			($helper instanceof \UIComponents\View\Helper\AbstractHelper) ||
-			($helper instanceof \UIComponents\View\Helper\Navigation\Menu)
-		) {
-	        if ($this->getInjectContainer() && !$helper->hasContainer()) {
-	            $helper->setContainer($this->getContainer());
-	        }
-
-	        if ($this->getInjectAcl()) {
-	            if (!$helper->hasAcl()) {
-	                $helper->setAcl($this->getAcl());
-	            }
-	            if (!$helper->hasRole()) {
-	                $helper->setRole($this->getRole());
-	            }
-	        }
-	        if ($this->getInjectTranslator() && !$helper->hasTranslator()) {
-	            $helper->setTranslator(
-	                $this->getTranslator(),
-	                $this->getTranslatorTextDomain()
-	            );
-	        }
-		}
+        if (
+            ($helper instanceof \UIComponents\View\Helper\AbstractHelper) ||
+            ($helper instanceof \UIComponents\View\Helper\Navigation\Menu)
+        ) {
+            if ($this->getInjectContainer() && !$helper->hasContainer()) {
+                $helper->setContainer($this->getContainer());
+            }
+
+            if ($this->getInjectAcl()) {
+                if (!$helper->hasAcl()) {
+                    $helper->setAcl($this->getAcl());
+                }
+                if (!$helper->hasRole()) {
+                    $helper->setRole($this->getRole());
+                }
+            }
+            if ($this->getInjectTranslator() && !$helper->hasTranslator()) {
+                $helper->setTranslator(
+                    $this->getTranslator(),
+                    $this->getTranslatorTextDomain()
+                );
+            }
+        }
     }
 
     /**

module/Admin/src/Admin/Controller/UsersController.php

Indentation +9 added lines, -9 removed lines

@@ -26,15 +26,15 @@
 class UsersController extends BaseActionController
 {
 
-	/**
-	 * @var array|\Admin\Model\UserTable
-	 */
-	protected $userTable;
-
-	/**
-	 * @var array|\Admin\Model\AclroleTable
-	 */
-	protected $AclroleTable;
+    /**
+     * @var array|\Admin\Model\UserTable
+     */
+    protected $userTable;
+
+    /**
+     * @var array|\Admin\Model\AclroleTable
+     */
+    protected $AclroleTable;
 
     /**
      * initialize titles and toolbar items

module/UIComponents/src/UIComponents/View/Helper/Navigation/Menu.php

Indentation +6 added lines, -6 removed lines

@@ -29,8 +29,8 @@ 
  */
 class Menu extends \Zend\View\Helper\Navigation\Menu
 {
-	use ComponentClassnamesTrait;
-	use ComponentAttributesTrait;
+    use ComponentClassnamesTrait;
+    use ComponentAttributesTrait;
 
     /**
      * default CSS class to use for li elements
@@ -353,10 +353,10 @@ 
      */
     public function findActive($container = null, $minDepth = null, $maxDepth = -1)
     {
-    	if ( null == $container ) {
-    		$container = $this->getContainer();
-    	}
-    	return parent::findActive($container, $minDepth, $maxDepth);
+        if ( null == $container ) {
+            $container = $this->getContainer();
+        }
+        return parent::findActive($container, $minDepth, $maxDepth);
     }
     
     /**