minor

plugins/MobileMessaging/API.php

@@ -221,8 +221,8 @@ class API
         $this->savePhoneNumbers($phoneNumbers);
 
         // remove phone number from reports
-        $pdfReportsAPIInstance = APIScheduledReports::getInstance();
-        $reports = $pdfReportsAPIInstance->getReports(
+        $APIScheduledReports = APIScheduledReports::getInstance();
+        $reports = $APIScheduledReports->getReports(
             $idSite = false,
             $period = false,
             $idReport = false,
@@ -244,7 +244,7 @@ class API
                     $reportParameters[MobileMessaging::PHONE_NUMBERS_PARAMETER] = $updatedPhoneNumbers;
 
                     // note: reports can end up without any recipients
-                    $pdfReportsAPIInstance->updateReport(
+                    $APIScheduledReports->updateReport(
                         $report['idreport'],
                         $report['idsite'],
                         $report['description'],

plugins/MobileMessaging/MobileMessaging.php

@@ -245,12 +245,12 @@ class MobileMessaging extends \Piwik\Plugin
     function deactivate()
     {
         // delete all mobile reports
-        $pdfReportsAPIInstance = APIScheduledReports::getInstance();
-        $reports = $pdfReportsAPIInstance->getReports();
+        $APIScheduledReports = APIScheduledReports::getInstance();
+        $reports = $APIScheduledReports->getReports();
 
         foreach ($reports as $report) {
             if ($report['type'] == MobileMessaging::MOBILE_TYPE) {
-                $pdfReportsAPIInstance->deleteReport($report['idreport']);
+                $APIScheduledReports->deleteReport($report['idreport']);
             }
         }
     }

plugins/ScheduledReports/API.php

@@ -155,8 +155,8 @@ class API
         Piwik::checkUserIsNotAnonymous();
         Piwik::checkUserHasViewAccess($idSite);
 
-        $pdfReports = $this->getReports($idSite, $periodSearch = false, $idReport);
-        $report = reset($pdfReports);
+        $scheduledReports = $this->getReports($idSite, $periodSearch = false, $idReport);
+        $report = reset($scheduledReports);
         $idReport = $report['idreport'];
 
         $currentUser = Piwik::getCurrentUserLogin();
@@ -194,8 +194,8 @@ class API
      */
     public function deleteReport($idReport)
     {
-        $pdfReports = $this->getReports($idSite = false, $periodSearch = false, $idReport);
-        $report = reset($pdfReports);
+        $APIScheduledReports = $this->getReports($idSite = false, $periodSearch = false, $idReport);
+        $report = reset($APIScheduledReports);
         Piwik::checkUserIsSuperUserOrTheUser($report['login']);
 
         Db::get()->update(Common::prefixTable('report'),

tests/PHPUnit/Plugins/MobileMessagingTest.php

@@ -46,8 +46,8 @@ class MobileMessagingTest extends DatabaseTestCase
         \Piwik\PluginsManager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging'));
         $this->assertFalse(\Piwik\PluginsManager::getInstance()->isPluginActivated('MultiSites'));
 
-        $PdfReportsAPIInstance = APIScheduledReports::getInstance();
-        $reportId = $PdfReportsAPIInstance->addReport(
+        $APIScheduledReports = APIScheduledReports::getInstance();
+        $reportId = $APIScheduledReports->addReport(
             $this->idSiteAccess,
             'description',
             'month',
@@ -59,7 +59,7 @@ class MobileMessagingTest extends DatabaseTestCase
         );
 
         list($outputFilename, $prettyDate, $websiteName, $additionalFiles) =
-            $PdfReportsAPIInstance->generateReport(
+            $APIScheduledReports->generateReport(
                 $reportId,
                 '01-01-2010',
                 'en',