nextcloud / server

lib/private/Updater/VersionCheck.php

Indentation +87 added lines, -87 removed lines

@@ -31,93 +31,93 @@
 
 class VersionCheck {
 
-	/** @var IClientService */
-	private $clientService;
+    /** @var IClientService */
+    private $clientService;
 	
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * @param IClientService $clientService
-	 * @param IConfig $config
-	 */
-	public function __construct(IClientService $clientService,
-								IConfig $config) {
-		$this->clientService = $clientService;
-		$this->config = $config;
-	}
-
-
-	/**
-	 * Check if a new version is available
-	 *
-	 * @return array|bool
-	 */
-	public function check() {
-		// Look up the cache - it is invalidated all 30 minutes
-		if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
-			return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
-		}
-
-		$updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.nextcloud.com/updater_server/');
-
-		$this->config->setAppValue('core', 'lastupdatedat', time());
-
-		if ($this->config->getAppValue('core', 'installedat', '') === '') {
-			$this->config->setAppValue('core', 'installedat', microtime(true));
-		}
-
-		$version = Util::getVersion();
-		$version['installed'] = $this->config->getAppValue('core', 'installedat');
-		$version['updated'] = $this->config->getAppValue('core', 'lastupdatedat');
-		$version['updatechannel'] = \OC_Util::getChannel();
-		$version['edition'] = '';
-		$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
-		$url = $updaterUrl . '?version=' . $versionString;
-
-		$tmp = [];
-		try {
-			$xml = $this->getUrlContent($url);
-		} catch (\Exception $e) {
-			return false;
-		}
-
-		if ($xml) {
-			$loadEntities = libxml_disable_entity_loader(true);
-			$data = @simplexml_load_string($xml);
-			libxml_disable_entity_loader($loadEntities);
-			if ($data !== false) {
-				$tmp['version'] = (string)$data->version;
-				$tmp['versionstring'] = (string)$data->versionstring;
-				$tmp['url'] = (string)$data->url;
-				$tmp['web'] = (string)$data->web;
-				$tmp['autoupdater'] = (string)$data->autoupdater;
-			} else {
-				libxml_clear_errors();
-			}
-		}
-
-		// Cache the result
-		$this->config->setAppValue('core', 'lastupdateResult', json_encode($tmp));
-		return $tmp;
-	}
-
-	/**
-	 * @codeCoverageIgnore
-	 * @param string $url
-	 * @return resource|string
-	 * @throws \Exception
-	 */
-	protected function getUrlContent($url) {
-		$client = $this->clientService->newClient();
-		$response = $client->get($url);
-		return $response->getBody();
-	}
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * @param IClientService $clientService
+     * @param IConfig $config
+     */
+    public function __construct(IClientService $clientService,
+                                IConfig $config) {
+        $this->clientService = $clientService;
+        $this->config = $config;
+    }
+
+
+    /**
+     * Check if a new version is available
+     *
+     * @return array|bool
+     */
+    public function check() {
+        // Look up the cache - it is invalidated all 30 minutes
+        if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
+            return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
+        }
+
+        $updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.nextcloud.com/updater_server/');
+
+        $this->config->setAppValue('core', 'lastupdatedat', time());
+
+        if ($this->config->getAppValue('core', 'installedat', '') === '') {
+            $this->config->setAppValue('core', 'installedat', microtime(true));
+        }
+
+        $version = Util::getVersion();
+        $version['installed'] = $this->config->getAppValue('core', 'installedat');
+        $version['updated'] = $this->config->getAppValue('core', 'lastupdatedat');
+        $version['updatechannel'] = \OC_Util::getChannel();
+        $version['edition'] = '';
+        $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
+        $url = $updaterUrl . '?version=' . $versionString;
+
+        $tmp = [];
+        try {
+            $xml = $this->getUrlContent($url);
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        if ($xml) {
+            $loadEntities = libxml_disable_entity_loader(true);
+            $data = @simplexml_load_string($xml);
+            libxml_disable_entity_loader($loadEntities);
+            if ($data !== false) {
+                $tmp['version'] = (string)$data->version;
+                $tmp['versionstring'] = (string)$data->versionstring;
+                $tmp['url'] = (string)$data->url;
+                $tmp['web'] = (string)$data->web;
+                $tmp['autoupdater'] = (string)$data->autoupdater;
+            } else {
+                libxml_clear_errors();
+            }
+        }
+
+        // Cache the result
+        $this->config->setAppValue('core', 'lastupdateResult', json_encode($tmp));
+        return $tmp;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     * @param string $url
+     * @return resource|string
+     * @throws \Exception
+     */
+    protected function getUrlContent($url) {
+        $client = $this->clientService->newClient();
+        $response = $client->get($url);
+        return $response->getBody();
+    }
 }