ByTIC / framework

src/database/query/Condition/Condition.php

Doc Comments +11 added lines, -2 removed lines

@@ -26,18 +26,24 @@ 
         return $this->parseString($this->_string, $this->_values);
     }
 
+    /**
+     * @param Nip_DB_Query_Condition $condition
+     */
     public function and_($condition)
     {
         return new Nip_DB_Query_AndCondition($this, $condition);
     }
 
+    /**
+     * @param Nip_DB_Query_Condition $condition
+     */
     public function or_($condition)
     {
         return new Nip_DB_Query_OrCondition($this, $condition);
     }
 
     /**
-     * @return DB_Query
+     * @return Wrapper
      */
     public function getQuery()
     {
@@ -46,7 +52,7 @@ 
 
     /**
      * @param Wrapper $query
-     * @return DB_Query_Condition
+     * @return Nip_DB_Query_Condition
      */
     public function setQuery($query)
     {
@@ -106,6 +112,9 @@ 
         return strpos($condition, ' AND ') || strpos($condition, ' OR ') ? '(' . $condition . ')' : $condition;
     }
 
+    /**
+     * @param Query $value
+     */
     protected function parseValueQuery($value)
     {
         return "(" . $value->assemble() . ")";

src/database/query/Select.php

Doc Comments +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param string $against
 	 * @param string $alias
 	 * @param boolean $boolean_mode
-	 * @return Nip_DB_Wrapper
+	 * @return Query
 	 */
 	public function match($fields, $against, $alias, $boolean_mode = true)
 	{
@@ -60,7 +60,7 @@ 
 	 * @param mixed $table the table to be joined, given as simple string or name - alias pair
 	 * @param string $on
 	 * @param string $type SQL join type (INNER, OUTER, LEFT INNER, etc.)
-	 * @return Nip_DB_Wrapper
+	 * @return Nip_DB_Query_Select
 	 */
 	public function join($table, $on = false, $type = '')
 	{
@@ -84,7 +84,7 @@ 
 	 *
 	 * @param array $fields
 	 * @param boolean $rollup suport for modifier WITH ROLLUP
-	 * @return Nip_DB_Wrapper
+	 * @return Nip_DB_Query_Select
 	 */
 	public function group($fields, $rollup = false)
 	{

Indentation +262 added lines, -262 removed lines

@@ -5,236 +5,236 @@ 
 class Nip_DB_Query_Select extends _Abstract
 {
 
-	public function __call($name, $arguments)
-	{
-		if (in_array($name, array('min', 'max', 'count', 'avg', 'sum'))) {
-			$input = reset($arguments);
-
-			if (is_array($input)) {
-				$input[] = false;
-			} else {
-				$input = array($input, $arguments[1], $arguments[2]);
-			}
-
-			$input[0] = strtoupper($name) . '(' . $this->protect($input[0]) . ')';
-
-			return $this->cols($input);
-		}
-		return parent::__call($name, $arguments);
-	}
-
-	/**
-	 * Inserts FULLTEXT statement into $this->select and $this->where
-	 *
-	 * @param mixed $fields
-	 * @param string $against
-	 * @param string $alias
-	 * @param boolean $boolean_mode
-	 * @return Nip_DB_Wrapper
-	 */
-	public function match($fields, $against, $alias, $boolean_mode = true)
-	{
-		if (!is_array($fields)) {
-			$fields = array();
-		}
-
-		$match = array();
-		foreach ($fields as $itemField) {
-			if (!is_array($itemField)) {
-				$itemField = array($itemField);
-
-				$field = isset($itemField[0]) ? $itemField[0] : false;
-				$protected = isset($itemField[1]) ? $itemField[1] : true;
-
-				$match[] = $protected ? $this->protect($field) : $field;
-			}
-		}
-		$match = "MATCH(" . implode(",", $match) . ") AGAINST ('" . $against . "'" . ($boolean_mode ? " IN BOOLEAN MODE" : "") . ")";
-
-		return $this->cols(array($match, $alias, false))->where(array($match));
-	}
-
-	/**
-	 * Inserts JOIN entry for the last table inserted by $this->from()
-	 *
-	 * @param mixed $table the table to be joined, given as simple string or name - alias pair
-	 * @param string $on
-	 * @param string $type SQL join type (INNER, OUTER, LEFT INNER, etc.)
-	 * @return Nip_DB_Wrapper
-	 */
-	public function join($table, $on = false, $type = '')
-	{
-		$lastTable = end($this->_parts['from']);
-
-		if (!$lastTable) {
-			trigger_error('No previous table to JOIN', E_USER_ERROR);
-		}
-
-		if (is_array($lastTable)) {
-			$lastTable = $lastTable[1];
-		}
-
-		$this->_parts['join'][$lastTable][] = array($table, $on, $type);
-
-		return $this;
-	}
-
-	/**
-	 * Sets the group paramater for the query
-	 *
-	 * @param array $fields
-	 * @param boolean $rollup suport for modifier WITH ROLLUP
-	 * @return Nip_DB_Wrapper
-	 */
-	public function group($fields, $rollup = false)
-	{
-		$this->_parts['group']['fields'] = $fields;
-		$this->_parts['group']['rollup'] = $rollup;
-		return $this;
-	}
-
-	public function assemble()
-	{
-		$select = $this->parseCols();
-		$options = $this->parseOptions();
-		$from = $this->parseFrom();
-
-		$where = $this->parseWhere();
-		$group = $this->parseGroup();
-		$having = $this->parseHaving();
-
-		$order = $this->parseOrder();
-
-		$query = "SELECT";
-
-		if (!empty($options)) {
-			$query .= " $options";
-		}
-
-		if (!empty($select)) {
-			$query .= " $select";
-		}
-
-		if (!empty($from)) {
-			$query .= " FROM $from";
-		}
-
-		if (!empty($where)) {
-			$query .= " WHERE $where";
-		}
-
-		if (!empty($group)) {
-			$query .= " GROUP BY $group";
-		}
-
-		if (!empty($having)) {
-			$query .= " HAVING $having";
-		}
-
-		if (!empty($order)) {
-			$query .= " ORDER BY $order";
-		}
-
-		if (!empty($this->_parts['limit'])) {
-			$query .= " LIMIT {$this->_parts['limit']}";
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Parses SELECT entries
-	 *
-	 * @return string
-	 */
-	protected function parseCols()
-	{
-		if (!isset($this->_parts['cols']) OR !is_array($this->_parts['cols']) OR count($this->_parts['cols']) < 1) {
-			return '*';
-		} else {
-			$selectParts = array();
-
-			foreach ($this->_parts['cols'] as $itemSelect) {
-				if (is_array($itemSelect)) {
-					$field = isset($itemSelect[0]) ? $itemSelect[0] : false;
-					$alias = isset($itemSelect[1]) ? $itemSelect[1] : false;
-					$protected = isset($itemSelect[2]) ? $itemSelect[2] : true;
-
-					$selectParts[] = ($protected ? $this->protect($field) : $field) . (!empty($alias) ? ' AS ' . $this->protect($alias) : '');
-				} else {
-					$selectParts[] = $itemSelect;
-				}
-			}
-
-			return implode(', ', $selectParts);
-		}
-	}
-
-	public function parseOptions()
-	{
-		if (!empty($this->_parts['options'])) {
-			return implode(" ", array_map("strtoupper", $this->_parts['options']));
-		}
-	}
-
-	/**
-	 * Parses FROM entries
-	 * @return string
-	 */
-	private function parseFrom()
-	{
-		if (!empty($this->_parts['from'])) {
-			$parts = array();
-
-			foreach ($this->_parts['from'] as $key => $item) {
-				if (is_array($item)) {
-					$table = isset($item[0]) ? $item[0] : false;
-					$alias = isset($item[1]) ? $item[1] : false;
-
-					if (is_object($table)) {
-						if (!$alias) {
-							trigger_error('Select statements in for need aliases defined', E_USER_ERROR);
-						}
-						$parts[$key] = '(' . $table . ') AS ' . $this->protect($alias) . $this->parseJoin($alias);
-					} else {
-						$parts[$key] = $this->protect($table) . ' AS ' . $this->protect((!empty($alias) ? $alias : $table)) . $this->parseJoin($alias);
-					}
-				} elseif (!strpos($item, ' ')) {                    
-					$parts[] = $this->protect($item) . $this->parseJoin($item);
-				} else {
-					$parts[] = $item;
-				}
-			}
-
-			return implode(", ", array_unique($parts));
-		}
-	}
-
-	/**
-	 * Parses JOIN entries for a given table
-	 * Concatenates $this->join entries for input table
-	 *
-	 * @param string $table table to build JOIN statement for
-	 * @return string
-	 */
-	private function parseJoin($table)
-	{
-		$result = '';
-
-		if (isset($this->_parts['join'][$table])) {
-			foreach ($this->_parts['join'][$table] as $join) {
-				if (!is_array($join[0])) {
-					$join[0] = array($join[0]);
-				}
-
-				$joinTable = isset($join[0][0]) ? $join[0][0] : false;
-				$joinAlias = isset($join[0][1]) ? $join[0][1] : false;
-				$joinOn = isset($join[1]) ? $join[1] : false;
-
-
-				$joinType = isset($join[2]) ? $join[2] : '';
-
-				$result .= ( $joinType ? ' ' . strtoupper($joinType) : '') . ' JOIN ';
+    public function __call($name, $arguments)
+    {
+        if (in_array($name, array('min', 'max', 'count', 'avg', 'sum'))) {
+            $input = reset($arguments);
+
+            if (is_array($input)) {
+                $input[] = false;
+            } else {
+                $input = array($input, $arguments[1], $arguments[2]);
+            }
+
+            $input[0] = strtoupper($name) . '(' . $this->protect($input[0]) . ')';
+
+            return $this->cols($input);
+        }
+        return parent::__call($name, $arguments);
+    }
+
+    /**
+     * Inserts FULLTEXT statement into $this->select and $this->where
+     *
+     * @param mixed $fields
+     * @param string $against
+     * @param string $alias
+     * @param boolean $boolean_mode
+     * @return Nip_DB_Wrapper
+     */
+    public function match($fields, $against, $alias, $boolean_mode = true)
+    {
+        if (!is_array($fields)) {
+            $fields = array();
+        }
+
+        $match = array();
+        foreach ($fields as $itemField) {
+            if (!is_array($itemField)) {
+                $itemField = array($itemField);
+
+                $field = isset($itemField[0]) ? $itemField[0] : false;
+                $protected = isset($itemField[1]) ? $itemField[1] : true;
+
+                $match[] = $protected ? $this->protect($field) : $field;
+            }
+        }
+        $match = "MATCH(" . implode(",", $match) . ") AGAINST ('" . $against . "'" . ($boolean_mode ? " IN BOOLEAN MODE" : "") . ")";
+
+        return $this->cols(array($match, $alias, false))->where(array($match));
+    }
+
+    /**
+     * Inserts JOIN entry for the last table inserted by $this->from()
+     *
+     * @param mixed $table the table to be joined, given as simple string or name - alias pair
+     * @param string $on
+     * @param string $type SQL join type (INNER, OUTER, LEFT INNER, etc.)
+     * @return Nip_DB_Wrapper
+     */
+    public function join($table, $on = false, $type = '')
+    {
+        $lastTable = end($this->_parts['from']);
+
+        if (!$lastTable) {
+            trigger_error('No previous table to JOIN', E_USER_ERROR);
+        }
+
+        if (is_array($lastTable)) {
+            $lastTable = $lastTable[1];
+        }
+
+        $this->_parts['join'][$lastTable][] = array($table, $on, $type);
+
+        return $this;
+    }
+
+    /**
+     * Sets the group paramater for the query
+     *
+     * @param array $fields
+     * @param boolean $rollup suport for modifier WITH ROLLUP
+     * @return Nip_DB_Wrapper
+     */
+    public function group($fields, $rollup = false)
+    {
+        $this->_parts['group']['fields'] = $fields;
+        $this->_parts['group']['rollup'] = $rollup;
+        return $this;
+    }
+
+    public function assemble()
+    {
+        $select = $this->parseCols();
+        $options = $this->parseOptions();
+        $from = $this->parseFrom();
+
+        $where = $this->parseWhere();
+        $group = $this->parseGroup();
+        $having = $this->parseHaving();
+
+        $order = $this->parseOrder();
+
+        $query = "SELECT";
+
+        if (!empty($options)) {
+            $query .= " $options";
+        }
+
+        if (!empty($select)) {
+            $query .= " $select";
+        }
+
+        if (!empty($from)) {
+            $query .= " FROM $from";
+        }
+
+        if (!empty($where)) {
+            $query .= " WHERE $where";
+        }
+
+        if (!empty($group)) {
+            $query .= " GROUP BY $group";
+        }
+
+        if (!empty($having)) {
+            $query .= " HAVING $having";
+        }
+
+        if (!empty($order)) {
+            $query .= " ORDER BY $order";
+        }
+
+        if (!empty($this->_parts['limit'])) {
+            $query .= " LIMIT {$this->_parts['limit']}";
+        }
+
+        return $query;
+    }
+
+    /**
+     * Parses SELECT entries
+     *
+     * @return string
+     */
+    protected function parseCols()
+    {
+        if (!isset($this->_parts['cols']) OR !is_array($this->_parts['cols']) OR count($this->_parts['cols']) < 1) {
+            return '*';
+        } else {
+            $selectParts = array();
+
+            foreach ($this->_parts['cols'] as $itemSelect) {
+                if (is_array($itemSelect)) {
+                    $field = isset($itemSelect[0]) ? $itemSelect[0] : false;
+                    $alias = isset($itemSelect[1]) ? $itemSelect[1] : false;
+                    $protected = isset($itemSelect[2]) ? $itemSelect[2] : true;
+
+                    $selectParts[] = ($protected ? $this->protect($field) : $field) . (!empty($alias) ? ' AS ' . $this->protect($alias) : '');
+                } else {
+                    $selectParts[] = $itemSelect;
+                }
+            }
+
+            return implode(', ', $selectParts);
+        }
+    }
+
+    public function parseOptions()
+    {
+        if (!empty($this->_parts['options'])) {
+            return implode(" ", array_map("strtoupper", $this->_parts['options']));
+        }
+    }
+
+    /**
+     * Parses FROM entries
+     * @return string
+     */
+    private function parseFrom()
+    {
+        if (!empty($this->_parts['from'])) {
+            $parts = array();
+
+            foreach ($this->_parts['from'] as $key => $item) {
+                if (is_array($item)) {
+                    $table = isset($item[0]) ? $item[0] : false;
+                    $alias = isset($item[1]) ? $item[1] : false;
+
+                    if (is_object($table)) {
+                        if (!$alias) {
+                            trigger_error('Select statements in for need aliases defined', E_USER_ERROR);
+                        }
+                        $parts[$key] = '(' . $table . ') AS ' . $this->protect($alias) . $this->parseJoin($alias);
+                    } else {
+                        $parts[$key] = $this->protect($table) . ' AS ' . $this->protect((!empty($alias) ? $alias : $table)) . $this->parseJoin($alias);
+                    }
+                } elseif (!strpos($item, ' ')) {                    
+                    $parts[] = $this->protect($item) . $this->parseJoin($item);
+                } else {
+                    $parts[] = $item;
+                }
+            }
+
+            return implode(", ", array_unique($parts));
+        }
+    }
+
+    /**
+     * Parses JOIN entries for a given table
+     * Concatenates $this->join entries for input table
+     *
+     * @param string $table table to build JOIN statement for
+     * @return string
+     */
+    private function parseJoin($table)
+    {
+        $result = '';
+
+        if (isset($this->_parts['join'][$table])) {
+            foreach ($this->_parts['join'][$table] as $join) {
+                if (!is_array($join[0])) {
+                    $join[0] = array($join[0]);
+                }
+
+                $joinTable = isset($join[0][0]) ? $join[0][0] : false;
+                $joinAlias = isset($join[0][1]) ? $join[0][1] : false;
+                $joinOn = isset($join[1]) ? $join[1] : false;
+
+
+                $joinType = isset($join[2]) ? $join[2] : '';
+
+                $result .= ( $joinType ? ' ' . strtoupper($joinType) : '') . ' JOIN ';
                 if (strpos($joinTable, '(') !== false) {
                     $result .= $joinTable;
                 } else {
@@ -242,7 +242,7 @@ 
                 }
                 $result .= (!empty($joinAlias) ? ' AS ' . $this->protect($joinAlias) : '');
 
-				if ($joinOn) {
+                if ($joinOn) {
                     $result .= ' ON ';
                     if (is_array($joinOn)) {
                         $result .= $this->protect($table . '.' . $joinOn[0]) . ' = ' . $this->protect($joinTable . '.' . $joinOn[1]);
@@ -251,48 +251,48 @@ 
                     }
                 }
 
-			}
-		}
-
-		return $result;
-	}
+            }
+        }
 
-	/**
-	 * Parses GROUP entries
-	 *
-	 * @uses $this->group['fields'] array with elements to group by
-	 * @return string
-	 */
-	private function parseGroup()
-	{
+        return $result;
+    }
+
+    /**
+     * Parses GROUP entries
+     *
+     * @uses $this->group['fields'] array with elements to group by
+     * @return string
+     */
+    private function parseGroup()
+    {
         $group = '';
-		if (isset ($this->_parts['group']['fields'])) {
+        if (isset ($this->_parts['group']['fields'])) {
             if (is_array($this->_parts['group']['fields'])) {
-			$groupFields = array();
-			foreach ($this->_parts['group']['fields'] as $field) {
-				$field = is_array($field) ? $field : array($field);
-				$column = isset($field[0]) ? $field[0] : false;
-				$type = isset($field[1]) ? $field[1] : '';
+            $groupFields = array();
+            foreach ($this->_parts['group']['fields'] as $field) {
+                $field = is_array($field) ? $field : array($field);
+                $column = isset($field[0]) ? $field[0] : false;
+                $type = isset($field[1]) ? $field[1] : '';
 
-				$groupFields[] = $this->protect($column) . ($type ? ' ' . strtoupper($type) : '');
-			}
+                $groupFields[] = $this->protect($column) . ($type ? ' ' . strtoupper($type) : '');
+            }
 
-			$group .= implode(', ', $groupFields);
+            $group .= implode(', ', $groupFields);
             } else {
                 $group .= $this->_parts['group']['fields'];
             }
         }
 
-		if (isset($this->_parts['group']['rollup']) && $this->_parts['group']['rollup'] !== false) {
-			$group .= ' WITH ROLLUP';
-		}
+        if (isset($this->_parts['group']['rollup']) && $this->_parts['group']['rollup'] !== false) {
+            $group .= ' WITH ROLLUP';
+        }
 
-		return $group;
-	}
+        return $group;
+    }
 
-	public function union($query)
-	{
-		return new Nip_DB_Query_SelectUnion($this, $query);
-	}
+    public function union($query)
+    {
+        return new Nip_DB_Query_SelectUnion($this, $query);
+    }
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -234,7 +234,7 @@ 
 
 				$joinType = isset($join[2]) ? $join[2] : '';
 
-				$result .= ( $joinType ? ' ' . strtoupper($joinType) : '') . ' JOIN ';
+				$result .= ($joinType ? ' ' . strtoupper($joinType) : '') . ' JOIN ';
                 if (strpos($joinTable, '(') !== false) {
                     $result .= $joinTable;
                 } else {
@@ -247,7 +247,7 @@ 
                     if (is_array($joinOn)) {
                         $result .= $this->protect($table . '.' . $joinOn[0]) . ' = ' . $this->protect($joinTable . '.' . $joinOn[1]);
                     } else {
-                        $result .= '('. $joinOn .')';
+                        $result .= '(' . $joinOn . ')';
                     }
                 }
 

src/database/Result.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
 	protected $_adapter;
 	protected $_results = array();
 
+	/**
+	 * @param Nip_DB_Adapters_Abstract $adapter
+	 */
 	public function __construct($data, $adapter)
 	{
 		$this->_data = $data;

Indentation +48 added lines, -48 removed lines

@@ -3,53 +3,53 @@
 class Nip_DB_Result
 {
 
-	protected $_data;
-	protected $_adapter;
-	protected $_results = array();
-
-	public function __construct($data, $adapter)
-	{
-		$this->_data = $data;
-		$this->_adapter = $adapter;
-	}
-
-	public function __destruct()
-	{
-		if ($this->_data && !is_bool($this->_data)) {
-			$this->_adapter->freeResults($this->_data);
-		}
-	}
-
-	/**
-	 * Fetches row from current result set
-	 * @return array
-	 */
-	public function fetchResult()
-	{
-		try {
-			return $this->_adapter->fetchAssoc($this->_data);
-		} catch (Nip_DB_Exception $e) {
-			$e->log();
-		}
-	}
-
-	/**
-	 * Fetches all rows from current result set
-	 * @return array
-	 */
-	public function fetchResults()
-	{
-		if (count($this->_results) == 0) {
-			while ($result = $this->fetchResult()) {
-				$this->_results[] = $result;
-			}
-		}
-		return $this->_results;
-	}
-
-	public function numRows()
-	{
-		return $this->_adapter->numRows($this->_data);
-	}
+    protected $_data;
+    protected $_adapter;
+    protected $_results = array();
+
+    public function __construct($data, $adapter)
+    {
+        $this->_data = $data;
+        $this->_adapter = $adapter;
+    }
+
+    public function __destruct()
+    {
+        if ($this->_data && !is_bool($this->_data)) {
+            $this->_adapter->freeResults($this->_data);
+        }
+    }
+
+    /**
+     * Fetches row from current result set
+     * @return array
+     */
+    public function fetchResult()
+    {
+        try {
+            return $this->_adapter->fetchAssoc($this->_data);
+        } catch (Nip_DB_Exception $e) {
+            $e->log();
+        }
+    }
+
+    /**
+     * Fetches all rows from current result set
+     * @return array
+     */
+    public function fetchResults()
+    {
+        if (count($this->_results) == 0) {
+            while ($result = $this->fetchResult()) {
+                $this->_results[] = $result;
+            }
+        }
+        return $this->_results;
+    }
+
+    public function numRows()
+    {
+        return $this->_adapter->numRows($this->_data);
+    }
 
 }
\ No newline at end of file

src/database/Wrapper.php

Doc Comments +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
      * Instantiates database engine adapter
      *
      * @param string $adapter
-     * @param string $db_prefix
+     * @param string $prefix
      */
     public function __construct($adapter = false, $prefix = false)
     {
@@ -65,7 +65,7 @@ 
     }
 
     /**
-     * @param mixed $database
+     * @param string $database
      */
     public function setDatabase($database)
     {

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
     {
         $this->_queries[] = $query;
 
-        $query = (string)$query;
+        $query = (string) $query;
         $query = $this->getAdapter()->execute($query);
         $result = new Nip_DB_Result($query, $this->getAdapter());
 

src/Dispatcher.php

Doc Comments +6 added lines

@@ -70,6 +70,9 @@ 
         throw new \Nip_Dispatcher_ForwardException;
     }
 
+    /**
+     * @param Request $request
+     */
     public function generateController($request)
     {
         $controllerClass = $this->getFullControllerNameFromRequest($request);
@@ -142,6 +145,9 @@ 
         return $this->getControllerName($name);
     }
 
+    /**
+     * @param boolean $name
+     */
     public static function formatActionName($name)
     {
         $name = inflector()->camelize($name);

src/file/Image.php

Doc Comments +10 added lines

@@ -77,6 +77,9 @@ 
 		$this->setName($name);
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function setName($name)
 	{
 		$this->name = $name;
@@ -226,6 +229,10 @@ 
 		$this->crop($x0, $y0, $cWidth, $cHeight, $cWidth, $cHeight);
 	}
 
+	/**
+	 * @param double $x
+	 * @param double $y
+	 */
 	public function crop($x, $y, $dwidth, $dheight, $swidth, $sheight)
 	{        
 		$image = imagecreatetruecolor($dwidth, $dheight);
@@ -372,6 +379,9 @@ 
 		return $this->_width;
 	}
 
+	/**
+	 * @return integer
+	 */
 	public function getHeight()
 	{
 		if (!$this->_height && $this->_resource) {

Indentation +327 added lines, -327 removed lines

@@ -11,209 +11,209 @@ 
 class Nip_File_Image extends Nip_File_Handler
 {
 
-	public $extensions = array("jpg", "jpeg", "gif", "png");
-	public $quality = 90;
-	public $type = 'jpg';
-	public $max_width = false;
-	public $errors = array();
-	protected $_resource;
-	protected $_file;
-	protected $_upload;
-	protected $_width;
-	protected $_height;
-
-	public function setResourceFromUpload($upload)
-	{
-		$this->_upload = $upload;
-		$this->setResourceFromFile($upload['tmp_name']);
-	}
-
-	public function setResourceFromFile($path)
-	{
-		$this->_file = $path;
-		if (file_exists($path)) {
-			$details = getimagesize($path);
-
-			switch ($details['mime']) {
-				case 'image/gif':
-					$this->type = 'gif';
-					if (imagetypes() & IMG_GIF) {
-						$this->_resource = imagecreatefromgif($path);
-					}
-					break;
-				case 'image/jpeg':
-					$this->type = 'jpg';
-					if (imagetypes() & IMG_JPG) {
-						$this->_resource = imagecreatefromjpeg($path);
-					}
-					break;
-				case 'image/png':
-					$this->type = 'png';
-					if (imagetypes() & IMG_PNG) {
-						$this->_resource = imagecreatefrompng($path);
-					}
-					break;
-			}
-
-			$this->getWidth();
-			$this->getHeight();
-
-			return true;
-		} else {
-			trigger_error("Cannot find file $path", E_USER_ERROR);
-		}
-
-		return false;
-	}
-
-	public function setResource($gdImage)
-	{
-		$this->_resource = $gdImage;
-	}
-
-	public function setBaseName($name)
-	{
-		$name = $name . '.' . $this->type;
-		$this->setName($name);
-	}
-
-	public function setName($name)
-	{
-		$this->name = $name;
-		$this->url = dirname($this->url) . '/' . $this->name;
-		$this->path = dirname($this->path) . '/' . $this->name;
-	}
-
-	public function save()
-	{
-		if (Nip_File_System::instance()->createDirectory(dirname($this->path))) {
-
-			switch ($this->type) {
-				case 'png':
-					if ($this->quality > 9) {
-						if ($this->quality < 100) {
-							$this->quality = $this->quality / 10;
-						} else {
-							$this->quality = 9;
-						}
-					}
-					$this->quality = abs($this->quality - 9);
-					$this->quality = 0;
-
-					$newImg = imagecreatetruecolor($this->_width, $this->_height);
-					imagealphablending($newImg, false);
-					imagesavealpha($newImg, true);
-
-					imagecopyresampled($newImg, $this->_resource, 0, 0, 0, 0, $this->_width, $this->_height, $this->_width, $this->_height);
-
-					$return = imagepng($newImg, $this->path, $this->quality);
-					break;
-				case 'jpg':
-				default:
-					$return = imagejpeg($this->_resource, $this->path, $this->quality);
-					break;
-			}
-
-			if ($return) {
-				chmod($this->path, 0777);
-				return true;
-			}
-			$this->errors[] = 'Error saving file';
-		} else {
-			$this->errors[] = 'Error creating directory';
-		}
-		return false;
-	}
-
-	public function grayscaleFade()
-	{
-		$this->grayscaleFilter();
-		imagefilter($this->_resource, IMG_FILTER_BRIGHTNESS, 50);
-	}
-
-	public function grayscaleFilter()
-	{
-		imagefilter($this->_resource, IMG_FILTER_GRAYSCALE);
-	}
-
-	public function resize($max_width = false, $max_height = false)
-	{
-		if (!$max_width) {
-			if ($this->max_width) {
-				$max_width = $this->max_width;
-			} else {
-				$max_width = $this->getWidth();
-			}
-		}        
+    public $extensions = array("jpg", "jpeg", "gif", "png");
+    public $quality = 90;
+    public $type = 'jpg';
+    public $max_width = false;
+    public $errors = array();
+    protected $_resource;
+    protected $_file;
+    protected $_upload;
+    protected $_width;
+    protected $_height;
+
+    public function setResourceFromUpload($upload)
+    {
+        $this->_upload = $upload;
+        $this->setResourceFromFile($upload['tmp_name']);
+    }
+
+    public function setResourceFromFile($path)
+    {
+        $this->_file = $path;
+        if (file_exists($path)) {
+            $details = getimagesize($path);
+
+            switch ($details['mime']) {
+                case 'image/gif':
+                    $this->type = 'gif';
+                    if (imagetypes() & IMG_GIF) {
+                        $this->_resource = imagecreatefromgif($path);
+                    }
+                    break;
+                case 'image/jpeg':
+                    $this->type = 'jpg';
+                    if (imagetypes() & IMG_JPG) {
+                        $this->_resource = imagecreatefromjpeg($path);
+                    }
+                    break;
+                case 'image/png':
+                    $this->type = 'png';
+                    if (imagetypes() & IMG_PNG) {
+                        $this->_resource = imagecreatefrompng($path);
+                    }
+                    break;
+            }
+
+            $this->getWidth();
+            $this->getHeight();
+
+            return true;
+        } else {
+            trigger_error("Cannot find file $path", E_USER_ERROR);
+        }
+
+        return false;
+    }
+
+    public function setResource($gdImage)
+    {
+        $this->_resource = $gdImage;
+    }
+
+    public function setBaseName($name)
+    {
+        $name = $name . '.' . $this->type;
+        $this->setName($name);
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+        $this->url = dirname($this->url) . '/' . $this->name;
+        $this->path = dirname($this->path) . '/' . $this->name;
+    }
+
+    public function save()
+    {
+        if (Nip_File_System::instance()->createDirectory(dirname($this->path))) {
+
+            switch ($this->type) {
+                case 'png':
+                    if ($this->quality > 9) {
+                        if ($this->quality < 100) {
+                            $this->quality = $this->quality / 10;
+                        } else {
+                            $this->quality = 9;
+                        }
+                    }
+                    $this->quality = abs($this->quality - 9);
+                    $this->quality = 0;
+
+                    $newImg = imagecreatetruecolor($this->_width, $this->_height);
+                    imagealphablending($newImg, false);
+                    imagesavealpha($newImg, true);
+
+                    imagecopyresampled($newImg, $this->_resource, 0, 0, 0, 0, $this->_width, $this->_height, $this->_width, $this->_height);
+
+                    $return = imagepng($newImg, $this->path, $this->quality);
+                    break;
+                case 'jpg':
+                default:
+                    $return = imagejpeg($this->_resource, $this->path, $this->quality);
+                    break;
+            }
+
+            if ($return) {
+                chmod($this->path, 0777);
+                return true;
+            }
+            $this->errors[] = 'Error saving file';
+        } else {
+            $this->errors[] = 'Error creating directory';
+        }
+        return false;
+    }
+
+    public function grayscaleFade()
+    {
+        $this->grayscaleFilter();
+        imagefilter($this->_resource, IMG_FILTER_BRIGHTNESS, 50);
+    }
+
+    public function grayscaleFilter()
+    {
+        imagefilter($this->_resource, IMG_FILTER_GRAYSCALE);
+    }
+
+    public function resize($max_width = false, $max_height = false)
+    {
+        if (!$max_width) {
+            if ($this->max_width) {
+                $max_width = $this->max_width;
+            } else {
+                $max_width = $this->getWidth();
+            }
+        }        
         
-		if (!$max_height) {
-			if ($this->max_height) {
-				$max_height = $this->max_height;
-			} else {
-				$max_height = $this->getHeight();
-			}
-		}                  
+        if (!$max_height) {
+            if ($this->max_height) {
+                $max_height = $this->max_height;
+            } else {
+                $max_height = $this->getHeight();
+            }
+        }                  
                 
         $ratio = $this->getRatio();
         $target_ratio = $max_width/$max_height;
         
         if ($ratio>$target_ratio){
-			$new_width = $max_width;
+            $new_width = $max_width;
             $new_height=round($max_width/$ratio);
         } else {
-			$new_height = $max_height;
+            $new_height = $max_height;
             $new_width = round($max_height * $ratio);            
         }
         
-		$image = imagecreatetruecolor($new_width, $new_height);
-		imagealphablending($image, false);
-		imagesavealpha($image, true);
+        $image = imagecreatetruecolor($new_width, $new_height);
+        imagealphablending($image, false);
+        imagesavealpha($image, true);
 
-		imagecopyresampled($image, $this->_resource, 0, 0, 0, 0, $new_width, $new_height, $this->getWidth(), $this->getHeight());
+        imagecopyresampled($image, $this->_resource, 0, 0, 0, 0, $new_width, $new_height, $this->getWidth(), $this->getHeight());
 
-		$this->_width = $new_width;
-		$this->_height = $new_height;
-		$this->_resource = $image;
+        $this->_width = $new_width;
+        $this->_height = $new_height;
+        $this->_resource = $image;
 
-		return $this;
-	}
+        return $this;
+    }
     
-	public function resizeToLarge($max_width = false, $max_height = false)
-	{
-		if (!$max_width) {
+    public function resizeToLarge($max_width = false, $max_height = false)
+    {
+        if (!$max_width) {
             $max_width = $this->getWidth();
-		}        
+        }        
         
-		if (!$max_height) {
+        if (!$max_height) {
             $max_height = $this->getHeight();
-		}                  
+        }                  
                 
         $sourceRatio = $this->getRatio();
         $target_ratio = $max_width/$max_height;
         
         if ($sourceRatio>$target_ratio){
-			$new_height = $max_height;
+            $new_height = $max_height;
             $new_width = ( int ) ($max_height * $sourceRatio);
         } else {
             $new_width = $max_width;
             $new_height = ( int ) ($max_width / $sourceRatio);      
         }
         
-		$image = imagecreatetruecolor($new_width, $new_height);
-		imagealphablending($image, false);
-		imagesavealpha($image, true);
+        $image = imagecreatetruecolor($new_width, $new_height);
+        imagealphablending($image, false);
+        imagesavealpha($image, true);
 
-		imagecopyresampled($image, $this->_resource, 0, 0, 0, 0, $new_width, $new_height, $this->getWidth(), $this->getHeight());
+        imagecopyresampled($image, $this->_resource, 0, 0, 0, 0, $new_width, $new_height, $this->getWidth(), $this->getHeight());
 
-		$this->_width = $new_width;
-		$this->_height = $new_height;
-		$this->_resource = $image;
+        $this->_width = $new_width;
+        $this->_height = $new_height;
+        $this->_resource = $image;
 
-		return $this;
-	}    
+        return $this;
+    }    
 
-	public function cropToCenter($cWidth, $cHeight)
-	{       
+    public function cropToCenter($cWidth, $cHeight)
+    {       
         
         $this->resizeToLarge($cWidth, $cHeight);
         
@@ -223,162 +223,162 @@ 
         $x0 = round(abs(($width - $cWidth) / 2),0);
         $y0 = round(abs(($height - $cHeight) / 2),0);
 
-		$this->crop($x0, $y0, $cWidth, $cHeight, $cWidth, $cHeight);
-	}
+        $this->crop($x0, $y0, $cWidth, $cHeight, $cWidth, $cHeight);
+    }
 
-	public function crop($x, $y, $dwidth, $dheight, $swidth, $sheight)
-	{        
-		$image = imagecreatetruecolor($dwidth, $dheight);
-		imagealphablending($image, false);
-		imagesavealpha($image, true);
+    public function crop($x, $y, $dwidth, $dheight, $swidth, $sheight)
+    {        
+        $image = imagecreatetruecolor($dwidth, $dheight);
+        imagealphablending($image, false);
+        imagesavealpha($image, true);
 
-		imagecopyresampled($image, $this->_resource, 
+        imagecopyresampled($image, $this->_resource, 
                 0, 0, 
                 $x, $y, 
                 $dwidth, $dheight, 
                 $swidth, $sheight);
 
-		$this->_width = $dwidth;
-		$this->_height = $dheight;
-		$this->_resource = $image;
-	}
-
-	public function unsharpMask($amount = 80, $radius = 0.5, $threshold = 3)
-	{
-		$img = &$this->_resource;
-
-		if ($amount > 500) {
-			$amount = 500;
-		}
-		$amount = $amount * 0.016;
-		if ($radius > 50) {
-			$radius = 50;
-		}
-		$radius = $radius * 2;
-		if ($threshold > 255) {
-			$threshold = 255;
-		}
-
-		$radius = abs(round($radius));
-		if ($radius == 0) {
-			return;
-		}
-
-		$w = $this->_width;
-		$h = $this->_height;
-
-		$imgCanvas = imagecreatetruecolor($w, $h);
-		$imgBlur = imagecreatetruecolor($w, $h);
-
-		if (function_exists('imageconvolution')) {
-			$matrix = array(array(1, 2, 1), array(2, 4, 2), array(1, 2, 1));
-			imagecopy($imgBlur, $img, 0, 0, 0, 0, $w, $h);
-			imageconvolution($imgBlur, $matrix, 16, 0);
-		} else {
-			for ($i = 0; $i < $radius; $i++) {
-				imagecopy($imgBlur, $img, 0, 0, 1, 0, $w - 1, $h);
-				imagecopymerge($imgBlur, $img, 1, 0, 0, 0, $w, $h, 50);
-				imagecopymerge($imgBlur, $img, 0, 0, 0, 0, $w, $h, 50);
-				imagecopy($imgCanvas, $imgBlur, 0, 0, 0, 0, $w, $h);
-
-				imagecopymerge($imgBlur, $imgCanvas, 0, 0, 0, 1, $w, $h - 1, 33.33333);
-				imagecopymerge($imgBlur, $imgCanvas, 0, 1, 0, 0, $w, $h, 25);
-			}
-		}
-
-		if ($threshold > 0) {
-			for ($x = 0; $x < $w - 1; $x++) {
-				for ($y = 0; $y < $h; $y++) {
-
-					$rgbOrig = ImageColorAt($img, $x, $y);
-					$rOrig = (($rgbOrig >> 16) & 0xFF);
-					$gOrig = (($rgbOrig >> 8) & 0xFF);
-					$bOrig = ($rgbOrig & 0xFF);
-
-					$rgbBlur = ImageColorAt($imgBlur, $x, $y);
-
-					$rBlur = (($rgbBlur >> 16) & 0xFF);
-					$gBlur = (($rgbBlur >> 8) & 0xFF);
-					$bBlur = ($rgbBlur & 0xFF);
-
-					$rNew = (abs($rOrig - $rBlur) >= $threshold) ? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig)) : $rOrig;
-					$gNew = (abs($gOrig - $gBlur) >= $threshold) ? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig)) : $gOrig;
-					$bNew = (abs($bOrig - $bBlur) >= $threshold) ? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig)) : $bOrig;
-
-					if (($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew)) {
-						$pixCol = ImageColorAllocate($img, $rNew, $gNew, $bNew);
-						ImageSetPixel($img, $x, $y, $pixCol);
-					}
-				}
-			}
-		} else {
-			for ($x = 0; $x < $w; $x++) {
-				for ($y = 0; $y < $h; $y++) {
-					$rgbOrig = ImageColorAt($img, $x, $y);
-					$rOrig = (($rgbOrig >> 16) & 0xFF);
-					$gOrig = (($rgbOrig >> 8) & 0xFF);
-					$bOrig = ($rgbOrig & 0xFF);
-
-					$rgbBlur = ImageColorAt($imgBlur, $x, $y);
-
-					$rBlur = (($rgbBlur >> 16) & 0xFF);
-					$gBlur = (($rgbBlur >> 8) & 0xFF);
-					$bBlur = ($rgbBlur & 0xFF);
-
-					$rNew = ($amount * ($rOrig - $rBlur)) + $rOrig;
-					if ($rNew > 255) {
-						$rNew = 255;
-					} elseif ($rNew < 0) {
-						$rNew = 0;
-					}
-					$gNew = ($amount * ($gOrig - $gBlur)) + $gOrig;
-					if ($gNew > 255) {
-						$gNew = 255;
-					} elseif ($gNew < 0) {
-						$gNew = 0;
-					}
-					$bNew = ($amount * ($bOrig - $bBlur)) + $bOrig;
-					if ($bNew > 255) {
-						$bNew = 255;
-					} elseif ($bNew < 0) {
-						$bNew = 0;
-					}
-					$rgbNew = ($rNew << 16) + ($gNew << 8) + $bNew;
-					ImageSetPixel($img, $x, $y, $rgbNew);
-				}
-			}
-		}
-
-		imagedestroy($imgCanvas);
-		imagedestroy($imgBlur);
-
-		return $this;
-	}
-
-	public function copyResource(Nip_File_Image $image)
-	{
-		$this->_width = $image->getWidth();
-		$this->_height = $image->getHeight();
-		$this->_resource = $image->getResource();
-
-		return $this;
-	}
-
-	public function getWidth()
-	{
-		if (!$this->_width && $this->_resource) {
-			$this->_width = imagesx($this->_resource);
-		}
-		return $this->_width;
-	}
-
-	public function getHeight()
-	{
-		if (!$this->_height && $this->_resource) {
-			$this->_height = imagesy($this->_resource);
-		}
-		return $this->_height;
-	}
+        $this->_width = $dwidth;
+        $this->_height = $dheight;
+        $this->_resource = $image;
+    }
+
+    public function unsharpMask($amount = 80, $radius = 0.5, $threshold = 3)
+    {
+        $img = &$this->_resource;
+
+        if ($amount > 500) {
+            $amount = 500;
+        }
+        $amount = $amount * 0.016;
+        if ($radius > 50) {
+            $radius = 50;
+        }
+        $radius = $radius * 2;
+        if ($threshold > 255) {
+            $threshold = 255;
+        }
+
+        $radius = abs(round($radius));
+        if ($radius == 0) {
+            return;
+        }
+
+        $w = $this->_width;
+        $h = $this->_height;
+
+        $imgCanvas = imagecreatetruecolor($w, $h);
+        $imgBlur = imagecreatetruecolor($w, $h);
+
+        if (function_exists('imageconvolution')) {
+            $matrix = array(array(1, 2, 1), array(2, 4, 2), array(1, 2, 1));
+            imagecopy($imgBlur, $img, 0, 0, 0, 0, $w, $h);
+            imageconvolution($imgBlur, $matrix, 16, 0);
+        } else {
+            for ($i = 0; $i < $radius; $i++) {
+                imagecopy($imgBlur, $img, 0, 0, 1, 0, $w - 1, $h);
+                imagecopymerge($imgBlur, $img, 1, 0, 0, 0, $w, $h, 50);
+                imagecopymerge($imgBlur, $img, 0, 0, 0, 0, $w, $h, 50);
+                imagecopy($imgCanvas, $imgBlur, 0, 0, 0, 0, $w, $h);
+
+                imagecopymerge($imgBlur, $imgCanvas, 0, 0, 0, 1, $w, $h - 1, 33.33333);
+                imagecopymerge($imgBlur, $imgCanvas, 0, 1, 0, 0, $w, $h, 25);
+            }
+        }
+
+        if ($threshold > 0) {
+            for ($x = 0; $x < $w - 1; $x++) {
+                for ($y = 0; $y < $h; $y++) {
+
+                    $rgbOrig = ImageColorAt($img, $x, $y);
+                    $rOrig = (($rgbOrig >> 16) & 0xFF);
+                    $gOrig = (($rgbOrig >> 8) & 0xFF);
+                    $bOrig = ($rgbOrig & 0xFF);
+
+                    $rgbBlur = ImageColorAt($imgBlur, $x, $y);
+
+                    $rBlur = (($rgbBlur >> 16) & 0xFF);
+                    $gBlur = (($rgbBlur >> 8) & 0xFF);
+                    $bBlur = ($rgbBlur & 0xFF);
+
+                    $rNew = (abs($rOrig - $rBlur) >= $threshold) ? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig)) : $rOrig;
+                    $gNew = (abs($gOrig - $gBlur) >= $threshold) ? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig)) : $gOrig;
+                    $bNew = (abs($bOrig - $bBlur) >= $threshold) ? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig)) : $bOrig;
+
+                    if (($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew)) {
+                        $pixCol = ImageColorAllocate($img, $rNew, $gNew, $bNew);
+                        ImageSetPixel($img, $x, $y, $pixCol);
+                    }
+                }
+            }
+        } else {
+            for ($x = 0; $x < $w; $x++) {
+                for ($y = 0; $y < $h; $y++) {
+                    $rgbOrig = ImageColorAt($img, $x, $y);
+                    $rOrig = (($rgbOrig >> 16) & 0xFF);
+                    $gOrig = (($rgbOrig >> 8) & 0xFF);
+                    $bOrig = ($rgbOrig & 0xFF);
+
+                    $rgbBlur = ImageColorAt($imgBlur, $x, $y);
+
+                    $rBlur = (($rgbBlur >> 16) & 0xFF);
+                    $gBlur = (($rgbBlur >> 8) & 0xFF);
+                    $bBlur = ($rgbBlur & 0xFF);
+
+                    $rNew = ($amount * ($rOrig - $rBlur)) + $rOrig;
+                    if ($rNew > 255) {
+                        $rNew = 255;
+                    } elseif ($rNew < 0) {
+                        $rNew = 0;
+                    }
+                    $gNew = ($amount * ($gOrig - $gBlur)) + $gOrig;
+                    if ($gNew > 255) {
+                        $gNew = 255;
+                    } elseif ($gNew < 0) {
+                        $gNew = 0;
+                    }
+                    $bNew = ($amount * ($bOrig - $bBlur)) + $bOrig;
+                    if ($bNew > 255) {
+                        $bNew = 255;
+                    } elseif ($bNew < 0) {
+                        $bNew = 0;
+                    }
+                    $rgbNew = ($rNew << 16) + ($gNew << 8) + $bNew;
+                    ImageSetPixel($img, $x, $y, $rgbNew);
+                }
+            }
+        }
+
+        imagedestroy($imgCanvas);
+        imagedestroy($imgBlur);
+
+        return $this;
+    }
+
+    public function copyResource(Nip_File_Image $image)
+    {
+        $this->_width = $image->getWidth();
+        $this->_height = $image->getHeight();
+        $this->_resource = $image->getResource();
+
+        return $this;
+    }
+
+    public function getWidth()
+    {
+        if (!$this->_width && $this->_resource) {
+            $this->_width = imagesx($this->_resource);
+        }
+        return $this->_width;
+    }
+
+    public function getHeight()
+    {
+        if (!$this->_height && $this->_resource) {
+            $this->_height = imagesy($this->_resource);
+        }
+        return $this->_height;
+    }
     
     public function getRatio()
     {
@@ -386,14 +386,14 @@ 
     }
 
     public function getResource()
-	{
-		return $this->_resource;
-	}
-
-	public function getFile()
-	{
-		return $this->_file;
-	}
+    {
+        return $this->_resource;
+    }
+
+    public function getFile()
+    {
+        return $this->_file;
+    }
     
     public function getExtension() {
         return Nip_File_System::instance()->getExtension($this->path);

Spacing +10 added lines, -10 removed lines

@@ -155,11 +155,11 @@ 
 		}                  
                 
         $ratio = $this->getRatio();
-        $target_ratio = $max_width/$max_height;
+        $target_ratio = $max_width / $max_height;
         
-        if ($ratio>$target_ratio){
+        if ($ratio > $target_ratio) {
 			$new_width = $max_width;
-            $new_height=round($max_width/$ratio);
+            $new_height = round($max_width / $ratio);
         } else {
 			$new_height = $max_height;
             $new_width = round($max_height * $ratio);            
@@ -189,14 +189,14 @@ 
 		}                  
                 
         $sourceRatio = $this->getRatio();
-        $target_ratio = $max_width/$max_height;
+        $target_ratio = $max_width / $max_height;
         
-        if ($sourceRatio>$target_ratio){
+        if ($sourceRatio > $target_ratio) {
 			$new_height = $max_height;
-            $new_width = ( int ) ($max_height * $sourceRatio);
+            $new_width = (int) ($max_height * $sourceRatio);
         } else {
             $new_width = $max_width;
-            $new_height = ( int ) ($max_width / $sourceRatio);      
+            $new_height = (int) ($max_width / $sourceRatio);      
         }
         
 		$image = imagecreatetruecolor($new_width, $new_height);
@@ -220,8 +220,8 @@ 
         $width  = $this->getWidth();
         $height = $this->getHeight();
         
-        $x0 = round(abs(($width - $cWidth) / 2),0);
-        $y0 = round(abs(($height - $cHeight) / 2),0);
+        $x0 = round(abs(($width - $cWidth) / 2), 0);
+        $y0 = round(abs(($height - $cHeight) / 2), 0);
 
 		$this->crop($x0, $y0, $cWidth, $cHeight, $cWidth, $cHeight);
 	}
@@ -382,7 +382,7 @@ 
     
     public function getRatio()
     {
-        return $this->getWidth()/$this->getHeight();
+        return $this->getWidth() / $this->getHeight();
     }
 
     public function getResource()

src/file/System.php

Doc Comments +4 added lines, -1 removed lines

@@ -46,7 +46,7 @@ 
      *
      * @param string $file
      * @param array $extensions
-     * @return mixed
+     * @return string|false
      */
     public function getUploadErrorNo($file, $extensions = array())
     {
@@ -199,6 +199,9 @@ 
         return $this;
     }
 
+    /**
+     * @param string $path
+     */
     public function deleteFile($path)
     {
         if (file_exists($path)) {

Spacing +2 added lines, -2 removed lines

@@ -31,10 +31,10 @@
 
         $errorCode = $this->getUploadErrorNo($file, $extensions);
         if (is_int($errorCode)) {
-            $translateSlug = 'general.errors.upload.code-'.$errorCode;
+            $translateSlug = 'general.errors.upload.code-' . $errorCode;
             return Nip_I18n::instance()->hasTranslation($translateSlug) ? __($translateSlug) : $this->_uploadErrors[$errorCode];
         } elseif (is_string($errorCode)) {
-            $translateSlug = 'general.errors.upload.'.$errorCode;
+            $translateSlug = 'general.errors.upload.' . $errorCode;
             return Nip_I18n::instance()->hasTranslation($translateSlug) ? __($translateSlug) : $messages[$errorCode];
         }
 

src/form/Abstract.php

Doc Comments +19 added lines, -1 removed lines

@@ -271,6 +271,7 @@ 
     }
 
     /**
+     * @param string $type
      * @return Nip_Form_Element_Abstract
      */
     public function getNewElement($type)
@@ -317,6 +318,9 @@ 
         return $this;
     }
 
+    /**
+     * @param string $key
+     */
     public function getOption($key)
     {
         $key = (string) $key;
@@ -352,6 +356,9 @@ 
         return $this;
     }
 
+    /**
+     * @param string $class
+     */
     public function hasClass($class) {        
         return in_array($class, explode(' ', $this->getAttrib('class')));
     }
@@ -388,6 +395,11 @@ 
         return $this->addAttribs($attribs);
     }
 
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     public function getAttrib($key)
     {
         $key = (string) $key;
@@ -568,6 +580,9 @@ 
         return $messages;
     }
 
+    /**
+     * @param string $name
+     */
     public function getMessageTemplate($name)
     {
         return $this->_messageTemplates[$name];
@@ -601,7 +616,7 @@ 
     }
 
     /**
-     * @return Nip_Form_Renderer
+     * @return Nip_Form_Abstract
      */
     public function setRendererType($type)
     {
@@ -614,6 +629,9 @@ 
         return $this->_cache[$key];
     }
 
+    /**
+     * @param string $key
+     */
     public function setCache($key, $value)
     {
         $this->_cache[$key] = $value;

Indentation +4 added lines, -4 removed lines

@@ -636,11 +636,11 @@
 
     public function getControllerView()
     {
-		if (!$this->_controllerView) {
-			$this->_controllerView = Nip_FrontController::instance()->getDispatcher()->getCurrentController()->getView();
-		}
+        if (!$this->_controllerView) {
+            $this->_controllerView = Nip_FrontController::instance()->getDispatcher()->getCurrentController()->getView();
+        }
 
-		return $this->_controllerView;
+        return $this->_controllerView;
     }
 
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -50,11 +50,11 @@ 
                 $isRequired = $arguments[2];
                 return $this->add($name, $label, $type, $isRequired);
             } else {
-                trigger_error('Undefined element type for add operation: ['.$type.']', E_USER_ERROR);
+                trigger_error('Undefined element type for add operation: [' . $type . ']', E_USER_ERROR);
             }
         }
 
-        trigger_error('Call to undefined method: ['.$name.']', E_USER_ERROR);
+        trigger_error('Call to undefined method: [' . $name . ']', E_USER_ERROR);
     }
 
     public function __get($name)
@@ -170,7 +170,7 @@ 
 
     public function addButton($name, $label = false, $type = 'button')
     {
-        $class = 'Nip_Form_Button_'.ucfirst($type);        
+        $class = 'Nip_Form_Button_' . ucfirst($type);        
         $this->_buttons[$name] = new $class($this);
         $this->_buttons[$name]->setName($name)
                 ->setLabel($label);
@@ -302,7 +302,7 @@ 
      */
     public function getElementClassName($type)
     {
-        return 'Nip_Form_Element_'.ucfirst($type);
+        return 'Nip_Form_Element_' . ucfirst($type);
         $element = new $className($this);
         return $element;
     }
@@ -594,7 +594,7 @@ 
      */
     public function getNewRenderer($type = 'basic')
     {
-        $name = 'Nip_Form_Renderer_'.ucfirst($type);
+        $name = 'Nip_Form_Renderer_' . ucfirst($type);
         $renderer = new $name();
         $renderer->setForm($this);
         return $renderer;

src/form/buttons/Abstract.php

Doc Comments +12 added lines, -4 removed lines

@@ -30,6 +30,9 @@ 
         return $this;
     }
 
+    /**
+     * @return Nip_Form_Button_Abstract
+     */
     public function getName() {
         return $this->getAttrib('name');
     }
@@ -75,7 +78,7 @@ 
     }
     
     /**
-     * @return Nip_Form_Element_Abstract
+     * @return Nip_Form_Button_Abstract
      */
     public function setAttrib($key, $value)  {
         $key = (string) $key;
@@ -85,7 +88,7 @@ 
 
     /**
      * @param  array $attribs
-     * @return Nip_Form_Element_Abstract
+     * @return Nip_Form_Button_Abstract
      */
     public function addAttribs(array $attribs) {
         foreach ($attribs as $key => $value) {
@@ -96,13 +99,18 @@ 
 
     /**
      * @param  array $attribs
-     * @return Nip_Form_Element_Abstract
+     * @return Nip_Form_Button_Abstract
      */
     public function setAttribs(array $attribs) {
         $this->clearAttribs();
         return $this->addAttribs($attribs);
     }
 
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     public function getAttrib($key) {
         $key = (string) $key;
         if (!isset($this->_attribs[$key])) {
@@ -136,7 +144,7 @@ 
     }
 
     /**
-     * @return Nip_Form_Element_Abstract
+     * @return Nip_Form_Button_Abstract
      */
     public function clearAttribs() {
         $this->_attribs = array();

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
     }
 
     public function init() {
-        $this->addClass('btn','btn-primary');
+        $this->addClass('btn', 'btn-primary');
     }
 
     public function setId($id) {
@@ -77,7 +77,7 @@ 
     /**
      * @return Nip_Form_Element_Abstract
      */
-    public function setAttrib($key, $value)  {
+    public function setAttrib($key, $value) {
         $key = (string) $key;
         $this->_attribs[$key] = $value;
         return $this;