Fixing build, another attempt...

tests/PHPUnit/Integration/BlobReportLimitingTest.php

@@ -273,7 +273,7 @@ class Test_Piwik_Integration_BlobReportLimitingTest extends IntegrationTestCase
 	public static function setMockLocationProvider()
 	{
 		Piwik_UserCountry_LocationProvider::setCurrentProvider('mock_provider');
-		Piwik_UserCountry_LocationProvider::getCurrentProvider()->locations = array(
+		MockLocationProvider::$locations = array(
 			self::makeLocation('Toronto', 'ON', 'CA'),
 			
 			self::makeLocation('Nice', 'B8', 'FR'),

tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php

@@ -206,7 +206,7 @@ class Test_Piwik_Integration_ManyVisitorsOneWebsiteTest extends IntegrationTestC
 	{
 		Piwik_UserCountry_LocationProvider::$providers = null;
 		Piwik_UserCountry_LocationProvider::setCurrentProvider('mock_provider');
-		Piwik_UserCountry_LocationProvider::getCurrentProvider()->locations = array(
+		MockLocationProvider::$locations = array(
 			self::makeLocation('Stratford-upon-Avon', 'P3', 'gb', 123.456, 21.321), // template location
 			
 			// same region, different city, same country

tests/PHPUnit/MockLocationProvider.php

@@ -8,7 +8,7 @@
 
 class MockLocationProvider extends Piwik_UserCountry_LocationProvider
 {
-	public $locations = array();
+	public static $locations = array();
 	private $currentLocation = 0;
 	private $ipToLocations = array();
 	
@@ -22,8 +22,8 @@ class MockLocationProvider extends Piwik_UserCountry_LocationProvider
 		}
 		else
 		{
-			$result = $this->locations[$this->currentLocation];
-			$this->currentLocation = ($this->currentLocation + 1) % count($this->locations);
+			$result = self::$locations[$this->currentLocation];
+			$this->currentLocation = ($this->currentLocation + 1) % count(self::$locations);
 			
 			$this->ipToLocations[$ip] = $result;
 		}