bb-drummer / my-application

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

Doc Comments +3 added lines, -3 removed lines

@@ -270,7 +270,7 @@ 
 	/**
 	 * generate template object
 	 * @param Template $template
-	 * @return ProductTable
+	 * @return Table
 	 */
 	public function setTemplate( $template = null ) {
 		if ($template == null) {
@@ -292,7 +292,7 @@ 
 	/**
 	 * set new table data
 	 * @param mixed $data
-	 * @return ProductTable
+	 * @return Table
 	 */
 	public function setData( $data = null) {
 		if ( is_array($data) ) {
@@ -319,7 +319,7 @@ 
 
 	/**
 	 * @param object|array $options
-	 * @return ProductTable
+	 * @return Table
 	 */
 	public function setOptions($options) {
 		if ( is_array($options) ) {

Indentation +224 added lines, -224 removed lines

@@ -25,23 +25,23 @@ 
 class Table extends Void 
 {
     /** @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

Spacing +35 added lines, -35 removed lines

@@ -51,16 +51,16 @@ 
      */
     public function __invoke($config = array(), $options = array())
     {
-        if ( is_object($options) && method_exists($options, 'toArray') ) {
+        if (is_object($options) && method_exists($options, 'toArray')) {
             $options = $options->toArray();
-        } else if ( is_object($options) ) {
-            $options = (array)$options;
+        } else if (is_object($options)) {
+            $options = (array) $options;
         }
         
-        if ( is_object($config) && method_exists($config, 'toArray') ) {
+        if (is_object($config) && method_exists($config, 'toArray')) {
             $config = $config->toArray();
-        } else if ( is_object($options) ) {
-            $config = (array)$config;
+        } else if (is_object($options)) {
+            $config = (array) $config;
         }
         
         $this->setOptions($config);
@@ -93,7 +93,7 @@ 
             $this->setContent($options['children']);
         }
         
-        $this->tags = (object)$this->tags;
+        $this->tags = (object) $this->tags;
         
         $component = clone $this;
         return $component;
@@ -114,11 +114,11 @@ 
 	 * @param mixed $aHTMLTableColumns
 	 * @return self
 	 */
-	public function buildHeaderCells ($aHTMLTableColumns) {
+	public function buildHeaderCells($aHTMLTableColumns) {
 		$sHTMLTableHeader = "";
 		$sHTMLTableColumnGroup = "";
 		$aColumns = array();
-		foreach ((array)$aHTMLTableColumns as $iColumn => $aColumn) {
+		foreach ((array) $aHTMLTableColumns as $iColumn => $aColumn) {
 			if ($aColumn["field"]) {
 				$aColumns[] = $aColumn["field"];
 				$sHTMLTableHeader .= "<".$this->tags->headcell." class=\"".$aColumn["field"]."\">".$aColumn["title"]."</".$this->tags->headcell.">";
@@ -138,10 +138,10 @@ 
 	 * @param mixed $aHTMLTableColumns
 	 * @return self
 	 */
-	public function buildFooterCells ($aHTMLTableColumns) {
+	public function buildFooterCells($aHTMLTableColumns) {
 		$sHTMLTableFooter = "";
 		$aColumns = array();
-		foreach ((array)$aHTMLTableColumns as $iColumn => $aColumn) {
+		foreach ((array) $aHTMLTableColumns as $iColumn => $aColumn) {
 			if ($aColumn["field"]) {
 				$aColumns[] = $aColumn["field"];
 				$sHTMLTableFooter .= "<".$this->tags->cell." class=\"".$aColumn["field"]."\">".$aColumn["title"]."</".$this->tags->cell.">";
@@ -159,16 +159,16 @@ 
 	 * @param mixed $aHTMLTableColumns
 	 * @return array
 	 */
-	public function buildBodyCells ($aRowData, $aHTMLTableColumns) {
+	public function buildBodyCells($aRowData, $aHTMLTableColumns) {
 		$aRows = array();
-		foreach ( (array)$aRowData as $iRow => $oRowData ) {
+		foreach ((array) $aRowData as $iRow => $oRowData) {
 			$sCells = "";
-			foreach ((array)$aHTMLTableColumns as $iColumn => $aColumn) {
+			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"]]) ) {
+				if (isset($aColumn["field"]) && isset($oRowData[$aColumn["field"]])) {
 					$sClassname = $aColumn["field"];
 				} else {
 					$sClassname = "col_".$iColumn;
@@ -198,7 +198,7 @@ 
 	 * generate mini table mark-up template
 	 * @return string
 	 */
-	public function buildMarkupTemplate () {
+	public function buildMarkupTemplate() {
 		$aHTML = array(
 			"<".$this->tags->container.">",
 				"<".$this->tags->row.">",
@@ -222,25 +222,25 @@ 
 	 * generate table mark-up
 	 * @return string
 	 */
-	public function buildMarkup () {
+	public function buildMarkup() {
 		$sHTML = "";
 		
 		$sTableID = $this->getOptions("formID");
 		if (!$sTableID) {
-			$sTableID = "table" . md5(microtime());
+			$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") );
+		$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 );
+		$sHTML = $this->getTemplate()->generate($sTemplate, true);
 		return $sHTML;
 	}
 	
@@ -248,7 +248,7 @@ 
 	 * generate table JSON data
 	 * @return string
 	 */
-	public function buildData () {
+	public function buildData() {
 		$sJSON = "[]";
 		if (!empty($this->data)) {
 			$sJSON = json_encode($this->data);
@@ -272,7 +272,7 @@ 
 	 * @param Template $template
 	 * @return ProductTable
 	 */
-	public function setTemplate( $template = null ) {
+	public function setTemplate($template = null) {
 		if ($template == null) {
 			$this->template = new Template;
 		} else {
@@ -294,8 +294,8 @@ 
 	 * @param mixed $data
 	 * @return ProductTable
 	 */
-	public function setData( $data = null) {
-		if ( is_array($data) ) {
+	public function setData($data = null) {
+		if (is_array($data)) {
 			$this->data = $data;
 		}
 		return $this;
@@ -306,9 +306,9 @@ 
 	 * @param	string $key	
 	 * @return	mixed
 	 */
-	public function getOptions( $key = "" ) {
-		if ( !empty($key) ) { 
-			if ( isset($this->options[$key]) ) {
+	public function getOptions($key = "") {
+		if (!empty($key)) { 
+			if (isset($this->options[$key])) {
 				return $this->options[$key];
 			} else {
 				return false;
@@ -322,16 +322,16 @@ 
 	 * @return ProductTable
 	 */
 	public function setOptions($options) {
-		if ( is_array($options) ) {
+		if (is_array($options)) {
 			$this->options = $options;
-		} else if ( is_object($options) ) {
-			$this->options = (array)$options;
+		} else if (is_object($options)) {
+			$this->options = (array) $options;
 		} else {
 			throw new \Exception("invalid table options");
 		}
-		if ( isset($this->options["data"]) ) {
+		if (isset($this->options["data"])) {
 			$this->setData($this->getOptions("data"));
-			unset( $this->options->data );
+			unset($this->options->data);
 		}
 		return $this;
 	}

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

Doc Comments +1 added lines, -1 removed lines

@@ -220,7 +220,7 @@
     //
     
     /**
-     * @return the $tagname
+     * @return string $tagname
      */
     public function getTagname() {
         return $this->tagname;

Spacing +18 added lines, -19 removed lines

@@ -97,7 +97,7 @@ 
         $escaper = $this->view->plugin('escapeHtmlAttr');
 
         if ($found) {
-            $foundPage    = $found['page'];
+            $foundPage = $found['page'];
             $foundDepth = $found['depth'];
         } else {
             $foundPage = null;
@@ -146,28 +146,27 @@ 
 
             // make sure indentation is correct
             $depth -= $minDepth;
-            $myIndent = $indent . str_repeat('    ', $depth);
+            $myIndent = $indent.str_repeat('    ', $depth);
 
             if ($depth > $prevDepth) {
                 // start new ul tag
-                $ulClass = '' . 
-                    ($depth == 0 ? $this->getUlClass() : 
-                            ($depth == 1 ? $this->getSubUlClassLevel1() : $this->getSubUlClass())
-                    ) . 
-                    ' level_' . $depth . 
+                $ulClass = ''. 
+                    ($depth == 0 ? $this->getUlClass() : ($depth == 1 ? $this->getSubUlClassLevel1() : $this->getSubUlClass())
+                    ). 
+                    ' level_'.$depth. 
                 '';
-                if ($ulClass && $depth ==    0) {
-                    $ulClass = ' class="' . $escaper($ulClass) . '"';
+                if ($ulClass && $depth == 0) {
+                    $ulClass = ' class="'.$escaper($ulClass).'"';
                 } else {
-                    $ulClass = ' class="' . $escaper($ulClass) . '"';
+                    $ulClass = ' class="'.$escaper($ulClass).'"';
                 }
-                $html .= $myIndent . '<' . $this->getTagname() . $ulClass . '>' . PHP_EOL;
+                $html .= $myIndent.'<'.$this->getTagname().$ulClass.'>'.PHP_EOL;
             } elseif ($prevDepth > $depth) {
                 // close li/ul tags until we're at current depth
                 for ($i = $prevDepth; $i > $depth; $i--) {
-                    $ind = $indent . str_repeat('        ', $i);
+                    $ind = $indent.str_repeat('        ', $i);
                     //$html .= $ind . '    </li>' . PHP_EOL;
-                    $html .= $ind . '</' . $this->getTagname() . '>' . PHP_EOL;
+                    $html .= $ind.'</'.$this->getTagname().'>'.PHP_EOL;
                 }
                 // close previous li tag
                 //$html .= $myIndent . '    </li>' . PHP_EOL;
@@ -193,10 +192,10 @@ 
             if ($addClassToListItem && $page->getClass()) {
                 $liClasses[] = $page->getClass();
             }
-            $liClass = empty($liClasses) ? '' : ' class="' . $escaper(implode(' ', $liClasses)) . '"';
+            $liClass = empty($liClasses) ? '' : ' class="'.$escaper(implode(' ', $liClasses)).'"';
 
             $html .= /* $myIndent . '    <li' . $liClass . '>' . PHP_EOL
-                . */ $myIndent . '        ' . $this->htmlify($page, $escapeLabels, $addClassToListItem) . PHP_EOL;
+                . */ $myIndent.'        '.$this->htmlify($page, $escapeLabels, $addClassToListItem).PHP_EOL;
 
             // store as previous depth for next iteration
             $prevDepth = $depth;
@@ -204,10 +203,10 @@ 
 
         if ($html) {
             // done iterating container; close open ul/li tags
-            for ($i = $prevDepth+1; $i > 0; $i--) {
-                $myIndent = $indent . str_repeat('        ', $i-1);
+            for ($i = $prevDepth + 1; $i > 0; $i--) {
+                $myIndent = $indent.str_repeat('        ', $i - 1);
                 $html .= /*$myIndent . '    </li>' . PHP_EOL
-                    . */ $myIndent . '</' . $this->getTagname() . '>' . PHP_EOL;
+                    . */ $myIndent.'</'.$this->getTagname().'>'.PHP_EOL;
             }
             $html = rtrim($html, PHP_EOL);
         }
@@ -230,7 +229,7 @@ 
      * @param string $tagname
      */
     public function setTagname($tagname) {
-        if ( null !== $tagname ) {
+        if (null !== $tagname) {
             $this->tagname = $tagname;
         }
         return $this;

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

Doc Comments +9 added lines, -9 removed lines

@@ -113,7 +113,7 @@ 
      * If no container is set, a new container will be instantiated and
      * stored in the helper.
      *
-     * @return Navigation\AbstractContainer    navigation container
+     * @return AbstractContainer    navigation container
      */
     public function getContainer()
     {
@@ -338,7 +338,7 @@ 
      *                                          {@link getMinDepth()}. A
      *                                          null value means no minimum
      *                                          depth required.
-     * @param  int|null             $maxDepth   [optional] maximum depth
+     * @param  integer             $maxDepth   [optional] maximum depth
      *                                          a page can have to be
      *                                          valid. Default is to use
      *                                          {@link getMaxDepth()}. A
@@ -479,7 +479,7 @@ 
     }
     
     /**
-     * @return the $defaultLiClass
+     * @return string $defaultLiClass
      */
     public function getDefaultLiClass() {
         return $this->defaultLiClass;
@@ -494,7 +494,7 @@ 
     }
 
     /**
-     * @return the $subUlClass
+     * @return string $subUlClass
      */
     public function getSubUlClass() {
         return $this->subUlClass;
@@ -509,7 +509,7 @@ 
     }
 
     /**
-     * @return the $subUlClassLevel1
+     * @return string $subUlClassLevel1
      */
     public function getSubUlClassLevel1() {
         return $this->subUlClassLevel1;
@@ -524,7 +524,7 @@ 
     }
 
     /**
-     * @return the $subLiClass
+     * @return string $subLiClass
      */
     public function getSubLiClass() {
         return $this->subLiClass;
@@ -539,7 +539,7 @@ 
     }
 
     /**
-     * @return the $subLiClassLevel0
+     * @return string $subLiClassLevel0
      */
     public function getSubLiClassLevel0() {
         return $this->subLiClassLevel0;
@@ -554,7 +554,7 @@ 
     }
     
     /**
-     * @return the $iconPrefixClass
+     * @return string $iconPrefixClass
      */
     public function getIconPrefixClass() {
         return $this->iconPrefixClass;
@@ -569,7 +569,7 @@ 
     }
     
     /**
-     * @return the $hrefSubToggleOverride
+     * @return string $hrefSubToggleOverride
      */
     public function getHrefSubToggleOverride() {
         return $this->hrefSubToggleOverride;

Indentation +6 added lines, -6 removed lines

@@ -27,8 +27,8 @@ 
  */
 class Menu extends \Zend\View\Helper\Navigation\Menu
 {
-	use \UIComponents\View\Helper\Traits\ComponentClassnamesTrait;
-	use \UIComponents\View\Helper\Traits\ComponentAttributesTrait;
+    use \UIComponents\View\Helper\Traits\ComponentClassnamesTrait;
+    use \UIComponents\View\Helper\Traits\ComponentAttributesTrait;
 
     /**
      * default CSS class to use for li elements
@@ -351,10 +351,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);
     }
     
     /**

Spacing +28 added lines, -29 removed lines

@@ -210,7 +210,7 @@ 
         $escaper = $this->view->plugin('escapeHtmlAttr');
 
         if ($found) {
-            $foundPage    = $found['page'];
+            $foundPage = $found['page'];
             $foundDepth = $found['depth'];
         } else {
             $foundPage = null;
@@ -259,34 +259,33 @@ 
 
             // make sure indentation is correct
             $depth -= $minDepth;
-            $myIndent = $indent . str_repeat('    ', $depth);
+            $myIndent = $indent.str_repeat('    ', $depth);
             $attributes = $this->getAttributes();
             if ($depth > $prevDepth) {
                 // start new ul tag
-                $ulClass = '' . 
-                    ($depth == 0 ? $this->getUlClass() : 
-                            ($depth == 1 ? $this->getSubUlClassLevel1() : $this->getSubUlClass())
-                    ) . 
-                    ' level_' . $depth . 
+                $ulClass = ''. 
+                    ($depth == 0 ? $this->getUlClass() : ($depth == 1 ? $this->getSubUlClassLevel1() : $this->getSubUlClass())
+                    ). 
+                    ' level_'.$depth. 
                 '';
-                if ($ulClass && $depth ==    0) {
-                    $ulClass = ' class="' . $escaper($ulClass) . '"';
+                if ($ulClass && $depth == 0) {
+                    $ulClass = ' class="'.$escaper($ulClass).'"';
                 } else {
-                    $ulClass = ' class="' . $escaper($ulClass) . '"';
+                    $ulClass = ' class="'.$escaper($ulClass).'"';
                 }
-                $html .= $myIndent . '<ul' . $ulClass . ' '.($depth == 0 ? $this->htmlAttribs($attributes) : '').'>' . PHP_EOL;
+                $html .= $myIndent.'<ul'.$ulClass.' '.($depth == 0 ? $this->htmlAttribs($attributes) : '').'>'.PHP_EOL;
             } elseif ($prevDepth > $depth) {
                 // close li/ul tags until we're at current depth
                 for ($i = $prevDepth; $i > $depth; $i--) {
-                    $ind = $indent . str_repeat('        ', $i);
-                    $html .= $ind . '    </li>' . PHP_EOL;
-                    $html .= $ind . '</ul>' . PHP_EOL;
+                    $ind = $indent.str_repeat('        ', $i);
+                    $html .= $ind.'    </li>'.PHP_EOL;
+                    $html .= $ind.'</ul>'.PHP_EOL;
                 }
                 // close previous li tag
-                $html .= $myIndent . '    </li>' . PHP_EOL;
+                $html .= $myIndent.'    </li>'.PHP_EOL;
             } else {
                 // close previous li tag
-                $html .= $myIndent . '    </li>' . PHP_EOL;
+                $html .= $myIndent.'    </li>'.PHP_EOL;
             }
 
             // render li tag and page
@@ -306,10 +305,10 @@ 
             if ($addClassToListItem && $page->getClass()) {
                 $liClasses[] = $page->getClass();
             }
-            $liClass = empty($liClasses) ? '' : ' class="' . $escaper(implode(' ', $liClasses)) . '"';
+            $liClass = empty($liClasses) ? '' : ' class="'.$escaper(implode(' ', $liClasses)).'"';
 
-            $html .= $myIndent . '    <li' . $liClass . '>' . PHP_EOL
-                . $myIndent . '        ' . $this->htmlify($page, $escapeLabels, $addClassToListItem) . PHP_EOL;
+            $html .= $myIndent.'    <li'.$liClass.'>'.PHP_EOL
+                . $myIndent.'        '.$this->htmlify($page, $escapeLabels, $addClassToListItem).PHP_EOL;
 
             // store as previous depth for next iteration
             $prevDepth = $depth;
@@ -317,10 +316,10 @@ 
 
         if ($html) {
             // done iterating container; close open ul/li tags
-            for ($i = $prevDepth+1; $i > 0; $i--) {
-                $myIndent = $indent . str_repeat('        ', $i-1);
-                $html .= $myIndent . '    </li>' . PHP_EOL
-                    . $myIndent . '</ul>' . PHP_EOL;
+            for ($i = $prevDepth + 1; $i > 0; $i--) {
+                $myIndent = $indent.str_repeat('        ', $i - 1);
+                $html .= $myIndent.'    </li>'.PHP_EOL
+                    . $myIndent.'</ul>'.PHP_EOL;
             }
             $html = rtrim($html, PHP_EOL);
         }
@@ -351,7 +350,7 @@ 
      */
     public function findActive($container = null, $minDepth = null, $maxDepth = -1)
     {
-    	if ( null == $container ) {
+    	if (null == $container) {
     		$container = $this->getContainer();
     	}
     	return parent::findActive($container, $minDepth, $maxDepth);
@@ -380,7 +379,7 @@ 
                 'title'    => $this->translate($page->getTitle(), $page->getTextDomain()),
         ];
         $classnames = array();
-        if ( $addClassToListItem === false ) {
+        if ($addClassToListItem === false) {
             $class = $page->getClass();
             if (!empty($class)) {
                 $classnames[] = $page->getClass();
@@ -389,7 +388,7 @@ 
         $maxDepth = $this->getMaxDepth();
         $depth = $page->get('level');
         $isBelowMaxLevel = ($maxDepth > $depth) || ($maxDepth === null) || ($maxDepth === false);
-        if ( !empty($page->pages) && $isBelowMaxLevel ) {
+        if (!empty($page->pages) && $isBelowMaxLevel) {
             $classnames[] = 'dropdown-toggle';
             $attribs['data-toggle'] = (($depth == 0) ? $this->getSubLiClassLevel0() : $this->getSubLiClass());
         }
@@ -408,8 +407,8 @@ 
             $attribs['href'] = '#';
         }
         
-        $html    = '<' . $element . $this->htmlAttribs($attribs) . '>';
-        $html .= ($page->get('icon') ? '<span class="' . $this->getIconPrefixClass() . '' . $page->get('icon') . '"></span> ' : '' );
+        $html = '<'.$element.$this->htmlAttribs($attribs).'>';
+        $html .= ($page->get('icon') ? '<span class="'.$this->getIconPrefixClass().''.$page->get('icon').'"></span> ' : '');
         $label = $this->translate($page->getLabel(), $page->getTextDomain());
         if ($escapeLabel === true) {
             /** @var \Zend\View\Helper\EscapeHtml $escaper */
@@ -418,7 +417,7 @@ 
         } else {
             $html .= $label;
         }
-        $html .= '</' . $element . '>';
+        $html .= '</'.$element.'>';
     
         return $html;
     }

module/UIComponents/src/UIComponents/View/Helper/Traits/ComponentAclTrait.php

Doc Comments +4 added lines, -4 removed lines

@@ -66,8 +66,8 @@ 
      *
      * Implements {@link HelperInterface::setAcl()}.
      *
-     * @param    Acl\AclInterface $acl ACL object.
-     * @return AbstractHelper
+     * @param    AclInterface $acl ACL object.
+     * @return ComponentAclTrait
      */
     public function setAcl(AclInterface $acl = null)
     {
@@ -118,7 +118,7 @@ 
      * @param    mixed $role [optional] role to set. Expects a string, an
      *                     instance of type {@link Acl\Role\RoleInterface}, or null. Default
      *                     is null, which will set no role.
-     * @return AbstractHelper
+     * @return ComponentAclTrait
      * @throws Exception\InvalidArgumentException
      */
     public function setRole($role = null)
@@ -181,7 +181,7 @@ 
      * Implements {@link HelperInterface::setUseAcl()}.
      *
      * @param    bool $useAcl
-     * @return AbstractHelper
+     * @return ComponentAclTrait
      */
     public function setUseAcl($useAcl = true)
     {

Indentation +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
      */
     protected static $defaultRole;
 
-	/**
+    /**
      * Sets ACL to use when iterating pages
      *
      * Implements {@link HelperInterface::setAcl()}.
@@ -110,7 +110,7 @@ 
         return false;
     }
 
-	/**
+    /**
      * Sets ACL role(s) to use when iterating pages
      *
      * Implements {@link HelperInterface::setRole()}.

module/UIComponents/src/UIComponents/View/Helper/Traits/ComponentNavigationTrait.php

Doc Comments +1 added lines, -1 removed lines

@@ -237,7 +237,7 @@
      *                                            {@link getMinDepth()}. A
      *                                            null value means no minimum
      *                                            depth required.
-     * @param    int|null             $maxDepth    [optional] maximum depth
+     * @param    integer             $maxDepth    [optional] maximum depth
      *                                            a page can have to be
      *                                            valid. Default is to use
      *                                            {@link getMaxDepth()}. A

module/UIComponents/src/UIComponents/View/Helper/Traits/ComponentServiceManagersTrait.php

Doc Comments +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
      * Set the event manager.
      *
      * @param    EventManagerInterface $events
-     * @return    AbstractHelper
+     * @return    ComponentServiceManagersTrait
      */
     public function setEventManager(EventManagerInterface $events)
     {
@@ -91,7 +91,7 @@ 
      * Set the service locator.
      *
      * @param    ServiceLocatorInterface $serviceLocator
-     * @return AbstractHelper
+     * @return ComponentServiceManagersTrait
      */
     public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
     {

Indentation +6 added lines, -6 removed lines

@@ -36,12 +36,12 @@
      */
     protected $serviceLocator;
 
-     /**
-     * Set the event manager.
-     *
-     * @param    EventManagerInterface $events
-     * @return    AbstractHelper
-     */
+        /**
+         * Set the event manager.
+         *
+         * @param    EventManagerInterface $events
+         * @return    AbstractHelper
+         */
     public function setEventManager(EventManagerInterface $events)
     {
         $events->setIdentifiers([

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

Doc Comments +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
      * Helper entry point
      *
      * @param  string|AbstractContainer $container container to operate on
-     * @return Bootstrap
+     * @return Utilities
      */
     public function __invoke($container = null)
     {

module/UIComponents/src/UIComponents/View/Helper/Utilities/Config.php

Doc Comments +2 added lines, -3 removed lines

@@ -27,8 +27,7 @@ 
      * View helper entry point:
      * Retrieves helper and optionally sets container to operate on
      *
-     * @param  AbstractContainer $container [optional] container to operate on
-     * @return self
+     * @return \Zend\Config\Config
      */
     public function __invoke()
     {
@@ -38,7 +37,7 @@ 
     /**
      * render nothing
      * 
-     * @return string
+     * @return \Zend\Config\Config
      */
     public function render($container = null)
     {

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     public function render($container = null)
     {
-        $config = new \Zend\Config\Config( $this->getServiceLocator()->getServiceLocator()->get('Config') );
+        $config = new \Zend\Config\Config($this->getServiceLocator()->getServiceLocator()->get('Config'));
         return $config;
     }
     

module/UIComponents/src/UIComponents/Translator/TranslatorAwareInterfaceTrait.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
      */
     public function getTranslator()
     {
-        if (! $this->isTranslatorEnabled()) {
+        if (!$this->isTranslatorEnabled()) {
             return;
         }