Refs #3741 Resuming PHP Namespaces conversion of Piwik core, mostly f…

…inished core/ conversion
matomo-org · Jul 30, 2013 · 765be0d · 765be0d
1 parent 5104d94
commit 765be0d
Show file tree

Hide file tree

Showing 150 changed files with 382 additions and 559 deletions.
diff --git a/core/API/DocumentationGenerator.php b/core/API/DocumentationGenerator.php
@@ -14,8 +14,7 @@
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\API\Proxy;
-use Piwik_API_Proxy_NoDefaultValue;
-use Piwik_Url;
+use Piwik\Url;
 
 /**
  * @package Piwik
@@ -203,11 +202,11 @@ public function getExampleUrl($class, $methodName, $parametersToSet = array())
                 $defaultValue = $knowExampleDefaultParametersValues[$nameVariable];
             } // if there isn't a default value for a given parameter,
             // we need a 'know default value' or we can't generate the link
-            elseif ($defaultValue instanceof Piwik_API_Proxy_NoDefaultValue) {
+            elseif ($defaultValue instanceof NoDefaultValue) {
                 return false;
             }
         }
-        return '?' . Piwik_Url::getQueryStringFromParameters($aParameters);
+        return '?' . Url::getQueryStringFromParameters($aParameters);
     }
 
     /**
@@ -228,7 +227,7 @@ public function getParametersString($class, $name)
                 continue;
             }
             $str = $nameVariable;
-            if (!($defaultValue instanceof Piwik_API_Proxy_NoDefaultValue)) {
+            if (!($defaultValue instanceof NoDefaultValue)) {
                 if (is_array($defaultValue)) {
                     $str .= " = 'Array'";
                 } else {

diff --git a/core/API/Proxy.php b/core/API/Proxy.php
@@ -50,7 +50,7 @@ class Proxy
      */
     protected function __construct()
     {
-        $this->noDefaultValue = new Piwik_API_Proxy_NoDefaultValue();
+        $this->noDefaultValue = new NoDefaultValue();
     }
 
     /**
@@ -60,10 +60,10 @@ protected function __construct()
      */
     static public function getInstance()
     {
-        if (\Piwik\API\self::$instance == null) {
-            \Piwik\API\self::$instance = new \Piwik\API\self;
+        if (self::$instance == null) {
+            self::$instance = new self;
         }
-        return \Piwik\API\self::$instance;
+        return self::$instance;
     }
 
     /**
@@ -203,7 +203,7 @@ public function call($className, $methodName, $parametersRequest)
 
             // log the API Call
             try {
-                Zend_Registry::get('logger_api_call')->logEvent(
+                \Zend_Registry::get('logger_api_call')->logEvent(
                     $className,
                     $methodName,
                     $parameterNamesDefaultValues,
@@ -277,7 +277,7 @@ private function getRequestParametersArray($requiredParameters, $parametersReque
         $finalParameters = array();
         foreach ($requiredParameters as $name => $defaultValue) {
             try {
-                if ($defaultValue instanceof Piwik_API_Proxy_NoDefaultValue) {
+                if ($defaultValue instanceof NoDefaultValue) {
                     $requestValue = Common::getRequestVar($name, null, null, $parametersRequest);
                 } else {
                     try {
@@ -315,7 +315,7 @@ private function getRequestParametersArray($requiredParameters, $parametersReque
      */
     private function includeApiFile($fileName)
     {
-        $module = \Piwik\API\self::getModuleNameFromClassName($fileName);
+        $module = self::getModuleNameFromClassName($fileName);
         $path = PIWIK_INCLUDE_PATH . '/plugins/' . $module . '/API.php';
 
         if (is_readable($path)) {
@@ -414,6 +414,6 @@ private function checkClassIsSingleton($className)
  * @package Piwik
  * @subpackage Piwik_API
  */
-class Piwik_API_Proxy_NoDefaultValue
+class NoDefaultValue
 {
 }
diff --git a/core/Access.php b/core/Access.php
@@ -13,6 +13,7 @@
 use Piwik\Config;
 use Piwik\Common;
 use Piwik\Auth;
+use Piwik\Db;
 
 /**
  * Class to handle User Access:

diff --git a/core/Archive.php b/core/Archive.php
@@ -456,7 +456,7 @@ private function cacheArchiveIdsAfterLaunching($archiveGroups, $plugins)
                     continue;
                 }
 
-                // if the starting date is in the future we know there is no visit
+                // if the starting date is in the future we know there is no visiidsite = ?t
                 if ($twoDaysBeforePeriod->isLater($today)) {
                     $archiveDesc = $this->getArchiveDescriptor($idSite, $period);
                     Piwik::log("Archive $archiveDesc skipped, archive is after today.");

diff --git a/core/Controller.php b/core/Controller.php
@@ -680,7 +680,7 @@ public function redirectToIndex($moduleToRedirect, $actionToRedirect, $websiteId
             && $currentLogin != 'anonymous'
         ) {
             $errorMessage = sprintf(Piwik_Translate('CoreHome_NoPrivilegesAskPiwikAdmin'), $currentLogin, "<br/><a href='mailto:" . Piwik::getSuperUserEmail() . "?subject=Access to Piwik for user $currentLogin'>", "</a>");
-            $errorMessage .= "<br /><br />&nbsp;&nbsp;&nbsp;<b><a href='index.php?module=" . Zend_Registry::get('auth')->getName() . "&amp;action=logout'>&rsaquo; " . Piwik_Translate('General_Logout') . "</a></b><br />";
+            $errorMessage .= "<br /><br />&nbsp;&nbsp;&nbsp;<b><a href='index.php?module=" . \Zend_Registry::get('auth')->getName() . "&amp;action=logout'>&rsaquo; " . Piwik_Translate('General_Logout') . "</a></b><br />";
             Piwik_ExitWithMessage($errorMessage, false, true);
         }
 

diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php
@@ -21,6 +21,7 @@
 use Piwik\Segment;
 use Piwik\Site;
 use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\Db;
 
 /**
  * Data Access object used to query archives

diff --git a/core/DataAccess/ArchiveTableCreator.php b/core/DataAccess/ArchiveTableCreator.php
@@ -51,7 +51,7 @@ static protected function createArchiveTablesIfAbsent($tableName, $tableNamePref
         }
 
         if (!in_array($tableName, self::$tablesAlreadyInstalled)) {
-            $db = Zend_Registry::get('db');
+            $db = \Zend_Registry::get('db');
             $sql = Piwik::getTableCreateSql($tableNamePrefix);
 
             // replace table name template by real name

diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php
@@ -511,6 +511,6 @@ static public function makeArrayOneColumn($row, $columnName, $lookForThisPrefix
 
     public function getDb()
     {
-        return Zend_Registry::get('db');
+        return \Zend_Registry::get('db');
     }
 }
diff --git a/core/Db.php b/core/Db.php
@@ -31,7 +31,7 @@ static private function getDb()
             $db = Tracker::getDatabase();
         }
         if ($db === null) {
-            $db = Zend_Registry::get('db');
+            $db = \Zend_Registry::get('db');
         }
         return $db;
     }
@@ -42,13 +42,13 @@ static private function getDb()
      * If you want to fetch data from the DB you should use the function Db::fetchAll()
      *
      * @param string $sql  SQL Query
-     * @return integer|Zend_Db_Statement
+     * @return integer|\Zend_Db_Statement
      */
     static public function exec($sql)
     {
-        $db = Zend_Registry::get('db');
+        $db = \Zend_Registry::get('db');
         $profiler = $db->getProfiler();
-        $q = $profiler->queryStart($sql, Zend_Db_Profiler::INSERT);
+        $q = $profiler->queryStart($sql, \Zend_Db_Profiler::INSERT);
         $return = self::getDb()->exec($sql);
         $profiler->queryEnd($q);
         return $return;
@@ -315,7 +315,7 @@ static public function segmentedFetchOne($sql, $first, $last, $step, $params = a
      *
      * @return array
      */
-    static public function segmentedFetchAll($sql, $first, $last, $step, $params)
+    static public function segmentedFetchAll($sql, $first, $last, $step, $params = array())
     {
         $result = array();
         if ($step > 0) {
@@ -378,7 +378,7 @@ static public function getDbLock($lockName, $maxRetries = 30)
          */
         $sql = 'SELECT GET_LOCK(?, 1)';
 
-        $db = Zend_Registry::get('db');
+        $db = \Zend_Registry::get('db');
 
         while ($maxRetries > 0) {
             if ($db->fetchOne($sql, array($lockName)) == '1') {
@@ -399,7 +399,7 @@ static public function releaseDbLock($lockName)
     {
         $sql = 'SELECT RELEASE_LOCK(?)';
 
-        $db = Zend_Registry::get('db');
+        $db = \Zend_Registry::get('db');
         return $db->fetchOne($sql, array($lockName)) == '1';
     }
 }
diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php
@@ -75,7 +75,7 @@ public static function factory($adapterName, & $dbInfos, $connect = true)
      */
     private static function getAdapterClassName($adapterName)
     {
-        return 'Piwik_Db_Adapter_' . str_replace(' ', '_', ucwords(str_replace('_', ' ', strtolower($adapterName))));
+         return 'Piwik\Db\Adapter\\' . str_replace(' ', '\\', ucwords(str_replace('_', ' ', strtolower($adapterName))));
     }
 
     /**

diff --git a/core/Db/Adapter/Pdo/Mssql.php b/core/Db/Adapter/Pdo/Mssql.php
@@ -14,7 +14,7 @@
 use PDO;
 use PDOException;
 use Piwik\Config;
-use Piwik\Db\Adapter\AdapterInterface;
+use Piwik\Db\AdapterInterface;
 use Zend_Db;
 use Zend_Db_Adapter_Exception;
 use Zend_Db_Adapter_Pdo_Mssql;

diff --git a/core/Db/Adapter/Pdo/Mysql.php b/core/Db/Adapter/Pdo/Mysql.php
@@ -14,7 +14,7 @@
 use PDO;
 use PDOException;
 use Piwik\Config;
-use Piwik\Db\Adapter\AdapterInterface;
+use Piwik\Db\AdapterInterface;
 use Zend_Config;
 use Zend_Db_Adapter_Pdo_Mysql;
 use Zend_Db_Select;

diff --git a/core/Db/Adapter/Pdo/Pgsql.php b/core/Db/Adapter/Pdo/Pgsql.php
@@ -14,7 +14,7 @@
 use PDO;
 use PDOException;
 use Piwik\Config;
-use Piwik\Db\Adapter\AdapterInterface;
+use Piwik\Db\AdapterInterface;
 use Zend_Db_Adapter_Pdo_Pgsql;
 
 /**

diff --git a/core/Db/Schema.php b/core/Db/Schema.php
@@ -11,7 +11,6 @@
 namespace Piwik\Db;
 
 use Piwik\Config;
-use Piwik\Db\Schema\SchemaInterface;
 
 /**
  * Schema abstraction
@@ -58,7 +57,7 @@ static public function getInstance()
      */
     private static function getSchemaClassName($schemaName)
     {
-        return 'Piwik_Db_Schema_' . str_replace(' ', '_', ucwords(str_replace('_', ' ', strtolower($schemaName))));
+        return '\Piwik\Db\Schema\\' . str_replace(' ', '\\', ucwords(str_replace('_', ' ', strtolower($schemaName))));
     }
 
     /**
@@ -150,7 +149,7 @@ private function loadSchema()
     /**
      * Returns an instance that subclasses Schema
      *
-     * @return \Piwik\Db\Schema\SchemaInterface
+     * @return \Piwik\Db\SchemaInterface
      */
     private function getSchema()
     {

diff --git a/core/Db/Schema/Myisam.php b/core/Db/Schema/Myisam.php
@@ -12,12 +12,14 @@
 
 use Exception;
 use Piwik\Config;
-use Piwik\Db\Schema\SchemaInterface;
+use Piwik\Db\SchemaInterface;
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Date;
+use Piwik\Db;
 use Zend_Registry;
 
+
 /**
  * MySQL schema
  *
@@ -34,7 +36,7 @@ class Myisam implements SchemaInterface
      */
     static private function hasStorageEngine($engineName)
     {
-        $db = Zend_Registry::get('db');
+        $db = \Zend_Registry::get('db');
         $allEngines = $db->fetchAssoc('SHOW ENGINES');
         if (array_key_exists($engineName, $allEngines)) {
             $support = $allEngines[$engineName]['Support'];
@@ -452,7 +454,7 @@ public function getTablesInstalled($forceReload = true)
         if (is_null($this->tablesInstalled)
             || $forceReload === true
         ) {
-            $db = Zend_Registry::get('db');
+            $db = \Zend_Registry::get('db');
             $config = Config::getInstance();
             $prefixTables = $config->database['tables_prefix'];
 
@@ -515,7 +517,7 @@ public function dropDatabase()
      */
     public function createTables()
     {
-        $db = Zend_Registry::get('db');
+        $db = \Zend_Registry::get('db');
         $config = Config::getInstance();
         $prefixTables = $config->database['tables_prefix'];
 
@@ -539,7 +541,7 @@ public function createAnonymousUser()
     {
         // The anonymous user is the user that is assigned by default
         // note that the token_auth value is anonymous, which is assigned by default as well in the Login plugin
-        $db = Zend_Registry::get('db');
+        $db = \Zend_Registry::get('db');
         $db->query("INSERT INTO " . Common::prefixTable("user") . "
 					VALUES ( 'anonymous', '', 'anonymous', 'anonymous@example.org', 'anonymous', '" . Date::factory('now')->getDatetime() . "' );");
     }
@@ -563,7 +565,7 @@ public function truncateAllTables()
     public function dropTables($doNotDelete = array())
     {
         $tablesAlreadyInstalled = $this->getTablesInstalled();
-        $db = Zend_Registry::get('db');
+        $db = \Zend_Registry::get('db');
 
         $doNotDeletePattern = '/(' . implode('|', $doNotDelete) . ')/';
 

diff --git a/core/ErrorHandler.php b/core/ErrorHandler.php
@@ -47,7 +47,7 @@ function Piwik_ErrorHandler($errno, $errstr, $errfile, $errline)
     }
 
     try {
-        Zend_Registry::get('logger_error')->logEvent($errno, $errstr, $errfile, $errline, $backtrace);
+        \Zend_Registry::get('logger_error')->logEvent($errno, $errstr, $errfile, $errline, $backtrace);
     } catch (Exception $e) {
         // in case the error occurs before the logger creation, we simply display it
         print("<pre>$errstr \nin '$errfile' at the line $errline\n\n$backtrace\n</pre>");

diff --git a/core/ExceptionHandler.php b/core/ExceptionHandler.php
@@ -9,6 +9,7 @@
  * @package Piwik
  */
 use Piwik\Piwik;
+use Piwik\Log;
 use Piwik\FrontController;
 
 /**
@@ -20,7 +21,7 @@
 function Piwik_ExceptionHandler(Exception $exception)
 {
     try {
-        Zend_Registry::get('logger_exception')->logEvent($exception);
+        \Zend_Registry::get('logger_exception')->logEvent($exception);
     } catch (Exception $e) {
 
         if (FrontController::shouldRethrowException()) {
@@ -36,7 +37,7 @@ function Piwik_ExceptionHandler(Exception $exception)
         $event['errline'] = $exception->getLine();
         $event['backtrace'] = $exception->getTraceAsString();
 
-        $formatter = new Piwik_Log_Exception_Formatter_ScreenFormatter();
+        $formatter = new ExceptionScreenFormatter();
 
         $message = $formatter->format($event);
         $message .= "<br /><br />And this exception raised another exception \"" . $e->getMessage() . "\"";

diff --git a/core/FrontController.php b/core/FrontController.php
@@ -218,7 +218,7 @@ public function init()
         $initialized = true;
 
         try {
-            Zend_Registry::set('timer', new Timer);
+            \Zend_Registry::set('timer', new Timer);
 
             $directoriesToCheck = array(
                 '/tmp/',
@@ -277,7 +277,7 @@ public function init()
 
             Piwik_PostEvent('FrontController.initAuthenticationObject');
             try {
-                $authAdapter = Zend_Registry::get('auth');
+                $authAdapter = \Zend_Registry::get('auth');
             } catch (Exception $e) {
                 throw new Exception("Authentication object cannot be found in the Registry. Maybe the Login plugin is not activated?
                                 <br />You can activate the plugin by adding:<br />