Refs #4059 Work in progress: Conversion to use Namespaces of dozen more classes

Removed many Piwik_ functions, in Piwik 2 it is best practise to use the methods calls instead

Todo: finish converting core/ classes + convert plugins/ classes to use \Piwik\Plugin namespace + fix build + Merge master

4 files changed, 37 insertions, 22 deletions

diff --git a/plugins/API/API.php b/plugins/API/API.php
index e85974fd8e..74c7c011de 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -8,6 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_API
  */
+use Piwik\API\Request;
+use Piwik\API\Proxy;
 use Piwik\DataTable\Filter\ColumnDelete;
 use Piwik\DataTable\Row;
 use Piwik\Metrics;
@@ -16,6 +18,7 @@ use Piwik\Common;
 use Piwik\Config;
 use Piwik\Date;
 use Piwik\DataTable;
+use Piwik\Version;
 use Piwik\Plugin;
 use Piwik\Translate;
 
@@ -105,7 +108,7 @@ class Piwik_API_API
     public function getPiwikVersion()
     {
         Piwik::checkUserHasSomeViewAccess();
-        return Piwik_Version::VERSION;
+        return Version::VERSION;
     }
 
     /**
@@ -143,7 +146,7 @@ class Piwik_API_API
             'segment'        => 'visitIp',
             'acceptedValues' => '13.54.122.1, etc.',
             'sqlSegment'     => 'log_visit.location_ip',
-            'sqlFilter'      => array('Piwik_IP', 'P2N'),
+            'sqlFilter'      => array('IP', 'P2N'),
             'permission'     => $isAuthenticatedWithViewAccess,
         );
         $segments[] = array(
@@ -470,7 +473,7 @@ class Piwik_API_API
             // load the data
             $className = 'Piwik_' . $plugin . '_API';
             $params['columns'] = implode(',', $columns);
-            $dataTable = Piwik_API_Proxy::getInstance()->call($className, 'get', $params);
+            $dataTable = Proxy::getInstance()->call($className, 'get', $params);
             // make sure the table has all columns
             $array = ($dataTable instanceof DataTable\Map ? $dataTable->getArray() : array($dataTable));
             foreach ($array as $table) {
@@ -567,7 +570,7 @@ class Piwik_API_API
 
         $result = array();
         foreach ($urls as $url) {
-            $req = new Piwik_API_Request($url . '&format=php&serialize=0');
+            $req = new Request($url . '&format=php&serialize=0');
             $result[] = $req->process();
         }
         return $result;
@@ -618,7 +621,7 @@ class Piwik_API_API
             $requestLastVisits .= "&filter_limit=1000";
         }
 
-        $request = new Piwik_API_Request($requestLastVisits);
+        $request = new Request($requestLastVisits);
         $table = $request->process();
         if (empty($table)) {
             throw new Exception("There was no data to suggest for $segmentName");
diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php
index 16d8f9dd1f..ed4addae2c 100644
--- a/plugins/API/Controller.php
+++ b/plugins/API/Controller.php
@@ -8,14 +8,19 @@
  * @category Piwik_Plugins
  * @package Piwik_API
  */
+use Piwik\API\DocumentationGenerator;
+use Piwik\API\Request;
+use Piwik\API\Proxy;
 use Piwik\Config;
 use Piwik\Common;
+use Piwik\Controller;
+use Piwik\View;
 
 /**
  *
  * @package Piwik_API
  */
-class Piwik_API_Controller extends Piwik_Controller
+class Piwik_API_Controller extends Controller
 {
     function index()
     {
@@ -23,23 +28,23 @@ class Piwik_API_Controller extends Piwik_Controller
         if (!isset($_GET['filter_limit'])) {
             $_GET['filter_limit'] = Config::getInstance()->General['API_datatable_default_limit'];
         }
-        $request = new Piwik_API_Request('token_auth=' . Common::getRequestVar('token_auth', 'anonymous', 'string'));
+        $request = new Request('token_auth=' . Common::getRequestVar('token_auth', 'anonymous', 'string'));
         echo $request->process();
     }
 
     public function listAllMethods()
     {
-        $ApiDocumentation = new Piwik_API_DocumentationGenerator();
+        $ApiDocumentation = new DocumentationGenerator();
         echo $ApiDocumentation->getAllInterfaceString($outputExampleUrls = true, $prefixUrls = Common::getRequestVar('prefixUrl', ''));
     }
 
     public function listAllAPI()
     {
-        $view = new Piwik_View("@API/listAllAPI");
+        $view = new View("@API/listAllAPI");
         $this->setGeneralVariablesView($view);
 
-        $ApiDocumentation = new Piwik_API_DocumentationGenerator();
-        $view->countLoadedAPI = Piwik_API_Proxy::getInstance()->getCountRegisteredClasses();
+        $ApiDocumentation = new DocumentationGenerator();
+        $view->countLoadedAPI = Proxy::getInstance()->getCountRegisteredClasses();
         $view->list_api_methods_with_links = $ApiDocumentation->getAllInterfaceString();
         echo $view->render();
     }
diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index a008c82025..b30a3d7901 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -1,4 +1,5 @@
 <?php
+use Piwik\API\Request;
 use Piwik\DataTable\Simple;
 use Piwik\DataTable\Row;
 use Piwik\Metrics;
@@ -7,6 +8,8 @@ use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Date;
 use Piwik\DataTable;
+use Piwik\Url;
+use Piwik\Timer;
 use Piwik\Site;
 
 /**
@@ -243,7 +246,7 @@ class Piwik_API_ProcessedReport
                                        $apiParameters = false, $idGoal = false, $language = false,
                                        $showTimer = true, $hideMetricsDoc = false, $idSubtable = false, $showRawMetrics = false)
     {
-        $timer = new Piwik_Timer();
+        $timer = new Timer();
         if (empty($apiParameters)) {
             $apiParameters = array();
         }
@@ -273,8 +276,8 @@ class Piwik_API_ProcessedReport
                                                   ));
         if (!empty($segment)) $parameters['segment'] = $segment;
 
-        $url = Piwik_Url::getQueryStringFromParameters($parameters);
-        $request = new Piwik_API_Request($url);
+        $url = Url::getQueryStringFromParameters($parameters);
+        $request = new Request($url);
         try {
             /** @var DataTable */
             $dataTable = $request->process();
diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php
index ec6b3c06fc..21ab108c8d 100644
--- a/plugins/API/RowEvolution.php
+++ b/plugins/API/RowEvolution.php
@@ -8,6 +8,9 @@
  * @category Piwik_Plugins
  * @package Piwik_API
  */
+use Piwik\API\DataTableManipulator\LabelFilter;
+use Piwik\API\ResponseBuilder;
+use Piwik\API\Request;
 use Piwik\DataTable\Filter\CalculateEvolutionFilter;
 use Piwik\DataTable\Filter\SafeDecodeLabel;
 use Piwik\DataTable\Row;
@@ -15,6 +18,7 @@ use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\DataTable;
+use Piwik\Url;
 
 /**
  * This class generates a Row evolution dataset, from input request
@@ -36,7 +40,7 @@ class Piwik_API_RowEvolution
             throw new Exception("Row evolutions can not be processed with this combination of \'date\' and \'period\' parameters.");
         }
 
-        $label = Piwik_API_ResponseBuilder::unsanitizeLabelParameter($label);
+        $label = ResponseBuilder::unsanitizeLabelParameter($label);
         $labels = Piwik::getArrayFromApiParameter($label);
 
 
@@ -80,7 +84,7 @@ class Piwik_API_RowEvolution
             foreach ($table->getRows() as $row) {
                 $label = $row->getColumn('label');
                 if (isset($labelsToIndex[$label])) {
-                    $row->setMetadata(Piwik_API_DataTableManipulator_LabelFilter::FLAG_IS_ROW_EVOLUTION, $labelsToIndex[$label]);
+                    $row->setMetadata(LabelFilter::FLAG_IS_ROW_EVOLUTION, $labelsToIndex[$label]);
                 }
             }
         }
@@ -155,7 +159,7 @@ class Piwik_API_RowEvolution
 
         // if we have a recursive label and no url, use the path
         if (!$urlFound) {
-            $actualLabel = str_replace(Piwik_API_DataTableManipulator_LabelFilter::SEPARATOR_RECURSIVE_LABEL, ' - ', $label);
+            $actualLabel = str_replace(LabelFilter::SEPARATOR_RECURSIVE_LABEL, ' - ', $label);
         }
 
         $return = array(
@@ -237,9 +241,9 @@ class Piwik_API_RowEvolution
             $parameters['filter_add_columns_when_show_all_columns'] = '1';
         }
 
-        $url = Piwik_Url::getQueryStringFromParameters($parameters);
+        $url = Url::getQueryStringFromParameters($parameters);
 
-        $request = new Piwik_API_Request($url);
+        $request = new Request($url);
 
         try {
             $dataTable = $request->process();
@@ -450,7 +454,7 @@ class Piwik_API_RowEvolution
     }
 
     /**
-     * Returns the row in a datatable by its Piwik_API_DataTableManipulator_LabelFilter::FLAG_IS_ROW_EVOLUTION metadata.
+     * Returns the row in a datatable by its LabelFilter::FLAG_IS_ROW_EVOLUTION metadata.
      *
      * @param DataTable $table
      * @param int $labelIdx
@@ -461,7 +465,7 @@ class Piwik_API_RowEvolution
         $labelIdx = (int)$labelIdx;
         foreach ($table->getRows() as $row)
         {
-            if ($row->getMetadata(Piwik_API_DataTableManipulator_LabelFilter::FLAG_IS_ROW_EVOLUTION) === $labelIdx)
+            if ($row->getMetadata(LabelFilter::FLAG_IS_ROW_EVOLUTION) === $labelIdx)
             {
                 return $row;
             }
@@ -476,6 +480,6 @@ class Piwik_API_RowEvolution
      */
     private function cleanOriginalLabel($label)
     {
-        return str_replace(Piwik_API_DataTableManipulator_LabelFilter::SEPARATOR_RECURSIVE_LABEL, ' - ', $label);
+        return str_replace(LabelFilter::SEPARATOR_RECURSIVE_LABEL, ' - ', $label);
     }
 }