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

1 files changed, 24 insertions, 12 deletions

diff --git a/core/Twig.php b/core/Twig.php
index 124f018fb5..ea5e23d9f5 100644
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -8,17 +8,29 @@
  * @category Piwik
  * @package Piwik
  */
+namespace Piwik;
+
+use Exception;
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\AssetManager;
 use Piwik\Translate;
+use Piwik\Url;
+use Piwik_Visualization_Sparkline;
+use Twig_Environment;
+use Twig_Extension_Debug;
+use Twig_Loader_Chain;
+use Twig_Loader_Filesystem;
+use Twig_SimpleFilter;
+use Twig_SimpleFunction;
 
 /**
  * Twig class
  *
  * @package Piwik
- * @subpackage Piwik_Twig
+ * @subpackage Twig
  */
-class Piwik_Twig
+class Twig
 {
     /**
      * @var Twig_Environment
@@ -37,9 +49,9 @@ class Piwik_Twig
         // Create new Twig Environment and set cache dir
         $this->twig = new Twig_Environment($chainLoader,
             array(
-                 'debug' => true, // to use {{ dump(var) }} in twig templates
+                 'debug'            => true, // to use {{ dump(var) }} in twig templates
                  'strict_variables' => true, // throw an exception if variables are invalid
-                 'cache' => PIWIK_USER_PATH . '/tmp/templates_c',
+                 'cache'            => PIWIK_USER_PATH . '/tmp/templates_c',
             )
         );
         $this->twig->addExtension(new Twig_Extension_Debug());
@@ -50,7 +62,7 @@ class Piwik_Twig
         $this->addFilter_sumTime();
         $this->addFilter_money();
         $this->addFilter_truncate();
-        $this->twig->addFilter( new Twig_SimpleFilter('implode', 'implode'));
+        $this->twig->addFilter(new Twig_SimpleFilter('implode', 'implode'));
 
         $this->addFunction_includeAssets();
         $this->addFunction_linkTo();
@@ -69,9 +81,9 @@ class Piwik_Twig
             $assetType = strtolower($params['type']);
             switch ($assetType) {
                 case 'css':
-                    return Piwik_AssetManager::getCssAssets();
+                    return AssetManager::getCssAssets();
                 case 'js':
-                    return Piwik_AssetManager::getJsAssets();
+                    return AssetManager::getJsAssets();
                 default:
                     throw new Exception("The twig function includeAssets 'type' parameter needs to be either 'css' or 'js'.");
             }
@@ -125,7 +137,7 @@ class Piwik_Twig
     protected function addFunction_linkTo()
     {
         $urlFunction = new Twig_SimpleFunction('linkTo', function ($params) {
-            return 'index.php' . Piwik_Url::getCurrentQueryStringWithParametersModified($params);
+            return 'index.php' . Url::getCurrentQueryStringWithParametersModified($params);
         });
         $this->twig->addFunction($urlFunction);
     }
@@ -136,8 +148,8 @@ class Piwik_Twig
     private function getDefaultThemeLoader()
     {
         $themeLoader = new Twig_Loader_Filesystem(array(
-            sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, \Piwik\PluginsManager::DEFAULT_THEME)
-        ));
+                                                       sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, \Piwik\PluginsManager::DEFAULT_THEME)
+                                                  ));
 
         return $themeLoader;
     }
@@ -185,7 +197,7 @@ class Piwik_Twig
     {
         $urlRewriteFilter = new Twig_SimpleFilter('urlRewriteWithParameters', function ($parameters) {
             $parameters['updated'] = null;
-            $url = Piwik_Url::getCurrentQueryStringWithParametersModified($parameters);
+            $url = Url::getCurrentQueryStringWithParametersModified($parameters);
             return $url;
         });
         $this->twig->addFilter($urlRewriteFilter);
@@ -214,7 +226,7 @@ class Piwik_Twig
     private function addPluginNamespaces(Twig_Loader_Filesystem $loader)
     {
         $plugins = \Piwik\PluginsManager::getInstance()->getLoadedPluginsName();
-        foreach($plugins as $name) {
+        foreach ($plugins as $name) {
             $name = Common::unprefixClass($name);
             $path = sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, $name);
             if (is_dir($path)) {