From 8bea5eac783184d0574b64843386f7f94cd257f9 Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Fri, 25 Dec 2015 11:16:33 -0800
Subject: [PATCH] Use Request::processRequest instead of using API::updateSite
directly so excessive sanitization is used and site name is stored properly
in OmniFixture DB.
---
tests/PHPUnit/Fixtures/OmniFixture.php | 39 +++++++++++++-------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php
index f2b5aa9c44..800a4e48bf 100644
--- a/tests/PHPUnit/Fixtures/OmniFixture.php
+++ b/tests/PHPUnit/Fixtures/OmniFixture.php
@@ -7,6 +7,7 @@
*/
namespace Piwik\Tests\Fixtures;
+use Piwik\API\Request;
use Piwik\Date;
use Piwik\Option;
use ReflectionClass;
@@ -150,26 +151,24 @@ class OmniFixture extends Fixture
private function restoreSitesProperties($initialSitesProperties)
{
foreach ($initialSitesProperties as $idSite => $properties) {
- SitesManagerAPI::getInstance()->updateSite(
- $idSite,
- $siteName = $properties['name'],
- $urls = $properties[''],
- $ecommerce = $properties['ecommerce'],
- $siteSearch = $properties['sitesearch'],
- $searchKeywordParameters = $properties['sitesearch_keyword_parameters'],
- $searchCategoryParameters = $properties['sitesearch_category_parameters'],
- $excludedIps = $properties['excluded_ips'],
- $excludedQueryParameters = $properties['excluded_parameters'],
- $timezone = $properties['timezone'],
- $currency = $properties['currency'],
- $group = $properties['group'],
- $startDate = $properties['ts_created'],
- $excludedUserAgents = $properties['excluded_user_agents'],
- $keepURLFragments = $properties['keep_url_fragment'],
- $type = $properties['type'],
- $settings = null,
- $excludeUnknownUrls = $properties['exclude_unknown_urls']
- );
+ Request::processRequest('SitesManager.updateSite', array(
+ 'idSite' => $idSite,
+ 'siteName' => $properties['name'],
+ 'ecommerce' => $properties['ecommerce'],
+ 'siteSearch' => $properties['sitesearch'],
+ 'searchKeywordParameters' => $properties['sitesearch_keyword_parameters'],
+ 'searchCategoryParameters' => $properties['sitesearch_category_parameters'],
+ 'excludedIps' => $properties['excluded_ips'],
+ 'excludedQueryParameters' => $properties['excluded_parameters'],
+ 'timezone' => $properties['timezone'],
+ 'currency' => $properties['currency'],
+ 'group' => $properties['group'],
+ 'startDate' => $properties['ts_created'],
+ 'excludedUserAgents' => $properties['excluded_user_agents'],
+ 'keepURLFragments' => $properties['keep_url_fragment'],
+ 'type' => $properties['type'],
+ 'excludeUnknownUrls' => $properties['exclude_unknown_urls']
+ ));
}
}
}
\ No newline at end of file
--
GitLab