From 2bdfceca5009b8b8b1b34e9b8085ed219d6d1663 Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Wed, 12 Sep 2012 04:57:40 +0000
Subject: [PATCH] Follow up of previous api change + cleanup NOTICEs in tests
git-svn-id: http://dev.piwik.org/svn/trunk@6974 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
core/Access.php | 5 +----
core/RankingQuery.php | 2 +-
core/Tracker/Visit.php | 2 +-
plugins/Goals/API.php | 7 ++-----
plugins/UsersManager/API.php | 2 +-
tests/PHPUnit/FakeAccess.php | 5 +----
tests/core/Database.test.php | 5 +----
7 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/core/Access.php b/core/Access.php
index 0205c408fd..6396aeb18b 100644
--- a/core/Access.php
+++ b/core/Access.php
@@ -394,10 +394,7 @@ class Piwik_Access
$idSites = $this->getSitesIdWithAtLeastViewAccess();
}
- if(!is_array($idSites))
- {
- $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
- }
+ $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
if(empty($idSites))
{
throw new Piwik_Access_NoAccessException("The parameter 'idSite=' is missing from the request.");
diff --git a/core/RankingQuery.php b/core/RankingQuery.php
index 9003fb4061..8de988b7df 100644
--- a/core/RankingQuery.php
+++ b/core/RankingQuery.php
@@ -85,7 +85,7 @@ class Piwik_RankingQuery
* The constructor.
* Can be used as a shortcut for setLimit()
*/
- public function __construct($limit=false)
+ public function __construct($limit = false)
{
if ($limit !== false)
{
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 58e0f435eb..4475adbb76 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -746,7 +746,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
$toRecord = Piwik_Common::getRequestVar($parameterForceRecord, false, 'int', $this->request);
if(!$toRecord)
{
- printDebug($_SERVER['REQUEST_METHOD'].' parameter '.$parameterForceRecord.' not found in URL, request excluded');
+ printDebug(@$_SERVER['REQUEST_METHOD'].' parameter '.$parameterForceRecord.' not found in URL, request excluded');
$excluded = true;
printDebug("'$parameterForceRecord' parameter not found.");
}
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index 4cee07f05c..b6fe538573 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -55,11 +55,8 @@ class Piwik_Goals_API
{
//TODO calls to this function could be cached as static
// would help UI at least, since some UI requests would call this 2-3 times..
- if(!is_array($idSite))
- {
- $idSite = Piwik_Site::getIdSitesFromIdSitesString($idSite);
- }
- if(empty($idSite))
+ $idSite = Piwik_Site::getIdSitesFromIdSitesString($idSite);
+ if(empty($idSite))
{
return array();
}
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
index f75377e2b6..e880599974 100644
--- a/plugins/UsersManager/API.php
+++ b/plugins/UsersManager/API.php
@@ -539,7 +539,7 @@ class Piwik_UsersManager_API
$idSites = Piwik_SitesManager_API::getInstance()->getSitesIdWithAdminAccess();
}
// in case the idSites is an integer we build an array
- elseif(!is_array($idSites))
+ else
{
$idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
}
diff --git a/tests/PHPUnit/FakeAccess.php b/tests/PHPUnit/FakeAccess.php
index 069b41c697..a3942163ef 100644
--- a/tests/PHPUnit/FakeAccess.php
+++ b/tests/PHPUnit/FakeAccess.php
@@ -62,10 +62,7 @@ class FakeAccess
$websitesAccess=Piwik_SitesManager_API::getInstance()->getAllSitesId();
}
- if(!is_array($idSites))
- {
- $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
- }
+ $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
foreach($idSites as $idsite)
{
if(!in_array($idsite, $websitesAccess))
diff --git a/tests/core/Database.test.php b/tests/core/Database.test.php
index 6b7bb677cb..16d9ad234a 100644
--- a/tests/core/Database.test.php
+++ b/tests/core/Database.test.php
@@ -121,10 +121,7 @@ class FakeAccess
$websitesAccess=Piwik_SitesManager_API::getInstance()->getAllSitesId();
}
- if(!is_array($idSites))
- {
- $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
- }
+ $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
foreach($idSites as $idsite)
{
if(!in_array($idsite, $websitesAccess))
--
GitLab