diff options
-rw-r--r-- | core/Controller.php | 2 | ||||
-rw-r--r-- | core/Updater.php | 1 | ||||
-rw-r--r-- | core/View.php | 2 | ||||
-rw-r--r-- | core/View/Interface.php (renamed from core/iView.php) | 2 | ||||
-rw-r--r-- | core/ViewDataTable.php | 12 | ||||
-rw-r--r-- | core/Visualization/Chart.php | 2 | ||||
-rw-r--r-- | core/Visualization/Cloud.php | 2 | ||||
-rw-r--r-- | core/Visualization/Sparkline.php | 2 |
8 files changed, 12 insertions, 13 deletions
diff --git a/core/Controller.php b/core/Controller.php index 55f4f00f06..54b8f4e1f1 100644 --- a/core/Controller.php +++ b/core/Controller.php @@ -123,7 +123,7 @@ abstract class Piwik_Controller } /** - * Given an Object implementing Piwik_iView interface, we either: + * Given an Object implementing Piwik_View_Interface, we either: * - echo the output of the rendering if fetch = false * - returns the output of the rendering if fetch = true * diff --git a/core/Updater.php b/core/Updater.php index edc9bb57a1..b3e088e54e 100644 --- a/core/Updater.php +++ b/core/Updater.php @@ -20,7 +20,6 @@ require_once PIWIK_INCLUDE_PATH . '/core/Option.php'; * * @package Piwik * @subpackage Piwik_Updater - * @see Piwik_iUpdate */ class Piwik_Updater { diff --git a/core/View.php b/core/View.php index 64ee102ce7..deb152266e 100644 --- a/core/View.php +++ b/core/View.php @@ -23,7 +23,7 @@ if(!defined('PIWIK_USER_PATH')) * * @package Piwik */ -class Piwik_View implements Piwik_iView +class Piwik_View implements Piwik_View_Interface { // view types const STANDARD = 0; // REGULAR, FULL, CLASSIC diff --git a/core/iView.php b/core/View/Interface.php index 4b985f69f7..99aa7c82cd 100644 --- a/core/iView.php +++ b/core/View/Interface.php @@ -15,7 +15,7 @@ * * @package Piwik */ -interface Piwik_iView +interface Piwik_View_Interface { /** * Outputs the data. diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php index 59a8e785e4..414595dba6 100644 --- a/core/ViewDataTable.php +++ b/core/ViewDataTable.php @@ -12,7 +12,7 @@ /** * This class is used to load (from the API) and customize the output of a given DataTable. - * The main() method will create an object Piwik_iView + * The main() method will create an object implementing Piwik_View_Interface * You can customize the dataTable using the disable* methods. * * Example: @@ -122,10 +122,10 @@ abstract class Piwik_ViewDataTable protected $apiMethodToRequestDataTable; /** - * This view should be an implementation of the Interface Piwik_iView + * This view should be an implementation of the Interface Piwik_View_Interface * The $view object should be created in the main() method. * - * @var Piwik_iView + * @var Piwik_View_Interface */ protected $view = null; @@ -168,7 +168,7 @@ abstract class Piwik_ViewDataTable /** * Method to be implemented by the ViewDataTable_*. - * This method should create and initialize a $this->view object @see Piwik_iView + * This method should create and initialize a $this->view object @see Piwik_View_Interface * * @return mixed either prints the result or returns the output string */ @@ -326,10 +326,10 @@ abstract class Piwik_ViewDataTable } /** - * Returns the iView. + * Returns the View_Interface. * You can then call render() on this object. * - * @return Piwik_iView + * @return Piwik_View_Interface * @throws exception if the view object was not created */ public function getView() diff --git a/core/Visualization/Chart.php b/core/Visualization/Chart.php index cf2c0ffb04..4541176686 100644 --- a/core/Visualization/Chart.php +++ b/core/Visualization/Chart.php @@ -16,7 +16,7 @@ * @package Piwik * @subpackage Piwik_Visualization */ -abstract class Piwik_Visualization_Chart implements Piwik_iView +abstract class Piwik_Visualization_Chart implements Piwik_View_Interface { // the data kept here conforms to the jqplot data layout diff --git a/core/Visualization/Cloud.php b/core/Visualization/Cloud.php index adf4a7c7dd..e6e4ce7912 100644 --- a/core/Visualization/Cloud.php +++ b/core/Visualization/Cloud.php @@ -19,7 +19,7 @@ * @package Piwik * @subpackage Piwik_Visualization */ -class Piwik_Visualization_Cloud +class Piwik_Visualization_Cloud implements Piwik_View_Interface { protected $wordsArray = array(); public $truncatingLimit = 50; diff --git a/core/Visualization/Sparkline.php b/core/Visualization/Sparkline.php index 9977f5e7a8..4e9295f6e1 100644 --- a/core/Visualization/Sparkline.php +++ b/core/Visualization/Sparkline.php @@ -23,7 +23,7 @@ require_once PIWIK_INCLUDE_PATH . '/libs/sparkline/lib/Sparkline_Line.php'; * @package Piwik * @subpackage Piwik_Visualization */ -class Piwik_Visualization_Sparkline implements Piwik_iView +class Piwik_Visualization_Sparkline implements Piwik_View_Interface { /** * Array with format: array( x, y, z, ... ) |