Merge remote-tracking branch 'origin/master'

8 files changed, 16 insertions, 0 deletions

diff --git a/core/Controller/Admin.php b/core/Controller/Admin.php
index 7891c804a2..33f08d0b93 100644
--- a/core/Controller/Admin.php
+++ b/core/Controller/Admin.php
@@ -22,6 +22,8 @@ use Piwik\PluginsManager;
  * Parent class of all plugins Controllers with admin functions
  *
  * @package Piwik
+ *
+ * @api
  */
 abstract class Admin extends Controller
 {
diff --git a/core/DataTable/Map.php b/core/DataTable/Map.php
index c251987505..5ed65df1ad 100644
--- a/core/DataTable/Map.php
+++ b/core/DataTable/Map.php
@@ -18,6 +18,8 @@ use Piwik\DataTable\Renderer\Console;
  *
  * @package Piwik
  * @subpackage DataTable
+ *
+ * @api
  */
 class Map
 {
diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php
index 286c56c177..8a3cde70c6 100644
--- a/core/DataTable/Row.php
+++ b/core/DataTable/Row.php
@@ -33,6 +33,8 @@ use Piwik\DataTable;
  *
  * @package Piwik
  * @subpackage DataTable
+ *
+ * @api
  */
 class Row
 {
diff --git a/core/Plugin.php b/core/Plugin.php
index 09de012f6f..8febecde99 100644
--- a/core/Plugin.php
+++ b/core/Plugin.php
@@ -22,6 +22,8 @@ require_once PIWIK_INCLUDE_PATH . '/core/Plugin/MetadataLoader.php';
  * Any plugin has to at least implement the abstract methods of this class.
  *
  * @package Piwik
+ *
+ * @api
  */
 class Plugin
 {
diff --git a/core/ScheduledTime/Daily.php b/core/ScheduledTime/Daily.php
index 28505c616b..70c73200a0 100644
--- a/core/ScheduledTime/Daily.php
+++ b/core/ScheduledTime/Daily.php
@@ -19,6 +19,8 @@ use Piwik\ScheduledTime;
  * @see ScheduledTask
  * @package Piwik
  * @subpackage ScheduledTime
+ *
+ * @api
  */
 class Daily extends ScheduledTime
 {
diff --git a/core/ScheduledTime/Hourly.php b/core/ScheduledTime/Hourly.php
index 4a88042834..1474ce25ff 100644
--- a/core/ScheduledTime/Hourly.php
+++ b/core/ScheduledTime/Hourly.php
@@ -19,6 +19,8 @@ use Piwik\ScheduledTime;
  * @see ScheduledTask
  * @package Piwik
  * @subpackage ScheduledTime
+ *
+ * @api
  */
 class Hourly extends ScheduledTime
 {
diff --git a/core/ScheduledTime/Monthly.php b/core/ScheduledTime/Monthly.php
index 2606dc5cce..58f2b86b78 100644
--- a/core/ScheduledTime/Monthly.php
+++ b/core/ScheduledTime/Monthly.php
@@ -19,6 +19,8 @@ use Piwik\ScheduledTime;
  * @see ScheduledTask
  * @package Piwik
  * @subpackage ScheduledTime
+ *
+ * @api
  */
 class Monthly extends ScheduledTime
 {
diff --git a/core/ScheduledTime/Weekly.php b/core/ScheduledTime/Weekly.php
index 8cad7961f6..14910b4c3b 100644
--- a/core/ScheduledTime/Weekly.php
+++ b/core/ScheduledTime/Weekly.php
@@ -19,6 +19,8 @@ use Piwik\ScheduledTime;
  * @see ScheduledTask
  * @package Piwik
  * @subpackage ScheduledTime
+ *
+ * @api
  */
 class Weekly extends ScheduledTime
 {