fixes #1049 - peephole optimizations (assignment to a temporary variable before returning)

git-svn-id: http://dev.piwik.org/svn/trunk@1613 59fd770c-687e-43c8-a1e3-f5a4ff64c105

core/DataTable.php

@@ -588,14 +588,13 @@ class Piwik_DataTable
 	 */
 	public function getRowsCount()
 	{
-		$count = count($this->rows);
 		if(is_null($this->summaryRow))
 		{
-			return $count;
+			return count($this->rows);
 		}
 		else
 		{
-			return $count + 1;
+			return count($this->rows) + 1;
 		}
 	}
 
@@ -820,10 +819,7 @@ class Piwik_DataTable
 		$table1->rebuildIndex();
 		$table2->rebuildIndex();
 		
-		$countrows1 = $table1->getRowsCount();
-		$countrows2 = $table2->getRowsCount();
-		
-		if($countrows1 != $countrows2)
+		if($table1->getRowsCount() != $table2->getRowsCount())
 		{
 			return false;
 		}
@@ -831,11 +827,8 @@ class Piwik_DataTable
 		foreach($rows1 as $row1)
 		{
 			$row2 = $table2->getRowFromLabel($row1->getColumn('label'));
-			if($row2 === false)
-			{
-				return false;
-			}
-			if( !Piwik_DataTable_Row::isEqual($row1,$row2) )
+			if($row2 === false
+				|| !Piwik_DataTable_Row::isEqual($row1,$row2))
 			{
 				return false;
 			}

core/Log.php

@@ -139,8 +139,7 @@ class Piwik_Log_Formatter_FileFormatter implements Zend_Log_Formatter_Interface
 		}
 		$ts = $event['timestamp'];
 		unset($event['timestamp']);
-		$str = $ts . ' ' . implode(" ", $event) . "\n";
-		return $str;
+		return $ts . ' ' . implode(" ", $event) . "\n";
 	}
 }
 
@@ -156,11 +155,10 @@ class Piwik_Log_Formatter_ScreenFormatter implements Zend_Log_Formatter_Interfac
 		// no injection in error messages, backtrace when displayed on screen
 		return array_map('htmlspecialchars', $event);
 	}
-	
+
 	function format($string)
 	{
-		$string = self::getFormattedString($string);
-		return $string;
+		return self::getFormattedString($string);
 	}
 	
 	static public function getFormattedString($string)

core/Period.php

@@ -221,8 +221,7 @@ abstract class Piwik_Period
 	
 	public function __toString()
 	{
-		$elements = $this->toString();
-		return implode(",", $elements);
+		return implode(",", $this->toString());
 	}
 	
 	public function get( $part= null )

core/PluginsManager.php

@@ -192,9 +192,7 @@ class Piwik_PluginsManager
 	 */
 	public function getLoadedPluginsName()
 	{
-		$oPlugins = $this->getLoadedPlugins();
-		$pluginNames = array_map('get_class',$oPlugins);
-		return $pluginNames;
+		return array_map('get_class', $this->getLoadedPlugins());
 	}
 	
 	/**

core/TablePartitioning.php

@@ -108,11 +108,7 @@ class Piwik_TablePartitioning_Monthly extends Piwik_TablePartitioning
 	protected function generateTableName()
 	{
 		$config = Zend_Registry::get('config');
-		$prefixTables = $config->database->tables_prefix;
-		
-		$date = date("Y_m", $this->timestamp);
-		
-		return $prefixTables . $this->tableName . "_" . $date;
+		return $config->database->tables_prefix . $this->tableName . "_" . date("Y_m", $this->timestamp);
 	}
 		
 }
@@ -131,10 +127,6 @@ class Piwik_TablePartitioning_Daily extends Piwik_TablePartitioning
 	protected function generateTableName()
 	{
 		$config = Zend_Registry::get('config');
-		$prefixTables = $config->database->tables_prefix;
-		
-		$date = date("Y_m_d", $this->timestamp);
-		
-		return $prefixTables . $this->tableName . "_" . $date;
+		return $config->database->tables_prefix . $this->tableName . "_" . date("Y_m_d", $this->timestamp);
 	}		
 }