Refs #4208 Move Plugin classes to core/Plugin for clarity

matomo-org · Oct 10, 2013 · b6a4d25 · b6a4d25
1 parent 13b35fa
commit b6a4d25
Show file tree

Hide file tree

Showing 65 changed files with 84 additions and 102 deletions.
diff --git a/core/FrontController.php b/core/FrontController.php
@@ -14,6 +14,7 @@
 use Exception;
 use Piwik\API\Request;
 use Piwik\API\ResponseBuilder;
+use Piwik\Plugin\Controller;
 use Piwik\Session;
 
 /**

diff --git a/core/Menu/MenuAbstract.php b/core/Menu/MenuAbstract.php
@@ -25,11 +25,6 @@ abstract class MenuAbstract
     protected $renames = array();
     protected $orderingApplied = false;
 
-    /*
-     * Can't enforce static function in 5.2.
-     */
-    //abstract static public function getInstance();
-
     /**
      * Builds the menu, applies edits, renames
      * and orders the entries.

diff --git a/core/PluginsArchiver.php → core/Plugin/Archiver.php b/core/PluginsArchiver.php → core/Plugin/Archiver.php
@@ -9,14 +9,15 @@
  * @package Piwik_PluginArchiver
  */
 
-namespace Piwik;
+namespace Piwik\Plugin;
 
 use Piwik\ArchiveProcessor;
+use Piwik\Config;
 
 /**
  * Plugins that archive metrics for websites can implement an Archiver that extends this class
  */
-abstract class PluginsArchiver
+abstract class Archiver
 {
     protected $processor;
 

diff --git a/core/Controller.php → core/Plugin/Controller.php b/core/Controller.php → core/Plugin/Controller.php
@@ -8,19 +8,30 @@
  * @category Piwik
  * @package Piwik
  */
-namespace Piwik;
+namespace Piwik\Plugin;
 
 use Exception;
+use Piwik\Access;
 use Piwik\API\Request;
+use Piwik\Common;
+use Piwik\Config;
 use Piwik\DataTable\Filter\CalculateEvolutionFilter;
+use Piwik\Date;
+use Piwik\FrontController;
 use Piwik\Menu\MenuTop;
+use Piwik\NoAccessException;
 use Piwik\Period\Month;
 use Piwik\Period;
 use Piwik\Period\Range;
+use Piwik\Piwik;
 use Piwik\Plugins\API\API;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
+use Piwik\Registry;
+use Piwik\SettingsPiwik;
+use Piwik\Site;
+use Piwik\Url;
 use Piwik\View;
 use Piwik\ViewDataTable;
 

diff --git a/core/Controller/Admin.php → core/Plugin/ControllerAdmin.php b/core/Controller/Admin.php → core/Plugin/ControllerAdmin.php
@@ -8,10 +8,9 @@
  * @category Piwik
  * @package Piwik
  */
-namespace Piwik\Controller;
+namespace Piwik\Plugin;
 
 use Piwik\Config;
-use Piwik\Controller;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Menu\MenuTop;
 use Piwik\Piwik;
@@ -27,7 +26,7 @@
  *
  * @api
  */
-abstract class Admin extends Controller
+abstract class ControllerAdmin extends Controller
 {
     /**
      * Set the minimal variables in the view object

diff --git a/core/PluginsManager.php → core/Plugin/Manager.php b/core/PluginsManager.php → core/Plugin/Manager.php
@@ -9,9 +9,8 @@
  * @package Piwik
  */
 
-namespace Piwik;
+namespace Piwik\Plugin;
 
-use Piwik\Plugin\MetadataLoader;
 use Piwik\Translate;
 
 require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php';
@@ -20,9 +19,9 @@
  * Plugin manager
  *
  * @package Piwik
- * @subpackage PluginsManager
+ * @subpackage Manager
  */
-class PluginsManager
+class Manager
 {
     protected $pluginsToLoad = array();
 
@@ -67,9 +66,9 @@ class PluginsManager
     static private $instance = null;
 
     /**
-     * Returns the singleton PluginsManager
+     * Returns the singleton Manager
      *
-     * @return PluginsManager
+     * @return Manager
      */
     static public function getInstance()
     {
@@ -873,7 +872,7 @@ private function removePluginFromTrackerConfig($pluginName)
 
 /**
  * @package Piwik
- * @subpackage PluginsManager
+ * @subpackage Manager
  */
 class PluginsManager_PluginException extends \Exception
 {

diff --git a/piwik.php b/piwik.php
@@ -36,7 +36,7 @@
 @ignore_user_abort(true);
 
 require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
-require_once PIWIK_INCLUDE_PATH . '/core/PluginsManager.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Plugin/Manager.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Plugin.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Common.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Piwik.php';

diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php
@@ -21,7 +21,7 @@
  *
  * @package Piwik_API
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     function index()
     {

diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php
@@ -15,7 +15,6 @@
 use Piwik\DataTable\Row\DataTableSummaryRow;
 use Piwik\DataTable;
 use Piwik\Metrics;
-use Piwik\PluginsArchiver;
 use Piwik\RankingQuery;
 use Piwik\Tracker\Action;
 
@@ -24,7 +23,7 @@
  *
  * @package Actions
  */
-class Archiver extends PluginsArchiver
+class Archiver extends \Piwik\Plugin\Archiver
 {
     const DOWNLOADS_RECORD_NAME = 'Actions_downloads';
     const OUTLINKS_RECORD_NAME = 'Actions_outlink';

diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php
@@ -19,7 +19,7 @@
  *
  * @package Actions
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     //
     // Actions that render whole pages

diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php
@@ -20,7 +20,7 @@
  *
  * @package Annotations
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     /**
      * Controller action that returns HTML displaying annotations for a site and

diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
@@ -30,7 +30,7 @@
  *
  * @package CoreAdminHome
  */
-class Controller extends \Piwik\Controller\Admin
+class Controller extends \Piwik\Plugin\ControllerAdmin
 {
     const LOGO_HEIGHT = 300;
     const LOGO_SMALL_HEIGHT = 100;

diff --git a/plugins/CoreConsole/templates/controller/Controller.php b/plugins/CoreConsole/templates/controller/Controller.php
@@ -16,7 +16,7 @@
  *
  * @package PLUGINNAME
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
 
     public function index()

diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php
@@ -30,7 +30,7 @@
  *
  * @package CoreHome
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     function getDefaultAction()
     {

diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
@@ -23,7 +23,7 @@
 /**
  * @package CorePluginsAdmin
  */
-class Controller extends \Piwik\Controller\Admin
+class Controller extends Plugin\ControllerAdmin
 {
     const UPDATE_NONCE = 'CorePluginsAdmin.updatePlugin';
     const INSTALL_NONCE = 'CorePluginsAdmin.installPlugin';

diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
@@ -36,7 +36,7 @@
  *
  * @package CoreUpdater
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     const CONFIG_FILE_BACKUP = '/config/global.ini.auto-backup-before-update.php';
     const PATH_TO_EXTRACT_LATEST_VERSION = '/tmp/latest/';

diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
@@ -12,8 +12,8 @@
 namespace Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph;
 
 use Piwik\Common;
-use Piwik\Controller;
 use Piwik\Period\Range;
+use Piwik\Plugin\Controller;
 use Piwik\Plugins\CoreVisualizations\JqplotDataGenerator;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph;
 use Piwik\Site;

diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php
@@ -12,15 +12,14 @@
 
 use Piwik\Common;
 use Piwik\Config;
-use Piwik\DataAccess\LogAggregator;
 
+use Piwik\DataAccess\LogAggregator;
 use Piwik\DataArray;
 use Piwik\Metrics;
-use Piwik\PluginsArchiver;
 use Piwik\Tracker;
 use Piwik\Tracker\GoalManager;
 
-class Archiver extends PluginsArchiver
+class Archiver extends \Piwik\Plugin\Archiver
 {
     const LABEL_CUSTOM_VALUE_NOT_DEFINED = "Value not defined";
     const CUSTOM_VARIABLE_RECORD_NAME = 'CustomVariables_valueByName';

diff --git a/plugins/CustomVariables/Controller.php b/plugins/CustomVariables/Controller.php
@@ -17,7 +17,7 @@
 /**
  * @package CustomVariables
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     public function index($fetch = false)
     {

diff --git a/plugins/DBStats/Controller.php b/plugins/DBStats/Controller.php
@@ -18,7 +18,7 @@
 /**
  * @package DBStats
  */
-class Controller extends \Piwik\Controller\Admin
+class Controller extends \Piwik\Plugin\ControllerAdmin
 {
     /**
      * Returns the index for this plugin. Shows every other report defined by this plugin,

diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php
@@ -22,7 +22,7 @@
  *
  * @package Dashboard
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     /**
      * @var Dashboard

diff --git a/plugins/DevicesDetection/Archiver.php b/plugins/DevicesDetection/Archiver.php
@@ -12,9 +12,8 @@
 namespace Piwik\Plugins\DevicesDetection;
 
 use Piwik\Metrics;
-use Piwik\PluginsArchiver;
 
-class Archiver extends PluginsArchiver
+class Archiver extends \Piwik\Plugin\Archiver
 {
     const DEVICE_TYPE_RECORD_NAME = 'DevicesDetection_types';
     const DEVICE_BRAND_RECORD_NAME = 'DevicesDetection_brands';

diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php
@@ -17,7 +17,7 @@
 use Piwik\ViewDataTable;
 use UserAgentParserEnhanced;
 
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     public function index($fetch = false)
     {

diff --git a/plugins/ExamplePlugin/Controller.php b/plugins/ExamplePlugin/Controller.php
@@ -20,7 +20,7 @@
  *
  * @package ExamplePlugin
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     /**
      * Go to /piwik/?module=ExamplePlugin&action=helloWorld to execute this method

diff --git a/plugins/ExampleRssWidget/Controller.php b/plugins/ExampleRssWidget/Controller.php
@@ -18,7 +18,7 @@
  *
  * @package ExampleRssWidget
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     public function rssPiwik()
     {

diff --git a/plugins/ExampleUI/Controller.php b/plugins/ExampleUI/Controller.php
@@ -18,7 +18,7 @@
 /**
  * @package ExampleUI
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     public function dataTables()
     {

diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php
@@ -25,7 +25,7 @@
  *
  * @package Feedback
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     function index()
     {

diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php
@@ -15,11 +15,9 @@
 use Piwik\DataArray;
 use Piwik\DataTable;
 use Piwik\Metrics;
-use Piwik\PluginsArchiver;
-use Piwik\PluginsManager;
 use Piwik\Tracker\GoalManager;
 
-class Archiver extends PluginsArchiver
+class Archiver extends \Piwik\Plugin\Archiver
 {
     const VISITS_UNTIL_RECORD_NAME = 'visits_until_conv';
     const DAYS_UNTIL_CONV_RECORD_NAME = 'days_until_conv';

diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
@@ -26,7 +26,7 @@
  *
  * @package Goals
  */
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     const CONVERSION_RATE_PRECISION = 1;
 

diff --git a/plugins/ImageGraph/Controller.php b/plugins/ImageGraph/Controller.php
@@ -16,7 +16,7 @@
 use Piwik\SettingsPiwik;
 use Piwik\View;
 
-class Controller extends \Piwik\Controller
+class Controller extends \Piwik\Plugin\Controller
 {
     // Call metadata reports, and draw the default graph for each report.
     public function index()

diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php
@@ -91,7 +91,7 @@ public function getReportMetadata(&$reports, $info)
                 $dateForMultiplePeriodGraph = $dateForSinglePeriodGraph;
             } else {
                 $periodForMultiplePeriodGraph = $periodForSinglePeriodGraph;
-                $dateForMultiplePeriodGraph = \Piwik\Controller::getDateRangeRelativeToEndDate(
+                $dateForMultiplePeriodGraph = \Piwik\Plugin\Controller::getDateRangeRelativeToEndDate(
                     $periodForSinglePeriodGraph,
                     'last' . self::GRAPH_EVOLUTION_LAST_PERIODS,
                     $dateForSinglePeriodGraph,

diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
@@ -40,7 +40,7 @@
  *
  * @package Installation
  */
-class Controller extends \Piwik\Controller\Admin
+class Controller extends \Piwik\Plugin\ControllerAdmin
 {
     // public so plugins can add/delete installation steps
     public $steps = array(