Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/API/DataTableGenericFilter.php6
-rw-r--r--core/API/DataTableManipulator.php5
-rw-r--r--core/API/DataTableManipulator/Flattener.php5
-rw-r--r--core/API/DataTableManipulator/LabelFilter.php5
-rw-r--r--core/API/DataTableManipulator/ReportTotalsCalculator.php5
-rw-r--r--core/API/DocumentationGenerator.php6
-rw-r--r--core/API/Proxy.php4
-rw-r--r--core/API/Request.php7
-rw-r--r--core/API/ResponseBuilder.php4
-rw-r--r--core/Auth.php5
-rw-r--r--core/Common.php4
-rw-r--r--core/Config.php4
-rw-r--r--core/DataTable/Filter/AddSummaryRow.php6
-rw-r--r--core/DataTable/Renderer.php5
-rw-r--r--core/DataTable/Renderer/Console.php5
-rw-r--r--core/Db/Adapter.php4
-rw-r--r--core/Db/Adapter/Mysqli.php4
-rw-r--r--core/Db/Adapter/Pdo/Mssql.php4
-rw-r--r--core/Db/Adapter/Pdo/Mysql.php4
-rw-r--r--core/Db/Adapter/Pdo/Pgsql.php4
-rw-r--r--core/Db/AdapterInterface.php4
-rw-r--r--core/Db/Schema.php4
-rw-r--r--core/Db/Schema/Myisam.php5
-rw-r--r--core/Db/SchemaInterface.php5
-rw-r--r--core/FrontController.php7
-rw-r--r--core/Menu/MenuAbstract.php5
-rw-r--r--core/Menu/MenuAdmin.php5
-rw-r--r--core/Menu/MenuMain.php5
-rw-r--r--core/Menu/MenuTop.php5
-rw-r--r--core/MetricsFormatter.php3
-rw-r--r--core/Piwik.php4
-rw-r--r--core/Plugin/API.php4
-rw-r--r--core/Plugin/Archiver.php4
-rw-r--r--core/Plugin/ConsoleCommand.php5
-rw-r--r--core/Plugin/Controller.php5
-rw-r--r--core/Plugin/Visualization.php4
-rw-r--r--core/QuickForm2.php1
-rw-r--r--core/Session.php3
-rw-r--r--core/Translate.php3
-rw-r--r--core/Translate/Filter/FilterAbstract.php6
-rw-r--r--core/Translate/Validate/ValidateAbstract.php6
-rw-r--r--core/ViewDataTable/Config.php6
-rw-r--r--core/ViewDataTable/RequestConfig.php6
-rw-r--r--core/Visualization/Sparkline.php7
44 files changed, 58 insertions, 150 deletions
diff --git a/core/API/DataTableGenericFilter.php b/core/API/DataTableGenericFilter.php
index 5a7816acfd..e0bc5abd3d 100644
--- a/core/API/DataTableGenericFilter.php
+++ b/core/API/DataTableGenericFilter.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\API
*/
namespace Piwik\API;
@@ -15,10 +15,6 @@ use Piwik\Common;
use Piwik\DataTable;
use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal;
-/**
- * @package Piwik
- * @subpackage Piwik_API
- */
class DataTableGenericFilter
{
private static $genericFiltersInfo = null;
diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
index d76d357213..94bb0cf44b 100644
--- a/core/API/DataTableManipulator.php
+++ b/core/API/DataTableManipulator.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\API
*/
namespace Piwik\API;
@@ -29,9 +29,6 @@ use Piwik\Plugins\API\API;
* of using expanded=1. Another difference between manipulators and filters
* is that filters keep the overall structure of the table intact while
* manipulators can change the entire thing.
- *
- * @package Piwik
- * @subpackage Piwik_API
*/
abstract class DataTableManipulator
{
diff --git a/core/API/DataTableManipulator/Flattener.php b/core/API/DataTableManipulator/Flattener.php
index 2ec9d6bd0e..79b146b5ea 100644
--- a/core/API/DataTableManipulator/Flattener.php
+++ b/core/API/DataTableManipulator/Flattener.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\API\DataTableManipulator
*/
namespace Piwik\API\DataTableManipulator;
@@ -20,9 +20,6 @@ use Piwik\DataTable\Row;
*
* It loads subtables and combines them into a single table by concatenating the labels.
* This manipulator is triggered by using flat=1 in the API request.
- *
- * @package Piwik
- * @subpackage Piwik_API
*/
class Flattener extends DataTableManipulator
{
diff --git a/core/API/DataTableManipulator/LabelFilter.php b/core/API/DataTableManipulator/LabelFilter.php
index a00c531bf2..5ed41e6903 100644
--- a/core/API/DataTableManipulator/LabelFilter.php
+++ b/core/API/DataTableManipulator/LabelFilter.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\API\DataTableManipulator
*/
namespace Piwik\API\DataTableManipulator;
@@ -22,9 +22,6 @@ use Piwik\DataTable\Row;
*
* The labels passed to this class should be urlencoded.
* Some reports use recursive labels (e.g. action reports). Use > to join them.
- *
- * @package Piwik
- * @subpackage Piwik_API
*/
class LabelFilter extends DataTableManipulator
{
diff --git a/core/API/DataTableManipulator/ReportTotalsCalculator.php b/core/API/DataTableManipulator/ReportTotalsCalculator.php
index 988fd41bd5..5074c54b0f 100644
--- a/core/API/DataTableManipulator/ReportTotalsCalculator.php
+++ b/core/API/DataTableManipulator/ReportTotalsCalculator.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\API\DataTableManipulator
*/
namespace Piwik\API\DataTableManipulator;
@@ -24,9 +24,6 @@ use Piwik\Plugins\API\API;
* This class is responsible for setting the metadata property 'totals' on each dataTable if the report
* has a dimension. 'Totals' means it tries to calculate the total report value for each metric. For each
* the total number of visits, actions, ... for a given report / dataTable.
- *
- * @package Piwik
- * @subpackage Piwik_API
*/
class ReportTotalsCalculator extends DataTableManipulator
{
diff --git a/core/API/DocumentationGenerator.php b/core/API/DocumentationGenerator.php
index d95cc69921..58bbb80daf 100644
--- a/core/API/DocumentationGenerator.php
+++ b/core/API/DocumentationGenerator.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\API
*/
namespace Piwik\API;
@@ -15,10 +15,6 @@ use Piwik\Common;
use Piwik\Piwik;
use Piwik\Url;
-/**
- * @package Piwik
- * @subpackage Piwik_API
- */
class DocumentationGenerator
{
protected $modulesToHide = array('CoreAdminHome', 'DBStats');
diff --git a/core/API/Proxy.php b/core/API/Proxy.php
index b0901ea1a3..b9dec5cfda 100644
--- a/core/API/Proxy.php
+++ b/core/API/Proxy.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\API
*/
namespace Piwik\API;
@@ -26,8 +26,6 @@ use ReflectionMethod;
*
* It will also log the performance of API calls (time spent, parameter values, etc.) if logger available
*
- * @package Piwik
- * @subpackage Piwik_API
* @static \Piwik\API\Proxy getInstance()
*/
class Proxy extends Singleton
diff --git a/core/API/Request.php b/core/API/Request.php
index 4edc821465..b01f75543a 100644
--- a/core/API/Request.php
+++ b/core/API/Request.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\API
*/
namespace Piwik\API;
@@ -67,9 +67,6 @@ use Piwik\UrlHelper;
* echo "This DataTable has " . $dataTable->getRowsCount() . " rows.";
*
* @see http://piwik.org/docs/analytics-api
- * @package Piwik
- * @subpackage Piwik_API
- *
* @api
*/
class Request
@@ -392,4 +389,4 @@ class Request
}
return $segmentRaw;
}
-} \ No newline at end of file
+}
diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
index c125975719..4735db505e 100644
--- a/core/API/ResponseBuilder.php
+++ b/core/API/ResponseBuilder.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\API
*/
namespace Piwik\API;
@@ -21,8 +21,6 @@ use Piwik\DataTable\Simple;
use Piwik\DataTable;
/**
- * @package Piwik
- * @subpackage Piwik_API
*/
class ResponseBuilder
{
diff --git a/core/Auth.php b/core/Auth.php
index 792acfa6f5..8fbfb311bb 100644
--- a/core/Auth.php
+++ b/core/Auth.php
@@ -13,9 +13,6 @@ namespace Piwik;
/**
* Base for authentication modules
- *
- * @package Piwik
- * @subpackage Piwik_Auth
*/
interface Auth
{
@@ -151,4 +148,4 @@ class AuthResult
{
return $this->code > self::FAILURE;
}
-} \ No newline at end of file
+}
diff --git a/core/Common.php b/core/Common.php
index 5e4584d033..55526ff011 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -19,8 +19,6 @@ use Piwik\Tracker\Cache;
* Contains helper methods used by both Piwik Core and the Piwik Tracking engine.
*
* This is the only non-Tracker class loaded by the **\/piwik.php** file.
- *
- * @package Piwik
*/
class Common
{
@@ -1057,4 +1055,4 @@ class Common
}
}
}
-} \ No newline at end of file
+}
diff --git a/core/Config.php b/core/Config.php
index 6c0a6f3283..59af73a9b3 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -38,8 +38,6 @@ use Exception;
* Config::getInstance()->MySection = array('myoption' => 1);
* Config::getInstance()->forceSave();
*
- * @package Piwik
- * @subpackage Piwik_Config
* @method static \Piwik\Config getInstance()
*/
class Config extends Singleton
@@ -661,4 +659,4 @@ class Config extends Singleton
return $merged;
}
-} \ No newline at end of file
+}
diff --git a/core/DataTable/Filter/AddSummaryRow.php b/core/DataTable/Filter/AddSummaryRow.php
index 26a1a4f3d2..f483eb5b34 100644
--- a/core/DataTable/Filter/AddSummaryRow.php
+++ b/core/DataTable/Filter/AddSummaryRow.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\DataTable\Filter
*/
namespace Piwik\DataTable\Filter;
@@ -24,8 +24,6 @@ use Piwik\DataTable\Row\DataTableSummaryRow;
* // use a human readable label for the summary row (instead of '-1')
* $dataTable->filter('AddSummaryRow', array($labelSummaryRow = Piwik_Translate('General_Total')));
*
- * @package Piwik
- * @subpackage DataTable
* @api
*/
class AddSummaryRow extends BaseFilter
@@ -53,4 +51,4 @@ class AddSummaryRow extends BaseFilter
$row->setColumn('label', $this->labelSummaryRow);
$table->addSummaryRow($row);
}
-} \ No newline at end of file
+}
diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php
index 87cf491bea..525f5fff47 100644
--- a/core/DataTable/Renderer.php
+++ b/core/DataTable/Renderer.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\DataTable
*/
namespace Piwik\DataTable;
@@ -23,9 +23,6 @@ use Piwik\Piwik;
* $render = new Xml();
* $render->setTable($dataTable);
* echo $render;
- *
- * @package Piwik
- * @subpackage DataTable
*/
abstract class Renderer
{
diff --git a/core/DataTable/Renderer/Console.php b/core/DataTable/Renderer/Console.php
index 0fab067dc0..18f15ca67e 100644
--- a/core/DataTable/Renderer/Console.php
+++ b/core/DataTable/Renderer/Console.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\DataTable\Renderer
*/
namespace Piwik\DataTable\Renderer;
@@ -16,9 +16,6 @@ use Piwik\DataTable\Renderer;
/**
* Simple output
- *
- * @package Piwik
- * @subpackage Piwik_DataTable_Renderer_ConsoleDataTable
*/
class Console extends Renderer
{
diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php
index a090fd9420..5fe8a0affd 100644
--- a/core/Db/Adapter.php
+++ b/core/Db/Adapter.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Db
*/
namespace Piwik\Db;
@@ -15,8 +15,6 @@ use Piwik\Loader;
use Zend_Db_Table;
/**
- * @package Piwik
- * @subpackage Piwik_Db
*/
class Adapter
{
diff --git a/core/Db/Adapter/Mysqli.php b/core/Db/Adapter/Mysqli.php
index bb9274a918..50bb2bb273 100644
--- a/core/Db/Adapter/Mysqli.php
+++ b/core/Db/Adapter/Mysqli.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Db\Adapter
*/
namespace Piwik\Db\Adapter;
@@ -18,8 +18,6 @@ use Zend_Config;
use Zend_Db_Adapter_Mysqli;
/**
- * @package Piwik
- * @subpackage Piwik_Db
*/
class Mysqli extends Zend_Db_Adapter_Mysqli implements AdapterInterface
{
diff --git a/core/Db/Adapter/Pdo/Mssql.php b/core/Db/Adapter/Pdo/Mssql.php
index a035f319dd..aa929cf01d 100644
--- a/core/Db/Adapter/Pdo/Mssql.php
+++ b/core/Db/Adapter/Pdo/Mssql.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Db\Adapter\Pdo
*/
namespace Piwik\Db\Adapter\Pdo;
@@ -22,8 +22,6 @@ use Zend_Db_Adapter_Pdo_Mssql;
use Zend_Db_Profiler;
/**
- * @package Piwik
- * @subpackage Piwik_Db
*/
class Mssql extends Zend_Db_Adapter_Pdo_Mssql implements AdapterInterface
{
diff --git a/core/Db/Adapter/Pdo/Mysql.php b/core/Db/Adapter/Pdo/Mysql.php
index 1926e8d972..d471a5c936 100644
--- a/core/Db/Adapter/Pdo/Mysql.php
+++ b/core/Db/Adapter/Pdo/Mysql.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Db\Adapter\Pdo
*/
namespace Piwik\Db\Adapter\Pdo;
@@ -22,8 +22,6 @@ use Zend_Db_Select;
use Zend_Db_Statement_Interface;
/**
- * @package Piwik
- * @subpackage Piwik_Db
*/
class Mysql extends Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
{
diff --git a/core/Db/Adapter/Pdo/Pgsql.php b/core/Db/Adapter/Pdo/Pgsql.php
index 340997eddf..481c7f7f26 100644
--- a/core/Db/Adapter/Pdo/Pgsql.php
+++ b/core/Db/Adapter/Pdo/Pgsql.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Db\Adapter\Pdo
*/
namespace Piwik\Db\Adapter\Pdo;
@@ -19,8 +19,6 @@ use Piwik\Piwik;
use Zend_Db_Adapter_Pdo_Pgsql;
/**
- * @package Piwik
- * @subpackage Piwik_Db
*/
class Pgsql extends Zend_Db_Adapter_Pdo_Pgsql implements AdapterInterface
{
diff --git a/core/Db/AdapterInterface.php b/core/Db/AdapterInterface.php
index e13a99769b..c8a0d79acb 100644
--- a/core/Db/AdapterInterface.php
+++ b/core/Db/AdapterInterface.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Db
*/
namespace Piwik\Db;
@@ -14,8 +14,6 @@ namespace Piwik\Db;
use Exception;
/**
- * @package Piwik
- * @subpackage Piwik_Db
*/
interface AdapterInterface
{
diff --git a/core/Db/Schema.php b/core/Db/Schema.php
index e94547c087..635f359439 100644
--- a/core/Db/Schema.php
+++ b/core/Db/Schema.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Db
*/
namespace Piwik\Db;
@@ -18,8 +18,6 @@ use Piwik\Singleton;
*
* Note: no relation to the ZF proposals for Zend_Db_Schema_Manager
*
- * @package Piwik
- * @subpackage Piwik_Db
* @method static \Piwik\Db\Schema getInstance()
*/
class Schema extends Singleton
diff --git a/core/Db/Schema/Myisam.php b/core/Db/Schema/Myisam.php
index 0751386c6e..173612d293 100644
--- a/core/Db/Schema/Myisam.php
+++ b/core/Db/Schema/Myisam.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Db\Schema
*/
namespace Piwik\Db\Schema;
@@ -20,9 +20,6 @@ use Piwik\DbHelper;
/**
* MySQL schema
- *
- * @package Piwik
- * @subpackage Piwik_Db
*/
class Myisam implements SchemaInterface
{
diff --git a/core/Db/SchemaInterface.php b/core/Db/SchemaInterface.php
index 7e677662ae..6c3cd949b9 100644
--- a/core/Db/SchemaInterface.php
+++ b/core/Db/SchemaInterface.php
@@ -6,16 +6,13 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Db
*/
namespace Piwik\Db;
/**
* Database schema interface
- *
- * @package Piwik
- * @subpackage Piwik_Db
*/
interface SchemaInterface
{
diff --git a/core/FrontController.php b/core/FrontController.php
index 7079e87611..6f53108eaf 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -51,8 +51,6 @@ use Piwik\Session;
*
* For a detailed explanation, see the documentation [here](http://piwik.org/docs/plugins/framework-overview).
*
- * @package Piwik
- * @subpackage FrontController
* @method static \Piwik\FrontController getInstance()
*/
class FrontController extends Singleton
@@ -548,9 +546,6 @@ class FrontController extends Singleton
/**
* Exception thrown when the requested plugin is not activated in the config file
- *
- * @package Piwik
- * @subpackage FrontController
*/
class PluginDeactivatedException extends Exception
{
@@ -558,4 +553,4 @@ class PluginDeactivatedException extends Exception
{
parent::__construct("The plugin $module is not enabled. You can activate the plugin on Settings > Plugins page in Piwik.");
}
-} \ No newline at end of file
+}
diff --git a/core/Menu/MenuAbstract.php b/core/Menu/MenuAbstract.php
index 6d1f47a006..583a9b448c 100644
--- a/core/Menu/MenuAbstract.php
+++ b/core/Menu/MenuAbstract.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik_Menu
+ * @package Piwik\Menu
*/
namespace Piwik\Menu;
@@ -21,7 +21,6 @@ use Piwik\Singleton;
* Each menu has a class that manages the menu's content. Each class invokes
* a different event to allow plugins to add new menu items.
*
- * @package Piwik_Menu
* @static \Piwik\Menu\MenuAbstract getInstance()
*/
abstract class MenuAbstract extends Singleton
@@ -262,4 +261,4 @@ abstract class MenuAbstract extends Singleton
}
return ($itemOne['_order'] < $itemTwo['_order']) ? -1 : 1;
}
-} \ No newline at end of file
+}
diff --git a/core/Menu/MenuAdmin.php b/core/Menu/MenuAdmin.php
index b303bd63c0..e725bf855c 100644
--- a/core/Menu/MenuAdmin.php
+++ b/core/Menu/MenuAdmin.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik_Menu
+ * @package Piwik\Menu
*/
namespace Piwik\Menu;
@@ -30,7 +30,6 @@ use Piwik\Piwik;
* );
* }
*
- * @package Piwik_Menu
* @method static \Piwik\Menu\MenuAdmin getInstance()
*/
class MenuAdmin extends MenuAbstract
@@ -108,4 +107,4 @@ class MenuAdmin extends MenuAbstract
}
return false;
}
-} \ No newline at end of file
+}
diff --git a/core/Menu/MenuMain.php b/core/Menu/MenuMain.php
index 71d1f74790..7050cf7d3d 100644
--- a/core/Menu/MenuMain.php
+++ b/core/Menu/MenuMain.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik_Menu
+ * @package Piwik\Menu
*/
namespace Piwik\Menu;
use Piwik\Piwik;
@@ -30,7 +30,6 @@ use Piwik\Piwik;
* );
* }
*
- * @package Piwik_Menu
* @api
* @method static \Piwik\Menu\MenuMain getInstance()
*/
@@ -91,4 +90,4 @@ class MenuMain extends MenuAbstract
}
return parent::getMenu();
}
-} \ No newline at end of file
+}
diff --git a/core/Menu/MenuTop.php b/core/Menu/MenuTop.php
index 345e504323..ba35b79795 100644
--- a/core/Menu/MenuTop.php
+++ b/core/Menu/MenuTop.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik_Menu
+ * @package Piwik\Menu
*/
namespace Piwik\Menu;
use Piwik\Piwik;
@@ -31,7 +31,6 @@ use Piwik\Piwik;
* );
* }
*
- * @package Piwik_Menu
* @method static \Piwik\Menu\MenuTop getInstance()
*/
class MenuTop extends MenuAbstract
@@ -121,4 +120,4 @@ class MenuTop extends MenuAbstract
}
return parent::getMenu();
}
-} \ No newline at end of file
+}
diff --git a/core/MetricsFormatter.php b/core/MetricsFormatter.php
index 8f58e52588..936956a4ee 100644
--- a/core/MetricsFormatter.php
+++ b/core/MetricsFormatter.php
@@ -15,7 +15,6 @@ use Piwik\Tracker\GoalManager;
/**
* Contains helper function that format numerical values in different ways.
*
- * @package Piwik
* @api
*/
class MetricsFormatter
@@ -242,4 +241,4 @@ class MetricsFormatter
}
return $currenciesList;
}
-} \ No newline at end of file
+}
diff --git a/core/Piwik.php b/core/Piwik.php
index 9c40d982db..6d7eb5d18c 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -32,8 +32,6 @@ require_once PIWIK_INCLUDE_PATH . '/core/Translate.php';
*
* Contains helper methods for a variety of common tasks. Plugin developers are
* encouraged to reuse these methods as much as possible.
- *
- * @package Piwik
*/
class Piwik
{
@@ -859,4 +857,4 @@ class Piwik
}
return $options;
}
-} \ No newline at end of file
+}
diff --git a/core/Plugin/API.php b/core/Plugin/API.php
index 732f55ac70..03e8b382f8 100644
--- a/core/Plugin/API.php
+++ b/core/Plugin/API.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik_PluginArchiver
+ * @package Piwik\Plugin
*/
namespace Piwik\Plugin;
@@ -44,4 +44,4 @@ use Piwik\Singleton;
abstract class API extends Singleton
{
-} \ No newline at end of file
+}
diff --git a/core/Plugin/Archiver.php b/core/Plugin/Archiver.php
index 84c9b5526d..91244ace42 100644
--- a/core/Plugin/Archiver.php
+++ b/core/Plugin/Archiver.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik_PluginArchiver
+ * @package Piwik\Plugin
*/
namespace Piwik\Plugin;
@@ -122,4 +122,4 @@ abstract class Archiver
{
return $this->getProcessor()->getLogAggregator();
}
-} \ No newline at end of file
+}
diff --git a/core/Plugin/ConsoleCommand.php b/core/Plugin/ConsoleCommand.php
index 54405256a5..42501c82e9 100644
--- a/core/Plugin/ConsoleCommand.php
+++ b/core/Plugin/ConsoleCommand.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Plugin
*/
namespace Piwik\Plugin;
@@ -18,7 +18,6 @@ use Symfony\Component\Console\Input\InputInterface;
/**
* The base class for console commands.
*
- * @package Piwik_Console
* @api
*/
class ConsoleCommand extends SymfonyCommand
@@ -68,4 +67,4 @@ class ConsoleCommand extends SymfonyCommand
}
}
}
-} \ No newline at end of file
+}
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index e2fd14d25f..278b2d1504 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Plugin
*/
namespace Piwik\Plugin;
@@ -65,7 +65,6 @@ use Piwik\ViewDataTable\Factory as ViewDataTableFactory;
*
* <a href="?module=MyPlugin&action=index&idSite=1&period=day&date=2013-10-10">Link</a>
*
- * @package Piwik
*/
abstract class Controller
{
@@ -934,4 +933,4 @@ abstract class Controller
return $result;
}
-} \ No newline at end of file
+}
diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php
index 536b1caf2a..af378e755b 100644
--- a/core/Plugin/Visualization.php
+++ b/core/Plugin/Visualization.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Plugin
*/
namespace Piwik\Plugin;
@@ -594,4 +594,4 @@ class Visualization extends ViewDataTable
return $result;
}
-} \ No newline at end of file
+}
diff --git a/core/QuickForm2.php b/core/QuickForm2.php
index 40d7f1246c..1199cedfad 100644
--- a/core/QuickForm2.php
+++ b/core/QuickForm2.php
@@ -22,7 +22,6 @@ use HTML_QuickForm2_Renderer;
*
* For an example, @see Piwik_Login_FormLogin
*
- * @package Piwik
* @see HTML_QuickForm2, libs/HTML/QuickForm2.php
* @link http://pear.php.net/package/HTML_QuickForm2/
*/
diff --git a/core/Session.php b/core/Session.php
index 76fd1ae99c..493c3e9afb 100644
--- a/core/Session.php
+++ b/core/Session.php
@@ -16,9 +16,6 @@ use Zend_Session;
/**
* Session initialization.
- *
- * @package Piwik
- * @subpackage Session
*/
class Session extends Zend_Session
{
diff --git a/core/Translate.php b/core/Translate.php
index e0954b6fee..14f913e617 100644
--- a/core/Translate.php
+++ b/core/Translate.php
@@ -13,7 +13,6 @@ namespace Piwik;
use Exception;
/**
- * @package Piwik
*/
class Translate
{
@@ -215,4 +214,4 @@ class Translate
setlocale(LC_ALL, $locale, $locale_variant);
setlocale(LC_CTYPE, '');
}
-} \ No newline at end of file
+}
diff --git a/core/Translate/Filter/FilterAbstract.php b/core/Translate/Filter/FilterAbstract.php
index 9b7e0153b6..0f1d45feaa 100644
--- a/core/Translate/Filter/FilterAbstract.php
+++ b/core/Translate/Filter/FilterAbstract.php
@@ -6,14 +6,12 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Translate\Filter
*/
namespace Piwik\Translate\Filter;
/**
- * @package Piwik
- * @subpackage Piwik_Db
*/
abstract class FilterAbstract
{
@@ -37,4 +35,4 @@ abstract class FilterAbstract
{
return $this->filteredData;
}
-} \ No newline at end of file
+}
diff --git a/core/Translate/Validate/ValidateAbstract.php b/core/Translate/Validate/ValidateAbstract.php
index 79780c1b23..faceae67a2 100644
--- a/core/Translate/Validate/ValidateAbstract.php
+++ b/core/Translate/Validate/ValidateAbstract.php
@@ -6,14 +6,12 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Translate\Validate
*/
namespace Piwik\Translate\Validate;
/**
- * @package Piwik
- * @subpackage Piwik_Db
*/
abstract class ValidateAbstract
{
@@ -38,4 +36,4 @@ abstract class ValidateAbstract
{
return $this->message;
}
-} \ No newline at end of file
+}
diff --git a/core/ViewDataTable/Config.php b/core/ViewDataTable/Config.php
index 1a8d5a21c5..d73e89303d 100644
--- a/core/ViewDataTable/Config.php
+++ b/core/ViewDataTable/Config.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\ViewDataTable
*/
namespace Piwik\ViewDataTable;
@@ -77,8 +77,6 @@ use Piwik\Plugins\API\API;
* }
* }
*
- * @package Piwik
- * @subpackage Piwik_Visualization
* @api
*/
class Config
@@ -625,4 +623,4 @@ class Config
$this->addTranslation($key, $translation);
}
}
-} \ No newline at end of file
+}
diff --git a/core/ViewDataTable/RequestConfig.php b/core/ViewDataTable/RequestConfig.php
index 733511dc06..be049e43bc 100644
--- a/core/ViewDataTable/RequestConfig.php
+++ b/core/ViewDataTable/RequestConfig.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\ViewDataTable
*/
namespace Piwik\ViewDataTable;
@@ -78,8 +78,6 @@ use Piwik\Common;
* }
* }
*
- * @package Piwik
- * @subpackage Piwik_Visualization
* @api
*/
class RequestConfig
@@ -296,4 +294,4 @@ class RequestConfig
return $method;
}
-} \ No newline at end of file
+}
diff --git a/core/Visualization/Sparkline.php b/core/Visualization/Sparkline.php
index 2312ea47c8..a0f20934cf 100644
--- a/core/Visualization/Sparkline.php
+++ b/core/Visualization/Sparkline.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik
- * @package Piwik
+ * @package Piwik\Visualization
*/
namespace Piwik\Visualization;
@@ -25,9 +25,6 @@ require_once PIWIK_INCLUDE_PATH . '/libs/sparkline/lib/Sparkline_Line.php';
/**
* Renders a sparkline image given a PHP data array.
* Using the Sparkline PHP Graphing Library sparkline.org
- *
- * @package Piwik
- * @subpackage Piwik_Visualization
*/
class Sparkline implements ViewInterface
{
@@ -179,4 +176,4 @@ class Sparkline implements ViewInterface
}
}
}
-} \ No newline at end of file
+}