fix tests (#10040)

core/Plugin/ReportsProvider.php

@@ -18,6 +18,7 @@ use Piwik\Cache as PiwikCache;
  */
 class ReportsProvider
 {
+    private $categoryList;
 
     /**
      * Get an instance of a specific report belonging to the given module and having the given action.
@@ -112,14 +113,12 @@ class ReportsProvider
 
     public function compareCategories($catIdA, $subcatIdA, $orderA, $catIdB, $subcatIdB, $orderB)
     {
-        static $categoryList;
-
-        if (!isset($categoryList)) {
-            $categoryList = CategoryList::get();
+        if (!isset($this->categoryList)) {
+            $this->categoryList = CategoryList::get();
         }
 
-        $catA = $categoryList->getCategory($catIdA);
-        $catB = $categoryList->getCategory($catIdB);
+        $catA = $this->categoryList->getCategory($catIdA);
+        $catB = $this->categoryList->getCategory($catIdB);
 
         // in case there is a category class for both reports
         if (isset($catA) && isset($catB)) {
@@ -144,9 +143,9 @@ class ReportsProvider
                     return $subcatA->getOrder() < $subcatB->getOrder() ? -1 : 1;
 
                 } elseif ($subcatA) {
-                    return -1;
-                } elseif ($subcatB) {
                     return 1;
+                } elseif ($subcatB) {
+                    return -1;
                 }
 
                 if ($orderA == $orderB) {

plugins/API/ProcessedReport.php

@@ -22,12 +22,10 @@ use Piwik\Metrics;
 use Piwik\Metrics\Formatter;
 use Piwik\Period;
 use Piwik\Piwik;
-use Piwik\Plugin\Report;
 use Piwik\Plugin\ReportsProvider;
 use Piwik\Site;
 use Piwik\Timer;
 use Piwik\Url;
-use Piwik\Category\Category;
 
 class ProcessedReport
 {

plugins/Actions/Reports/GetEntryPageTitles.php

@@ -38,6 +38,8 @@ class GetEntryPageTitles extends Base
         );
         $this->order   = 6;
         $this->actionToLoadSubTables = $this->action;
+
+        $this->subcategoryId = 'Actions_SubmenuPagesEntry';
     }
 
     public function configureWidgets(WidgetsList $widgetsList, ReportWidgetFactory $factory)

plugins/Actions/Reports/GetExitPageTitles.php

@@ -29,6 +29,7 @@ class GetExitPageTitles extends Base
         $this->name          = Piwik::translate('Actions_ExitPageTitles');
         $this->documentation = Piwik::translate('Actions_ExitPageTitlesReportDocumentation', '<br />')
                              . ' ' . Piwik::translate('General_UsePlusMinusIconsDocumentation');
+        $this->subcategoryId = 'Actions_SubmenuPagesExit';
 
         $this->metrics = array('exit_nb_visits', 'nb_visits');
         $this->processedMetrics = array(
@@ -37,7 +38,7 @@ class GetExitPageTitles extends Base
             new ExitRate(),
             new AveragePageGenerationTime()
         );
-        $this->order   = 7;
+        $this->order = 7;
 
         $this->actionToLoadSubTables = $this->action;
     }

plugins/CoreAdminHome/Menu.php

@@ -25,13 +25,13 @@ class Menu extends \Piwik\Plugin\Menu
         if (Piwik::hasUserSuperUserAccess()) {
             $menu->addManageItem('General_GeneralSettings',
                 $this->urlForAction('generalSettings'),
-                $order = 6);
+                $order = 5);
         }
 
         if (!Piwik::isUserIsAnonymous()) {
             $menu->addManageItem('CoreAdminHome_TrackingCode',
                 $this->urlForAction('trackingCodeGenerator'),
-                $order = 25);
+                $order = 11);
         }
     }
 

plugins/CorePluginsAdmin/Menu.php

@@ -42,7 +42,7 @@ class Menu extends \Piwik\Plugin\Menu
         if ($hasSuperUserAcess) {
             $menu->addManageItem(Piwik::translate('General_Plugins') . $pluginsUpdateMessage,
                 $this->urlForAction('plugins', array('activated' => '')),
-                $order = 4);
+                $order = 20);
         }
 
         if ($this->isAllowedToSeeMarketPlace()) {

CustomAlerts @ 97f33b2f

-Subproject commit 2e9e51c2aebf2bb531958ddfa3f614b66a0b9a7e
+Subproject commit 97f33b2fd90c766f37904c2e433c8a4beeda8bc8

CustomDimensions @ 10920d14

-Subproject commit 072bd2b3d901c0dc45b43683dd3385686d61900a
+Subproject commit 10920d1414254a9fceaf2cfb3a3cfa46b29dc1ba

plugins/Goals/Goals.php

@@ -90,7 +90,12 @@ class Goals extends \Piwik\Plugin
         $idSite = Common::getRequestVar('idSite', 0, 'int');
 
         if (!$idSite) {
-            return;
+            // fallback for eg API.getReportMetadata which uses idSites
+            $idSite = Common::getRequestVar('idSites', 0, 'int');
+
+            if (!$idSite) {
+                return;
+            }
         }
 
         $goals = API::getInstance()->getGoals($idSite);

plugins/Goals/Menu.php

@@ -21,7 +21,7 @@ class Menu extends \Piwik\Plugin\Menu
         $idSite = $this->getIdSite($userPreferences->getDefaultWebsiteId());
 
         if (Piwik::isUserHasAdminAccess($idSite)) {
-            $menu->addManageItem('Goals_Goals', $this->urlForAction('manage', array('idSite' => $idSite)), 15);
+            $menu->addManageItem('Goals_Goals', $this->urlForAction('manage', array('idSite' => $idSite)), 40);
         }
     }
 

plugins/MobileMessaging/Menu.php

@@ -16,7 +16,7 @@ class Menu extends \Piwik\Plugin\Menu
     public function configureAdminMenu(MenuAdmin $menu)
     {
         if (Piwik::hasUserSuperUserAccess()) {
-            $menu->addManageItem('MobileMessaging_SettingsMenu', $this->urlForAction('index'), $order = 12);
+            $menu->addManageItem('MobileMessaging_SettingsMenu', $this->urlForAction('index'), $order = 35);
         }
 
         if (!Piwik::isUserIsAnonymous()) {

plugins/PrivacyManager/Menu.php

@@ -18,7 +18,7 @@ class Menu extends \Piwik\Plugin\Menu
         if (Piwik::isUserHasSomeAdminAccess()) {
             $menu->addManageItem('PrivacyManager_MenuPrivacySettings',
                                  $this->urlForAction('privacySettings'),
-                                 $order = 9);
+                                 $order = 25);
         }
     }
 }

plugins/SitesManager/Menu.php

@@ -33,7 +33,7 @@ class Menu extends \Piwik\Plugin\Menu
 
             $menu->addManageItem($menuName,
                                  $this->urlForAction('index'),
-                                 $order = 1);
+                                 $order = 10);
         }
     }
 

plugins/UserCountry/Menu.php

@@ -18,7 +18,7 @@ class Menu extends \Piwik\Plugin\Menu
         if (UserCountry::isGeoLocationAdminEnabled() && Piwik::hasUserSuperUserAccess()) {
             $menu->addManageItem('UserCountry_Geolocation',
                                  $this->urlForAction('adminIndex'),
-                                 $order = 9);
+                                 $order = 30);
         }
     }
 }

plugins/UsersManager/Menu.php

@@ -16,11 +16,11 @@ class Menu extends \Piwik\Plugin\Menu
     public function configureAdminMenu(MenuAdmin $menu)
     {
         if (Piwik::isUserHasSomeAdminAccess()) {
-            $menu->addManageItem('UsersManager_MenuUsers', $this->urlForAction('index'), $order = 2);
+            $menu->addManageItem('UsersManager_MenuUsers', $this->urlForAction('index'), $order = 15);
         }
 
         if (Piwik::hasUserSuperUserAccess() && API::getInstance()->getSitesAccessFromUser('anonymous')) {
-            $menu->addManageItem('UsersManager_AnonymousUser', $this->urlForAction('anonymousSettings'), $order = 20);
+            $menu->addManageItem('UsersManager_AnonymousUser', $this->urlForAction('anonymousSettings'), $order = 16);
         }
 
         if (!Piwik::isUserIsAnonymous()) {

tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv

@@ -232,6 +232,10 @@ Friday,1,5,0%,5,00:15:01,0%
 Saturday,1,5,0%,5,00:15:01,0%
 Sunday,3,7,0%,2.3,00:05:00,67%
 
+Actions - Main metrics
+nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords,avg_time_generation
+43,27,0,0,0,0,0,0,0.3s
+
 Page URLs
 label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation
 /index.htm,9,9,11%,00:05:20,11%,0.3s
@@ -244,12 +248,22 @@ label,entry_nb_visits,entry_bounce_count,bounce_rate,avg_time_generation
 /index.htm,9,1,11%,0.3s
 /products,1,1,100%,0.15s
 
+Entry page titles
+label,entry_nb_visits,entry_bounce_count,bounce_rate,avg_time_generation
+second visitor,8,0,0%,0.25s
+ first page view,2,2,100%,0.14s
+
 Exit pages
 label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation
 /index.htm,9,1,11%,0.3s
 /thankyou,8,8,100%,0.31s
 /products,1,1,100%,0.15s
 
+Exit page titles
+label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation
+Checkout,8,8,100%,0.45s
+ first page view,2,2,100%,0.14s
+
 Page titles
 label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation
 second visitor,16,16,0%,00:07:30,0%,0.25s
@@ -293,20 +307,6 @@ No data available
 Content Piece
 No data available
 
-Actions - Main metrics
-nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords,avg_time_generation
-43,27,0,0,0,0,0,0,0.3s
-
-Entry page titles
-label,entry_nb_visits,entry_bounce_count,bounce_rate,avg_time_generation
-second visitor,8,0,0%,0.25s
- first page view,2,2,100%,0.14s
-
-Exit page titles
-label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation
-Checkout,8,8,100%,0.45s
- first page view,2,2,100%,0.14s
-
 Referrer Type
 label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
 Websites,6,22,3.7,00:10:01,33%,$ 0

tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml

@@ -56,6 +56,19 @@
 				<viewDataTable>table</viewDataTable>
 				<isReport>1</isReport>
 			</row>
+			<row>
+				<name>Entry Page Titles</name>
+				<module>Actions</module>
+				<action>getEntryPageTitles</action>
+				<order>106</order>
+				<parameters>
+					<module>Actions</module>
+					<action>getEntryPageTitles</action>
+				</parameters>
+				<uniqueId>widgetActionsgetEntryPageTitles</uniqueId>
+				<viewDataTable>table</viewDataTable>
+				<isReport>1</isReport>
+			</row>
 		</widgets>
 	</row>
 	<row>
@@ -85,6 +98,19 @@
 				<viewDataTable>table</viewDataTable>
 				<isReport>1</isReport>
 			</row>
+			<row>
+				<name>Exit page titles</name>
+				<module>Actions</module>
+				<action>getExitPageTitles</action>
+				<order>107</order>
+				<parameters>
+					<module>Actions</module>
+					<action>getExitPageTitles</action>
+				</parameters>
+				<uniqueId>widgetActionsgetExitPageTitles</uniqueId>
+				<viewDataTable>table</viewDataTable>
+				<isReport>1</isReport>
+			</row>
 		</widgets>
 	</row>
 	<row>