diff --git a/config/config.sample.php b/config/config.sample.php index 82246e139c..43a0ee6034 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -521,6 +521,17 @@ $CONFIG = array( */ 'updater.server.url' => 'https://updates.nextcloud.com/updater_server/', +/** + * The channel that Nextcloud should use to look for updates + * + * Supported values: + * - ``daily`` + * - ``beta` + * - ``stable`` + * - ``production`` + */ +'updater.release.channel' => 'stable', + /** * Is Nextcloud connected to the Internet or running in a closed network? */ diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php index e745d5fc4c..5b54c8e38e 100644 --- a/lib/private/Updater/VersionCheck.php +++ b/lib/private/Updater/VersionCheck.php @@ -73,6 +73,9 @@ class VersionCheck { $version['updatechannel'] = \OC_Util::getChannel(); $version['edition'] = \OC_Util::getEditionString(); $version['build'] = \OC_Util::getBuild(); + $version['php_major'] = PHP_MAJOR_VERSION; + $version['php_minor'] = PHP_MINOR_VERSION; + $version['php_release'] = PHP_RELEASE_VERSION; $versionString = implode('x', $version); //fetch xml data from updater diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php index f025cc02b0..79ef6dddcf 100644 --- a/tests/lib/Updater/VersionCheckTest.php +++ b/tests/lib/Updater/VersionCheckTest.php @@ -50,7 +50,7 @@ class VersionCheckTest extends \Test\TestCase { * @return string */ private function buildUpdateUrl($baseUrl) { - return $baseUrl . '?version='.implode('x', Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'x'.\OC_Util::getEditionString().'x'; + return $baseUrl . '?version='.implode('x', Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'x'.\OC_Util::getEditionString().'xx'.PHP_MAJOR_VERSION.'x'.PHP_MINOR_VERSION.'x'.PHP_RELEASE_VERSION; } public function testCheckInCache() {