mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #68 from nextcloud/stable9-custom-updater-url 

[stable9] Use custom updater URL
This commit is contained in:
Lukas Reschke 2016-06-12 23:56:03 +02:00 committed by GitHub
parent 84607f42dc eb7ed2356f
commit 145954d360
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.sample.php
View File

@ -499,7 +499,7 @@ $CONFIG = array(
/**
* URL that ownCloud should use to look for updates
*/
'updater.server.url' => 'https://updates.owncloud.com/server/',
'updater.server.url' => 'https://updates.nextcloud.org/server/',
/**
* Is ownCloud connected to the Internet or running in a closed network?

2
lib/private/updater.php
View File

@ -143,7 +143,7 @@ class Updater extends BasicEmitter {
return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
}
$updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.owncloud.com/server/');
$updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.nextcloud.org/server/');
$this->config->setAppValue('core', 'lastupdatedat', time());

24
tests/lib/updater.php
View File

@ -222,8 +222,8 @@ class UpdaterTest extends \Test\TestCase {
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('updater.server.url', 'https://updates.owncloud.com/server/')
->willReturn('https://updates.owncloud.com/server/');
->with('updater.server.url', 'https://updates.nextcloud.org/server/')
->willReturn('https://updates.nextcloud.org/server/');
$this->config
->expects($this->at(2))
->method('setAppValue')
@ -253,7 +253,7 @@ class UpdaterTest extends \Test\TestCase {
$this->httpHelper
->expects($this->once())
->method('getUrlContent')
->with($this->buildUpdateUrl('https://updates.owncloud.com/server/'))
->with($this->buildUpdateUrl('https://updates.nextcloud.org/server/'))
->will($this->returnValue($updateXml));
$this->assertSame($expectedResult, $this->updater->check());
@ -268,8 +268,8 @@ class UpdaterTest extends \Test\TestCase {
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('updater.server.url', 'https://updates.owncloud.com/server/')
->willReturn('https://updates.owncloud.com/server/');
->with('updater.server.url', 'https://updates.nextcloud.org/server/')
->willReturn('https://updates.nextcloud.org/server/');
$this->config
->expects($this->at(2))
->method('setAppValue')
@ -293,7 +293,7 @@ class UpdaterTest extends \Test\TestCase {
$this->httpHelper
->expects($this->once())
->method('getUrlContent')
->with($this->buildUpdateUrl('https://updates.owncloud.com/server/'))
->with($this->buildUpdateUrl('https://updates.nextcloud.org/server/'))
->will($this->returnValue($updateXml));
$this->assertSame([], $this->updater->check());
@ -315,8 +315,8 @@ class UpdaterTest extends \Test\TestCase {
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('updater.server.url', 'https://updates.owncloud.com/server/')
->willReturn('https://updates.owncloud.com/server/');
->with('updater.server.url', 'https://updates.nextcloud.org/server/')
->willReturn('https://updates.nextcloud.org/server/');
$this->config
->expects($this->at(2))
->method('setAppValue')
@ -342,7 +342,7 @@ class UpdaterTest extends \Test\TestCase {
$this->httpHelper
->expects($this->once())
->method('getUrlContent')
->with($this->buildUpdateUrl('https://updates.owncloud.com/server/'))
->with($this->buildUpdateUrl('https://updates.nextcloud.org/server/'))
->will($this->returnValue($updateXml));
$this->assertSame($expectedResult, $this->updater->check());
@ -359,8 +359,8 @@ class UpdaterTest extends \Test\TestCase {
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('updater.server.url', 'https://updates.owncloud.com/server/')
->willReturn('https://updates.owncloud.com/server/');
->with('updater.server.url', 'https://updates.nextcloud.org/server/')
->willReturn('https://updates.nextcloud.org/server/');
$this->config
->expects($this->at(2))
->method('setAppValue')
@ -384,7 +384,7 @@ class UpdaterTest extends \Test\TestCase {
$this->httpHelper
->expects($this->once())
->method('getUrlContent')
->with($this->buildUpdateUrl('https://updates.owncloud.com/server/'))
->with($this->buildUpdateUrl('https://updates.nextcloud.org/server/'))
->will($this->returnValue($updateXml));
$this->assertSame($expectedResult, $this->updater->check());