peephole optimization to singletons, i.e., new self vs. $c = __CLASS_…

…_; new $c
matomo-org · Oct 28, 2010 · cb3c11b · cb3c11b
1 parent 79030f7
commit cb3c11b
Show file tree

Hide file tree

Showing 32 changed files with 60 additions and 92 deletions.
diff --git a/core/API/Proxy.php b/core/API/Proxy.php
@@ -53,9 +53,8 @@ protected function __construct()
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/core/DataTable/Manager.php b/core/DataTable/Manager.php
@@ -29,9 +29,8 @@ class Piwik_DataTable_Manager
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/core/Db/Schema.php b/core/Db/Schema.php
@@ -33,8 +33,7 @@ static public function getInstance()
 	{
 		if (self::$instance === null)
 		{
-			$c = __CLASS__;
-			self::$instance = new $c();
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/core/FrontController.php b/core/FrontController.php
@@ -48,9 +48,8 @@ class Piwik_FrontController
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{			
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/core/Menu/Admin.php b/core/Menu/Admin.php
@@ -22,9 +22,8 @@ class Piwik_Menu_Admin extends Piwik_Menu_Abstract
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/core/Menu/Main.php b/core/Menu/Main.php
@@ -23,9 +23,8 @@ class Piwik_Menu_Main extends Piwik_Menu_Abstract
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{			
-			$c = get_class();
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/core/Menu/Top.php b/core/Menu/Top.php
@@ -22,9 +22,8 @@ class Piwik_Menu_Top extends Piwik_Menu_Abstract
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/core/Option.php b/core/Option.php
@@ -31,9 +31,8 @@ class Piwik_Option
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{			
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/core/PluginsManager.php b/core/PluginsManager.php
@@ -65,9 +65,8 @@ class Piwik_PluginsManager
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{			
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/core/Tracker/Config.php b/core/Tracker/Config.php
@@ -42,9 +42,8 @@ class Piwik_Tracker_Config
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{			
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/core/Translate.php b/core/Translate.php
@@ -24,9 +24,8 @@ class Piwik_Translate
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{			
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/API/API.php b/plugins/API/API.php
@@ -43,7 +43,6 @@ public function getCssFiles($notification) {
 
 		$cssFiles[] = "plugins/API/css/styles.css";
 	}
-
 }
 
 
@@ -62,8 +61,7 @@ static public function getInstance()
 	{
 		if (self::$instance == null)
 		{
-			$c = __CLASS__;
-			self::$instance = new $c();
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
@@ -23,8 +23,7 @@ static public function getInstance()
 	{
 		if (self::$instance == null)
 		{
-			$c = __CLASS__;
-			self::$instance = new $c();
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php
@@ -21,8 +21,7 @@ static public function getInstance()
 	{
 		if (self::$instance == null)
 		{
-			$c = __CLASS__;
-			self::$instance = new $c();
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/DBStats/API.php b/plugins/DBStats/API.php
@@ -20,9 +20,8 @@ class Piwik_DBStats_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php
@@ -45,8 +45,7 @@ static public function getInstance()
 	{
 		if (self::$instance == null)
 		{
-			$c = __CLASS__;
-			self::$instance = new $c();
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/ExampleUI/API.php b/plugins/ExampleUI/API.php
@@ -19,9 +19,8 @@ class Piwik_ExampleUI_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
@@ -23,9 +23,8 @@ class Piwik_Goals_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php
@@ -21,9 +21,8 @@ class Piwik_LanguagesManager_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/Live/API.php b/plugins/Live/API.php
@@ -28,8 +28,7 @@ static public function getInstance()
 	{
 		if (self::$instance == null)
 		{
-			$c = __CLASS__;
-			self::$instance = new $c();
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}
@@ -227,8 +226,9 @@ private function loadLastVisitorDetailsFromDatabase($idSite, $period = false, $d
 
 			array_push(     $where, Piwik_Common::prefixTable('log_visit') . ".visit_first_action_time BETWEEN ? AND ?");
 			array_push(     $whereBind,
-			$processedPeriod->getDateStart()->toString(),
-			$processedPeriod->getDateEnd()->addDay(1)->toString());
+				$processedPeriod->getDateStart()->toString(),
+				$processedPeriod->getDateEnd()->addDay(1)->toString()
+			);
 		}
 
 		$sqlWhere = "";

diff --git a/plugins/PDFReports/API.php b/plugins/PDFReports/API.php
@@ -25,9 +25,8 @@ class Piwik_PDFReports_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/Provider/API.php b/plugins/Provider/API.php
@@ -26,9 +26,8 @@ class Piwik_Provider_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/Referers/API.php b/plugins/Referers/API.php
@@ -26,8 +26,7 @@ static public function getInstance()
 	{
 		if (self::$instance == null)
 		{
-			$c = __CLASS__;
-			self::$instance = new $c();
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/SEO/API.php b/plugins/SEO/API.php
@@ -27,9 +27,8 @@ class Piwik_SEO_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
@@ -24,9 +24,8 @@ class Piwik_SitesManager_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php
@@ -27,9 +27,8 @@ class Piwik_UserCountry_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
@@ -25,9 +25,8 @@ class Piwik_UserSettings_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
@@ -24,9 +24,8 @@ class Piwik_UsersManager_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php
@@ -20,9 +20,8 @@ class Piwik_VisitFrequency_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php
@@ -20,9 +20,8 @@ class Piwik_VisitTime_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/VisitorInterest/API.php b/plugins/VisitorInterest/API.php
@@ -20,9 +20,8 @@ class Piwik_VisitorInterest_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}

diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
@@ -20,9 +20,8 @@ class Piwik_VisitsSummary_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
-			$c = __CLASS__;
-			self::$instance = new $c();
+		{
+			self::$instance = new self;
 		}
 		return self::$instance;
 	}