nextcloud / server

lib/private/L10N/L10N.php

Indentation +186 added lines, -186 removed lines

@@ -28,190 +28,190 @@
 
 class L10N implements IL10N {
 
-	/** @var IFactory */
-	protected $factory;
-
-	/** @var string App of this object */
-	protected $app;
-
-	/** @var string Language of this object */
-	protected $lang;
-
-	/** @var string Plural forms (string) */
-	private $pluralFormString = 'nplurals=2; plural=(n != 1);';
-
-	/** @var string Plural forms (function) */
-	private $pluralFormFunction = null;
-
-	/** @var string[] */
-	private $translations = [];
-
-	/**
-	 * @param IFactory $factory
-	 * @param string $app
-	 * @param string $lang
-	 * @param array $files
-	 */
-	public function __construct(IFactory $factory, $app, $lang, array $files) {
-		$this->factory = $factory;
-		$this->app = $app;
-		$this->lang = $lang;
-
-		$this->translations = [];
-		foreach ($files as $languageFile) {
-			$this->load($languageFile);
-		}
-	}
-
-	/**
-	 * The code (en, de, ...) of the language that is used for this instance
-	 *
-	 * @return string language
-	 */
-	public function getLanguageCode() {
-		return $this->lang;
-	}
-
-	/**
-	 * Translating
-	 * @param string $text The text we need a translation for
-	 * @param array $parameters default:array() Parameters for sprintf
-	 * @return string Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned.
-	 */
-	public function t($text, $parameters = array()) {
-		return (string) new \OC_L10N_String($this, $text, $parameters);
-	}
-
-	/**
-	 * Translating
-	 * @param string $text_singular the string to translate for exactly one object
-	 * @param string $text_plural the string to translate for n objects
-	 * @param integer $count Number of objects
-	 * @param array $parameters default:array() Parameters for sprintf
-	 * @return string Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned. %n will be replaced with the number of objects.
-	 *
-	 * The correct plural is determined by the plural_forms-function
-	 * provided by the po file.
-	 *
-	 */
-	public function n($text_singular, $text_plural, $count, $parameters = array()) {
-		$identifier = "_${text_singular}_::_${text_plural}_";
-		if (isset($this->translations[$identifier])) {
-			return (string) new \OC_L10N_String($this, $identifier, $parameters, $count);
-		} else {
-			if ($count === 1) {
-				return (string) new \OC_L10N_String($this, $text_singular, $parameters, $count);
-			} else {
-				return (string) new \OC_L10N_String($this, $text_plural, $parameters, $count);
-			}
-		}
-	}
-
-	/**
-	 * Localization
-	 * @param string $type Type of localization
-	 * @param \DateTime|int|string $data parameters for this localization
-	 * @param array $options
-	 * @return string|int|false
-	 *
-	 * Returns the localized data.
-	 *
-	 * Implemented types:
-	 *  - date
-	 *    - Creates a date
-	 *    - params: timestamp (int/string)
-	 *  - datetime
-	 *    - Creates date and time
-	 *    - params: timestamp (int/string)
-	 *  - time
-	 *    - Creates a time
-	 *    - params: timestamp (int/string)
-	 *  - firstday: Returns the first day of the week (0 sunday - 6 saturday)
-	 *  - jsdate: Returns the short JS date format
-	 */
-	public function l($type, $data = null, $options = array()) {
-		// Use the language of the instance
-		$locale = $this->getLanguageCode();
-		if ($locale === 'sr@latin') {
-			$locale = 'sr_latn';
-		}
-
-		if ($type === 'firstday') {
-			return (int) Calendar::getFirstWeekday($locale);
-		}
-		if ($type === 'jsdate') {
-			return (string) Calendar::getDateFormat('short', $locale);
-		}
-
-		$value = new \DateTime();
-		if ($data instanceof \DateTime) {
-			$value = $data;
-		} else if (is_string($data) && !is_numeric($data)) {
-			$data = strtotime($data);
-			$value->setTimestamp($data);
-		} else if ($data !== null) {
-			$value->setTimestamp($data);
-		}
-
-		$options = array_merge(array('width' => 'long'), $options);
-		$width = $options['width'];
-		switch ($type) {
-			case 'date':
-				return (string) Calendar::formatDate($value, $width, $locale);
-			case 'datetime':
-				return (string) Calendar::formatDatetime($value, $width, $locale);
-			case 'time':
-				return (string) Calendar::formatTime($value, $width, $locale);
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * Returns an associative array with all translations
-	 *
-	 * Called by \OC_L10N_String
-	 * @return array
-	 */
-	public function getTranslations() {
-		return $this->translations;
-	}
-
-	/**
-	 * Returnsed function accepts the argument $n
-	 *
-	 * Called by \OC_L10N_String
-	 * @return string the plural form function
-	 */
-	public function getPluralFormFunction() {
-		if (is_null($this->pluralFormFunction)) {
-			$this->pluralFormFunction = $this->factory->createPluralFunction($this->pluralFormString);
-		}
-		return $this->pluralFormFunction;
-	}
-
-	/**
-	 * @param $translationFile
-	 * @return bool
-	 */
-	protected function load($translationFile) {
-		$json = json_decode(file_get_contents($translationFile), true);
-		if (!is_array($json)) {
-			$jsonError = json_last_error();
-			\OC::$server->getLogger()->warning("Failed to load $translationFile - json error code: $jsonError", ['app' => 'l10n']);
-			return false;
-		}
-
-		if (!empty($json['pluralForm'])) {
-			$this->pluralFormString = $json['pluralForm'];
-		}
-		$this->translations = array_merge($this->translations, $json['translations']);
-		return true;
-	}
+    /** @var IFactory */
+    protected $factory;
+
+    /** @var string App of this object */
+    protected $app;
+
+    /** @var string Language of this object */
+    protected $lang;
+
+    /** @var string Plural forms (string) */
+    private $pluralFormString = 'nplurals=2; plural=(n != 1);';
+
+    /** @var string Plural forms (function) */
+    private $pluralFormFunction = null;
+
+    /** @var string[] */
+    private $translations = [];
+
+    /**
+     * @param IFactory $factory
+     * @param string $app
+     * @param string $lang
+     * @param array $files
+     */
+    public function __construct(IFactory $factory, $app, $lang, array $files) {
+        $this->factory = $factory;
+        $this->app = $app;
+        $this->lang = $lang;
+
+        $this->translations = [];
+        foreach ($files as $languageFile) {
+            $this->load($languageFile);
+        }
+    }
+
+    /**
+     * The code (en, de, ...) of the language that is used for this instance
+     *
+     * @return string language
+     */
+    public function getLanguageCode() {
+        return $this->lang;
+    }
+
+    /**
+     * Translating
+     * @param string $text The text we need a translation for
+     * @param array $parameters default:array() Parameters for sprintf
+     * @return string Translation or the same text
+     *
+     * Returns the translation. If no translation is found, $text will be
+     * returned.
+     */
+    public function t($text, $parameters = array()) {
+        return (string) new \OC_L10N_String($this, $text, $parameters);
+    }
+
+    /**
+     * Translating
+     * @param string $text_singular the string to translate for exactly one object
+     * @param string $text_plural the string to translate for n objects
+     * @param integer $count Number of objects
+     * @param array $parameters default:array() Parameters for sprintf
+     * @return string Translation or the same text
+     *
+     * Returns the translation. If no translation is found, $text will be
+     * returned. %n will be replaced with the number of objects.
+     *
+     * The correct plural is determined by the plural_forms-function
+     * provided by the po file.
+     *
+     */
+    public function n($text_singular, $text_plural, $count, $parameters = array()) {
+        $identifier = "_${text_singular}_::_${text_plural}_";
+        if (isset($this->translations[$identifier])) {
+            return (string) new \OC_L10N_String($this, $identifier, $parameters, $count);
+        } else {
+            if ($count === 1) {
+                return (string) new \OC_L10N_String($this, $text_singular, $parameters, $count);
+            } else {
+                return (string) new \OC_L10N_String($this, $text_plural, $parameters, $count);
+            }
+        }
+    }
+
+    /**
+     * Localization
+     * @param string $type Type of localization
+     * @param \DateTime|int|string $data parameters for this localization
+     * @param array $options
+     * @return string|int|false
+     *
+     * Returns the localized data.
+     *
+     * Implemented types:
+     *  - date
+     *    - Creates a date
+     *    - params: timestamp (int/string)
+     *  - datetime
+     *    - Creates date and time
+     *    - params: timestamp (int/string)
+     *  - time
+     *    - Creates a time
+     *    - params: timestamp (int/string)
+     *  - firstday: Returns the first day of the week (0 sunday - 6 saturday)
+     *  - jsdate: Returns the short JS date format
+     */
+    public function l($type, $data = null, $options = array()) {
+        // Use the language of the instance
+        $locale = $this->getLanguageCode();
+        if ($locale === 'sr@latin') {
+            $locale = 'sr_latn';
+        }
+
+        if ($type === 'firstday') {
+            return (int) Calendar::getFirstWeekday($locale);
+        }
+        if ($type === 'jsdate') {
+            return (string) Calendar::getDateFormat('short', $locale);
+        }
+
+        $value = new \DateTime();
+        if ($data instanceof \DateTime) {
+            $value = $data;
+        } else if (is_string($data) && !is_numeric($data)) {
+            $data = strtotime($data);
+            $value->setTimestamp($data);
+        } else if ($data !== null) {
+            $value->setTimestamp($data);
+        }
+
+        $options = array_merge(array('width' => 'long'), $options);
+        $width = $options['width'];
+        switch ($type) {
+            case 'date':
+                return (string) Calendar::formatDate($value, $width, $locale);
+            case 'datetime':
+                return (string) Calendar::formatDatetime($value, $width, $locale);
+            case 'time':
+                return (string) Calendar::formatTime($value, $width, $locale);
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Returns an associative array with all translations
+     *
+     * Called by \OC_L10N_String
+     * @return array
+     */
+    public function getTranslations() {
+        return $this->translations;
+    }
+
+    /**
+     * Returnsed function accepts the argument $n
+     *
+     * Called by \OC_L10N_String
+     * @return string the plural form function
+     */
+    public function getPluralFormFunction() {
+        if (is_null($this->pluralFormFunction)) {
+            $this->pluralFormFunction = $this->factory->createPluralFunction($this->pluralFormString);
+        }
+        return $this->pluralFormFunction;
+    }
+
+    /**
+     * @param $translationFile
+     * @return bool
+     */
+    protected function load($translationFile) {
+        $json = json_decode(file_get_contents($translationFile), true);
+        if (!is_array($json)) {
+            $jsonError = json_last_error();
+            \OC::$server->getLogger()->warning("Failed to load $translationFile - json error code: $jsonError", ['app' => 'l10n']);
+            return false;
+        }
+
+        if (!empty($json['pluralForm'])) {
+            $this->pluralFormString = $json['pluralForm'];
+        }
+        $this->translations = array_merge($this->translations, $json['translations']);
+        return true;
+    }
 }

lib/private/Http/Client/Response.php

Indentation +41 added lines, -41 removed lines

@@ -32,51 +32,51 @@
  * @package OC\Http
  */
 class Response implements IResponse {
-	/** @var GuzzleResponse */
-	private $response;
+    /** @var GuzzleResponse */
+    private $response;
 
-	/**
-	 * @var bool
-	 */
-	private $stream;
+    /**
+     * @var bool
+     */
+    private $stream;
 
-	/**
-	 * @param GuzzleResponse $response
-	 * @param bool $stream
-	 */
-	public function __construct(GuzzleResponse $response, $stream = false) {
-		$this->response = $response;
-		$this->stream = $stream;
-	}
+    /**
+     * @param GuzzleResponse $response
+     * @param bool $stream
+     */
+    public function __construct(GuzzleResponse $response, $stream = false) {
+        $this->response = $response;
+        $this->stream = $stream;
+    }
 
-	/**
-	 * @return string|resource
-	 */
-	public function getBody() {
-		return $this->stream ?
-			$this->response->getBody()->detach():
-			$this->response->getBody()->getContents();
-	}
+    /**
+     * @return string|resource
+     */
+    public function getBody() {
+        return $this->stream ?
+            $this->response->getBody()->detach():
+            $this->response->getBody()->getContents();
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getStatusCode() {
-		return $this->response->getStatusCode();
-	}
+    /**
+     * @return int
+     */
+    public function getStatusCode() {
+        return $this->response->getStatusCode();
+    }
 
-	/**
-	 * @param $key
-	 * @return string
-	 */
-	public function getHeader($key) {
-		return $this->response->getHeader($key);
-	}
+    /**
+     * @param $key
+     * @return string
+     */
+    public function getHeader($key) {
+        return $this->response->getHeader($key);
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getHeaders() {
-		return $this->response->getHeaders();
-	}
+    /**
+     * @return array
+     */
+    public function getHeaders() {
+        return $this->response->getHeaders();
+    }
 }

lib/private/Http/Client/Client.php

Indentation +263 added lines, -263 removed lines

@@ -34,280 +34,280 @@
  * @package OC\Http
  */
 class Client implements IClient {
-	/** @var GuzzleClient */
-	private $client;
-	/** @var IConfig */
-	private $config;
-	/** @var ICertificateManager */
-	private $certificateManager;
-	private $configured = false;
+    /** @var GuzzleClient */
+    private $client;
+    /** @var IConfig */
+    private $config;
+    /** @var ICertificateManager */
+    private $certificateManager;
+    private $configured = false;
 
-	/**
-	 * @param IConfig $config
-	 * @param ICertificateManager $certificateManager
-	 * @param GuzzleClient $client
-	 */
-	public function __construct(IConfig $config,
-								ICertificateManager $certificateManager,
-								GuzzleClient $client) {
-		$this->config = $config;
-		$this->client = $client;
-		$this->certificateManager = $certificateManager;
-	}
+    /**
+     * @param IConfig $config
+     * @param ICertificateManager $certificateManager
+     * @param GuzzleClient $client
+     */
+    public function __construct(IConfig $config,
+                                ICertificateManager $certificateManager,
+                                GuzzleClient $client) {
+        $this->config = $config;
+        $this->client = $client;
+        $this->certificateManager = $certificateManager;
+    }
 
-	/**
-	 * Sets the default options to the client
-	 */
-	private function setDefaultOptions() {
-		if ($this->configured) {
-			return;
-		}
-		$this->configured = true;
-		// Either use user bundle or the system bundle if nothing is specified
-		if ($this->certificateManager->listCertificates() !== []) {
-			$this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath());
-		} else {
-			// If the instance is not yet setup we need to use the static path as
-			// $this->certificateManager->getAbsoluteBundlePath() tries to instantiiate
-			// a view
-			if ($this->config->getSystemValue('installed', false)) {
-				$this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath(null));
-			} else {
-				$this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
-			}
-		}
+    /**
+     * Sets the default options to the client
+     */
+    private function setDefaultOptions() {
+        if ($this->configured) {
+            return;
+        }
+        $this->configured = true;
+        // Either use user bundle or the system bundle if nothing is specified
+        if ($this->certificateManager->listCertificates() !== []) {
+            $this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath());
+        } else {
+            // If the instance is not yet setup we need to use the static path as
+            // $this->certificateManager->getAbsoluteBundlePath() tries to instantiiate
+            // a view
+            if ($this->config->getSystemValue('installed', false)) {
+                $this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath(null));
+            } else {
+                $this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+            }
+        }
 
-		$this->client->setDefaultOption('headers/User-Agent', 'Nextcloud Server Crawler');
-		$proxyUri = $this->getProxyUri();
-		if ($proxyUri !== '') {
-			$this->client->setDefaultOption('proxy', $proxyUri);
-		}
-	}
+        $this->client->setDefaultOption('headers/User-Agent', 'Nextcloud Server Crawler');
+        $proxyUri = $this->getProxyUri();
+        if ($proxyUri !== '') {
+            $this->client->setDefaultOption('proxy', $proxyUri);
+        }
+    }
 
-	/**
-	 * Get the proxy URI
-	 *
-	 * @return string
-	 */
-	private function getProxyUri() {
-		$proxyHost = $this->config->getSystemValue('proxy', null);
-		$proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', null);
-		$proxyUri = '';
+    /**
+     * Get the proxy URI
+     *
+     * @return string
+     */
+    private function getProxyUri() {
+        $proxyHost = $this->config->getSystemValue('proxy', null);
+        $proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', null);
+        $proxyUri = '';
 
-		if ($proxyUserPwd !== null) {
-			$proxyUri .= $proxyUserPwd . '@';
-		}
-		if ($proxyHost !== null) {
-			$proxyUri .= $proxyHost;
-		}
+        if ($proxyUserPwd !== null) {
+            $proxyUri .= $proxyUserPwd . '@';
+        }
+        if ($proxyHost !== null) {
+            $proxyUri .= $proxyHost;
+        }
 
-		return $proxyUri;
-	}
+        return $proxyUri;
+    }
 
-	/**
-	 * Sends a GET request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'query' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return Response
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function get($uri, array $options = []) {
-		$this->setDefaultOptions();
-		$response = $this->client->get($uri, $options);
-		$isStream = isset($options['stream']) && $options['stream'];
-		return new Response($response, $isStream);
-	}
+    /**
+     * Sends a GET request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'query' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return Response
+     * @throws \Exception If the request could not get completed
+     */
+    public function get($uri, array $options = []) {
+        $this->setDefaultOptions();
+        $response = $this->client->get($uri, $options);
+        $isStream = isset($options['stream']) && $options['stream'];
+        return new Response($response, $isStream);
+    }
 
-	/**
-	 * Sends a HEAD request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return Response
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function head($uri, $options = []) {
-		$this->setDefaultOptions();
-		$response = $this->client->head($uri, $options);
-		return new Response($response);
-	}
+    /**
+     * Sends a HEAD request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return Response
+     * @throws \Exception If the request could not get completed
+     */
+    public function head($uri, $options = []) {
+        $this->setDefaultOptions();
+        $response = $this->client->head($uri, $options);
+        return new Response($response);
+    }
 
-	/**
-	 * Sends a POST request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return Response
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function post($uri, array $options = []) {
-		$this->setDefaultOptions();
-		$response = $this->client->post($uri, $options);
-		return new Response($response);
-	}
+    /**
+     * Sends a POST request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return Response
+     * @throws \Exception If the request could not get completed
+     */
+    public function post($uri, array $options = []) {
+        $this->setDefaultOptions();
+        $response = $this->client->post($uri, $options);
+        return new Response($response);
+    }
 
-	/**
-	 * Sends a PUT request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return Response
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function put($uri, array $options = []) {
-		$this->setDefaultOptions();
-		$response = $this->client->put($uri, $options);
-		return new Response($response);
-	}
+    /**
+     * Sends a PUT request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return Response
+     * @throws \Exception If the request could not get completed
+     */
+    public function put($uri, array $options = []) {
+        $this->setDefaultOptions();
+        $response = $this->client->put($uri, $options);
+        return new Response($response);
+    }
 
-	/**
-	 * Sends a DELETE request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return Response
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function delete($uri, array $options = []) {
-		$this->setDefaultOptions();
-		$response = $this->client->delete($uri, $options);
-		return new Response($response);
-	}
+    /**
+     * Sends a DELETE request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return Response
+     * @throws \Exception If the request could not get completed
+     */
+    public function delete($uri, array $options = []) {
+        $this->setDefaultOptions();
+        $response = $this->client->delete($uri, $options);
+        return new Response($response);
+    }
 
 
-	/**
-	 * Sends a options request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return Response
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function options($uri, array $options = []) {
-		$this->setDefaultOptions();
-		$response = $this->client->options($uri, $options);
-		return new Response($response);
-	}
+    /**
+     * Sends a options request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return Response
+     * @throws \Exception If the request could not get completed
+     */
+    public function options($uri, array $options = []) {
+        $this->setDefaultOptions();
+        $response = $this->client->options($uri, $options);
+        return new Response($response);
+    }
 }

lib/private/Http/Client/ClientService.php

Indentation +19 added lines, -19 removed lines

@@ -33,25 +33,25 @@
  * @package OC\Http
  */
 class ClientService implements IClientService {
-	/** @var IConfig */
-	private $config;
-	/** @var ICertificateManager */
-	private $certificateManager;
+    /** @var IConfig */
+    private $config;
+    /** @var ICertificateManager */
+    private $certificateManager;
 
-	/**
-	 * @param IConfig $config
-	 * @param ICertificateManager $certificateManager
-	 */
-	public function __construct(IConfig $config,
-								ICertificateManager $certificateManager) {
-		$this->config = $config;
-		$this->certificateManager = $certificateManager;
-	}
+    /**
+     * @param IConfig $config
+     * @param ICertificateManager $certificateManager
+     */
+    public function __construct(IConfig $config,
+                                ICertificateManager $certificateManager) {
+        $this->config = $config;
+        $this->certificateManager = $certificateManager;
+    }
 
-	/**
-	 * @return Client
-	 */
-	public function newClient() {
-		return new Client($this->config, $this->certificateManager, new GuzzleClient());
-	}
+    /**
+     * @return Client
+     */
+    public function newClient() {
+        return new Client($this->config, $this->certificateManager, new GuzzleClient());
+    }
 }

lib/private/Session/Memory.php

Indentation +72 added lines, -72 removed lines

@@ -38,86 +38,86 @@
  * @package OC\Session
  */
 class Memory extends Session {
-	protected $data;
+    protected $data;
 
-	public function __construct($name) {
-		//no need to use $name since all data is already scoped to this instance
-		$this->data = array();
-	}
+    public function __construct($name) {
+        //no need to use $name since all data is already scoped to this instance
+        $this->data = array();
+    }
 
-	/**
-	 * @param string $key
-	 * @param integer $value
-	 */
-	public function set($key, $value) {
-		$this->validateSession();
-		$this->data[$key] = $value;
-	}
+    /**
+     * @param string $key
+     * @param integer $value
+     */
+    public function set($key, $value) {
+        $this->validateSession();
+        $this->data[$key] = $value;
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function get($key) {
-		if (!$this->exists($key)) {
-			return null;
-		}
-		return $this->data[$key];
-	}
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function get($key) {
+        if (!$this->exists($key)) {
+            return null;
+        }
+        return $this->data[$key];
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool
-	 */
-	public function exists($key) {
-		return isset($this->data[$key]);
-	}
+    /**
+     * @param string $key
+     * @return bool
+     */
+    public function exists($key) {
+        return isset($this->data[$key]);
+    }
 
-	/**
-	 * @param string $key
-	 */
-	public function remove($key) {
-		$this->validateSession();
-		unset($this->data[$key]);
-	}
+    /**
+     * @param string $key
+     */
+    public function remove($key) {
+        $this->validateSession();
+        unset($this->data[$key]);
+    }
 
-	public function clear() {
-		$this->data = array();
-	}
+    public function clear() {
+        $this->data = array();
+    }
 
-	/**
-	 * Stub since the session ID does not need to get regenerated for the cache
-	 *
-	 * @param bool $deleteOldSession
-	 */
-	public function regenerateId($deleteOldSession = true) {}
+    /**
+     * Stub since the session ID does not need to get regenerated for the cache
+     *
+     * @param bool $deleteOldSession
+     */
+    public function regenerateId($deleteOldSession = true) {}
 
-	/**
-	 * Wrapper around session_id
-	 *
-	 * @return string
-	 * @throws SessionNotAvailableException
-	 * @since 9.1.0
-	 */
-	public function getId() {
-		throw new SessionNotAvailableException('Memory session does not have an ID');
-	}
+    /**
+     * Wrapper around session_id
+     *
+     * @return string
+     * @throws SessionNotAvailableException
+     * @since 9.1.0
+     */
+    public function getId() {
+        throw new SessionNotAvailableException('Memory session does not have an ID');
+    }
 
-	/**
-	 * Helper function for PHPUnit execution - don't use in non-test code
-	 */
-	public function reopen() {
-		$this->sessionClosed = false;
-	}
+    /**
+     * Helper function for PHPUnit execution - don't use in non-test code
+     */
+    public function reopen() {
+        $this->sessionClosed = false;
+    }
 
-	/**
-	 * In case the session has already been locked an exception will be thrown
-	 *
-	 * @throws Exception
-	 */
-	private function validateSession() {
-		if ($this->sessionClosed) {
-			throw new Exception('Session has been closed - no further changes to the session are allowed');
-		}
-	}
+    /**
+     * In case the session has already been locked an exception will be thrown
+     *
+     * @throws Exception
+     */
+    private function validateSession() {
+        if ($this->sessionClosed) {
+            throw new Exception('Session has been closed - no further changes to the session are allowed');
+        }
+    }
 }

lib/private/Session/Session.php

Indentation +43 added lines, -43 removed lines

@@ -28,53 +28,53 @@
 
 abstract class Session implements \ArrayAccess, ISession {
 
-	/**
-	 * @var bool
-	 */
-	protected $sessionClosed = false;
+    /**
+     * @var bool
+     */
+    protected $sessionClosed = false;
 
-	/**
-	 * $name serves as a namespace for the session keys
-	 *
-	 * @param string $name
-	 */
-	abstract public function __construct($name);
+    /**
+     * $name serves as a namespace for the session keys
+     *
+     * @param string $name
+     */
+    abstract public function __construct($name);
 
-	/**
-	 * @param mixed $offset
-	 * @return bool
-	 */
-	public function offsetExists($offset) {
-		return $this->exists($offset);
-	}
+    /**
+     * @param mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset) {
+        return $this->exists($offset);
+    }
 
-	/**
-	 * @param mixed $offset
-	 * @return mixed
-	 */
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
+    /**
+     * @param mixed $offset
+     * @return mixed
+     */
+    public function offsetGet($offset) {
+        return $this->get($offset);
+    }
 
-	/**
-	 * @param mixed $offset
-	 * @param mixed $value
-	 */
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
+    /**
+     * @param mixed $offset
+     * @param mixed $value
+     */
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
 
-	/**
-	 * @param mixed $offset
-	 */
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
+    /**
+     * @param mixed $offset
+     */
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
 
-	/**
-	 * Close the session and release the lock
-	 */
-	public function close() {
-		$this->sessionClosed = true;
-	}
+    /**
+     * Close the session and release the lock
+     */
+    public function close() {
+        $this->sessionClosed = true;
+    }
 }

lib/private/Session/CryptoWrapper.php

Indentation +45 added lines, -45 removed lines

@@ -48,56 +48,56 @@
  * @package OC\Session
  */
 class CryptoWrapper {
-	const COOKIE_NAME = 'oc_sessionPassphrase';
+    const COOKIE_NAME = 'oc_sessionPassphrase';
 
-	/** @var ISession */
-	protected $session;
+    /** @var ISession */
+    protected $session;
 
-	/** @var \OCP\Security\ICrypto */
-	protected $crypto;
+    /** @var \OCP\Security\ICrypto */
+    protected $crypto;
 
-	/** @var ISecureRandom */
-	protected $random;
+    /** @var ISecureRandom */
+    protected $random;
 
-	/**
-	 * @param IConfig $config
-	 * @param ICrypto $crypto
-	 * @param ISecureRandom $random
-	 * @param IRequest $request
-	 */
-	public function __construct(IConfig $config,
-								ICrypto $crypto,
-								ISecureRandom $random,
-								IRequest $request) {
-		$this->crypto = $crypto;
-		$this->config = $config;
-		$this->random = $random;
+    /**
+     * @param IConfig $config
+     * @param ICrypto $crypto
+     * @param ISecureRandom $random
+     * @param IRequest $request
+     */
+    public function __construct(IConfig $config,
+                                ICrypto $crypto,
+                                ISecureRandom $random,
+                                IRequest $request) {
+        $this->crypto = $crypto;
+        $this->config = $config;
+        $this->random = $random;
 
-		if (!is_null($request->getCookie(self::COOKIE_NAME))) {
-			$this->passphrase = $request->getCookie(self::COOKIE_NAME);
-		} else {
-			$this->passphrase = $this->random->generate(128);
-			$secureCookie = $request->getServerProtocol() === 'https';
-			// FIXME: Required for CI
-			if (!defined('PHPUNIT_RUN')) {
-				$webRoot = \OC::$WEBROOT;
-				if($webRoot === '') {
-					$webRoot = '/';
-				}
-				setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true);
-			}
-		}
-	}
+        if (!is_null($request->getCookie(self::COOKIE_NAME))) {
+            $this->passphrase = $request->getCookie(self::COOKIE_NAME);
+        } else {
+            $this->passphrase = $this->random->generate(128);
+            $secureCookie = $request->getServerProtocol() === 'https';
+            // FIXME: Required for CI
+            if (!defined('PHPUNIT_RUN')) {
+                $webRoot = \OC::$WEBROOT;
+                if($webRoot === '') {
+                    $webRoot = '/';
+                }
+                setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true);
+            }
+        }
+    }
 
-	/**
-	 * @param ISession $session
-	 * @return ISession
-	 */
-	public function wrapSession(ISession $session) {
-		if (!($session instanceof CryptoSessionData)) {
-			return new CryptoSessionData($session, $this->crypto, $this->passphrase);
-		}
+    /**
+     * @param ISession $session
+     * @return ISession
+     */
+    public function wrapSession(ISession $session) {
+        if (!($session instanceof CryptoSessionData)) {
+            return new CryptoSessionData($session, $this->crypto, $this->passphrase);
+        }
 
-		return $session;
-	}
+        return $session;
+    }
 }

lib/private/Comments/ManagerFactory.php

Indentation +28 added lines, -28 removed lines

@@ -30,34 +30,34 @@
 
 class ManagerFactory implements ICommentsManagerFactory {
 
-	/**
-	 * Server container
-	 *
-	 * @var IServerContainer
-	 */
-	private $serverContainer;
+    /**
+     * Server container
+     *
+     * @var IServerContainer
+     */
+    private $serverContainer;
 
-	/**
-	 * Constructor for the comments manager factory
-	 *
-	 * @param IServerContainer $serverContainer server container
-	 */
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
+    /**
+     * Constructor for the comments manager factory
+     *
+     * @param IServerContainer $serverContainer server container
+     */
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
 
-	/**
-	 * creates and returns an instance of the ICommentsManager
-	 *
-	 * @return ICommentsManager
-	 * @since 9.0.0
-	 */
-	public function getManager() {
-		return new Manager(
-			$this->serverContainer->getDatabaseConnection(),
-			$this->serverContainer->getLogger(),
-			$this->serverContainer->getConfig(),
-			$this->serverContainer->getEventDispatcher()
-		);
-	}
+    /**
+     * creates and returns an instance of the ICommentsManager
+     *
+     * @return ICommentsManager
+     * @since 9.0.0
+     */
+    public function getManager() {
+        return new Manager(
+            $this->serverContainer->getDatabaseConnection(),
+            $this->serverContainer->getLogger(),
+            $this->serverContainer->getConfig(),
+            $this->serverContainer->getEventDispatcher()
+        );
+    }
 }

lib/private/Comments/Comment.php

Indentation +389 added lines, -389 removed lines

@@ -29,393 +29,393 @@
 
 class Comment implements IComment {
 
-	protected $data = [
-		'id'              => '',
-		'parentId'        => '0',
-		'topmostParentId' => '0',
-		'childrenCount'   => '0',
-		'message'         => '',
-		'verb'            => '',
-		'actorType'       => '',
-		'actorId'         => '',
-		'objectType'      => '',
-		'objectId'        => '',
-		'creationDT'      => null,
-		'latestChildDT'   => null,
-	];
-
-	/**
-	 * Comment constructor.
-	 *
-	 * @param array $data	optional, array with keys according to column names from
-	 * 						the comments database scheme
-	 */
-	public function __construct(array $data = null) {
-		if(is_array($data)) {
-			$this->fromArray($data);
-		}
-	}
-
-	/**
-	 * returns the ID of the comment
-	 *
-	 * It may return an empty string, if the comment was not stored.
-	 * It is expected that the concrete Comment implementation gives an ID
-	 * by itself (e.g. after saving).
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getId() {
-		return $this->data['id'];
-	}
-
-	/**
-	 * sets the ID of the comment and returns itself
-	 *
-	 * It is only allowed to set the ID only, if the current id is an empty
-	 * string (which means it is not stored in a database, storage or whatever
-	 * the concrete implementation does), or vice versa. Changing a given ID is
-	 * not permitted and must result in an IllegalIDChangeException.
-	 *
-	 * @param string $id
-	 * @return IComment
-	 * @throws IllegalIDChangeException
-	 * @since 9.0.0
-	 */
-	public function setId($id) {
-		if(!is_string($id)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-
-		$id = trim($id);
-		if($this->data['id'] === '' || ($this->data['id'] !== '' && $id === '')) {
-			$this->data['id'] = $id;
-			return $this;
-		}
-
-		throw new IllegalIDChangeException('Not allowed to assign a new ID to an already saved comment.');
-	}
-
-	/**
-	 * returns the parent ID of the comment
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getParentId() {
-		return $this->data['parentId'];
-	}
-
-	/**
-	 * sets the parent ID and returns itself
-	 *
-	 * @param string $parentId
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setParentId($parentId) {
-		if(!is_string($parentId)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-		$this->data['parentId'] = trim($parentId);
-		return $this;
-	}
-
-	/**
-	 * returns the topmost parent ID of the comment
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getTopmostParentId() {
-		return $this->data['topmostParentId'];
-	}
-
-
-	/**
-	 * sets the topmost parent ID and returns itself
-	 *
-	 * @param string $id
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setTopmostParentId($id) {
-		if(!is_string($id)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-		$this->data['topmostParentId'] = trim($id);
-		return $this;
-	}
-
-	/**
-	 * returns the number of children
-	 *
-	 * @return int
-	 * @since 9.0.0
-	 */
-	public function getChildrenCount() {
-		return $this->data['childrenCount'];
-	}
-
-	/**
-	 * sets the number of children
-	 *
-	 * @param int $count
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setChildrenCount($count) {
-		if(!is_int($count)) {
-			throw new \InvalidArgumentException('Integer expected.');
-		}
-		$this->data['childrenCount'] = $count;
-		return $this;
-	}
-
-	/**
-	 * returns the message of the comment
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getMessage() {
-		return $this->data['message'];
-	}
-
-	/**
-	 * sets the message of the comment and returns itself
-	 *
-	 * @param string $message
-	 * @return IComment
-	 * @throws MessageTooLongException
-	 * @since 9.0.0
-	 */
-	public function setMessage($message) {
-		if(!is_string($message)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-		$message = trim($message);
-		if(mb_strlen($message, 'UTF-8') > IComment::MAX_MESSAGE_LENGTH) {
-			throw new MessageTooLongException('Comment message must not exceed ' . IComment::MAX_MESSAGE_LENGTH . ' characters');
-		}
-		$this->data['message'] = $message;
-		return $this;
-	}
-
-	/**
-	 * returns an array containing mentions that are included in the comment
-	 *
-	 * @return array each mention provides a 'type' and an 'id', see example below
-	 * @since 11.0.0
-	 *
-	 * The return array looks like:
-	 * [
-	 *   [
-	 *     'type' => 'user',
-	 *     'id' => 'citizen4'
-	 *   ],
-	 *   [
-	 *     'type' => 'group',
-	 *     'id' => 'media'
-	 *   ],
-	 *   …
-	 * ]
-	 *
-	 */
-	public function getMentions() {
-		$ok = preg_match_all('/\B@[a-z0-9_\-@\.\']+/i', $this->getMessage(), $mentions);
-		if(!$ok || !isset($mentions[0]) || !is_array($mentions[0])) {
-			return [];
-		}
-		$uids = array_unique($mentions[0]);
-		$result = [];
-		foreach ($uids as $uid) {
-			// exclude author, no self-mentioning
-			if($uid === '@' . $this->getActorId()) {
-				continue;
-			}
-			$result[] = ['type' => 'user', 'id' => substr($uid, 1)];
-		}
-		return $result;
-	}
-
-	/**
-	 * returns the verb of the comment
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getVerb() {
-		return $this->data['verb'];
-	}
-
-	/**
-	 * sets the verb of the comment, e.g. 'comment' or 'like'
-	 *
-	 * @param string $verb
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setVerb($verb) {
-		if(!is_string($verb) || !trim($verb)) {
-			throw new \InvalidArgumentException('Non-empty String expected.');
-		}
-		$this->data['verb'] = trim($verb);
-		return $this;
-	}
-
-	/**
-	 * returns the actor type
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getActorType() {
-		return $this->data['actorType'];
-	}
-
-	/**
-	 * returns the actor ID
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getActorId() {
-		return $this->data['actorId'];
-	}
-
-	/**
-	 * sets (overwrites) the actor type and id
-	 *
-	 * @param string $actorType e.g. 'users'
-	 * @param string $actorId e.g. 'zombie234'
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setActor($actorType, $actorId) {
-		if(
-		       !is_string($actorType) || !trim($actorType)
-		    || !is_string($actorId)   || !trim($actorId)
-		) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-		$this->data['actorType'] = trim($actorType);
-		$this->data['actorId']   = trim($actorId);
-		return $this;
-	}
-
-	/**
-	 * returns the creation date of the comment.
-	 *
-	 * If not explicitly set, it shall default to the time of initialization.
-	 *
-	 * @return \DateTime
-	 * @since 9.0.0
-	 */
-	public function getCreationDateTime() {
-		return $this->data['creationDT'];
-	}
-
-	/**
-	 * sets the creation date of the comment and returns itself
-	 *
-	 * @param \DateTime $timestamp
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setCreationDateTime(\DateTime $timestamp) {
-		$this->data['creationDT'] = $timestamp;
-		return $this;
-	}
-
-	/**
-	 * returns the DateTime of the most recent child, if set, otherwise null
-	 *
-	 * @return \DateTime|null
-	 * @since 9.0.0
-	 */
-	public function getLatestChildDateTime() {
-		return $this->data['latestChildDT'];
-	}
-
-	/**
-	 * sets the date of the most recent child
-	 *
-	 * @param \DateTime $dateTime
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setLatestChildDateTime(\DateTime $dateTime = null) {
-		$this->data['latestChildDT'] = $dateTime;
-		return $this;
-	}
-
-	/**
-	 * returns the object type the comment is attached to
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getObjectType() {
-		return $this->data['objectType'];
-	}
-
-	/**
-	 * returns the object id the comment is attached to
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getObjectId() {
-		return $this->data['objectId'];
-	}
-
-	/**
-	 * sets (overwrites) the object of the comment
-	 *
-	 * @param string $objectType e.g. 'files'
-	 * @param string $objectId e.g. '16435'
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setObject($objectType, $objectId) {
-		if(
-		       !is_string($objectType) || !trim($objectType)
-		    || !is_string($objectId)   || !trim($objectId)
-		) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-		$this->data['objectType'] = trim($objectType);
-		$this->data['objectId']   = trim($objectId);
-		return $this;
-	}
-
-	/**
-	 * sets the comment data based on an array with keys as taken from the
-	 * database.
-	 *
-	 * @param array $data
-	 * @return IComment
-	 */
-	protected function fromArray($data) {
-		foreach(array_keys($data) as $key) {
-			// translate DB keys to internal setter names
-			$setter = 'set' . implode('', array_map('ucfirst', explode('_', $key)));
-			$setter = str_replace('Timestamp', 'DateTime', $setter);
-
-			if(method_exists($this, $setter)) {
-				$this->$setter($data[$key]);
-			}
-		}
-
-		foreach(['actor', 'object'] as $role) {
-			if(isset($data[$role . '_type']) && isset($data[$role . '_id'])) {
-				$setter = 'set' . ucfirst($role);
-				$this->$setter($data[$role . '_type'], $data[$role . '_id']);
-			}
-		}
-
-		return $this;
-	}
+    protected $data = [
+        'id'              => '',
+        'parentId'        => '0',
+        'topmostParentId' => '0',
+        'childrenCount'   => '0',
+        'message'         => '',
+        'verb'            => '',
+        'actorType'       => '',
+        'actorId'         => '',
+        'objectType'      => '',
+        'objectId'        => '',
+        'creationDT'      => null,
+        'latestChildDT'   => null,
+    ];
+
+    /**
+     * Comment constructor.
+     *
+     * @param array $data	optional, array with keys according to column names from
+     * 						the comments database scheme
+     */
+    public function __construct(array $data = null) {
+        if(is_array($data)) {
+            $this->fromArray($data);
+        }
+    }
+
+    /**
+     * returns the ID of the comment
+     *
+     * It may return an empty string, if the comment was not stored.
+     * It is expected that the concrete Comment implementation gives an ID
+     * by itself (e.g. after saving).
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getId() {
+        return $this->data['id'];
+    }
+
+    /**
+     * sets the ID of the comment and returns itself
+     *
+     * It is only allowed to set the ID only, if the current id is an empty
+     * string (which means it is not stored in a database, storage or whatever
+     * the concrete implementation does), or vice versa. Changing a given ID is
+     * not permitted and must result in an IllegalIDChangeException.
+     *
+     * @param string $id
+     * @return IComment
+     * @throws IllegalIDChangeException
+     * @since 9.0.0
+     */
+    public function setId($id) {
+        if(!is_string($id)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+
+        $id = trim($id);
+        if($this->data['id'] === '' || ($this->data['id'] !== '' && $id === '')) {
+            $this->data['id'] = $id;
+            return $this;
+        }
+
+        throw new IllegalIDChangeException('Not allowed to assign a new ID to an already saved comment.');
+    }
+
+    /**
+     * returns the parent ID of the comment
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getParentId() {
+        return $this->data['parentId'];
+    }
+
+    /**
+     * sets the parent ID and returns itself
+     *
+     * @param string $parentId
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setParentId($parentId) {
+        if(!is_string($parentId)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+        $this->data['parentId'] = trim($parentId);
+        return $this;
+    }
+
+    /**
+     * returns the topmost parent ID of the comment
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getTopmostParentId() {
+        return $this->data['topmostParentId'];
+    }
+
+
+    /**
+     * sets the topmost parent ID and returns itself
+     *
+     * @param string $id
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setTopmostParentId($id) {
+        if(!is_string($id)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+        $this->data['topmostParentId'] = trim($id);
+        return $this;
+    }
+
+    /**
+     * returns the number of children
+     *
+     * @return int
+     * @since 9.0.0
+     */
+    public function getChildrenCount() {
+        return $this->data['childrenCount'];
+    }
+
+    /**
+     * sets the number of children
+     *
+     * @param int $count
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setChildrenCount($count) {
+        if(!is_int($count)) {
+            throw new \InvalidArgumentException('Integer expected.');
+        }
+        $this->data['childrenCount'] = $count;
+        return $this;
+    }
+
+    /**
+     * returns the message of the comment
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getMessage() {
+        return $this->data['message'];
+    }
+
+    /**
+     * sets the message of the comment and returns itself
+     *
+     * @param string $message
+     * @return IComment
+     * @throws MessageTooLongException
+     * @since 9.0.0
+     */
+    public function setMessage($message) {
+        if(!is_string($message)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+        $message = trim($message);
+        if(mb_strlen($message, 'UTF-8') > IComment::MAX_MESSAGE_LENGTH) {
+            throw new MessageTooLongException('Comment message must not exceed ' . IComment::MAX_MESSAGE_LENGTH . ' characters');
+        }
+        $this->data['message'] = $message;
+        return $this;
+    }
+
+    /**
+     * returns an array containing mentions that are included in the comment
+     *
+     * @return array each mention provides a 'type' and an 'id', see example below
+     * @since 11.0.0
+     *
+     * The return array looks like:
+     * [
+     *   [
+     *     'type' => 'user',
+     *     'id' => 'citizen4'
+     *   ],
+     *   [
+     *     'type' => 'group',
+     *     'id' => 'media'
+     *   ],
+     *   …
+     * ]
+     *
+     */
+    public function getMentions() {
+        $ok = preg_match_all('/\B@[a-z0-9_\-@\.\']+/i', $this->getMessage(), $mentions);
+        if(!$ok || !isset($mentions[0]) || !is_array($mentions[0])) {
+            return [];
+        }
+        $uids = array_unique($mentions[0]);
+        $result = [];
+        foreach ($uids as $uid) {
+            // exclude author, no self-mentioning
+            if($uid === '@' . $this->getActorId()) {
+                continue;
+            }
+            $result[] = ['type' => 'user', 'id' => substr($uid, 1)];
+        }
+        return $result;
+    }
+
+    /**
+     * returns the verb of the comment
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getVerb() {
+        return $this->data['verb'];
+    }
+
+    /**
+     * sets the verb of the comment, e.g. 'comment' or 'like'
+     *
+     * @param string $verb
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setVerb($verb) {
+        if(!is_string($verb) || !trim($verb)) {
+            throw new \InvalidArgumentException('Non-empty String expected.');
+        }
+        $this->data['verb'] = trim($verb);
+        return $this;
+    }
+
+    /**
+     * returns the actor type
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getActorType() {
+        return $this->data['actorType'];
+    }
+
+    /**
+     * returns the actor ID
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getActorId() {
+        return $this->data['actorId'];
+    }
+
+    /**
+     * sets (overwrites) the actor type and id
+     *
+     * @param string $actorType e.g. 'users'
+     * @param string $actorId e.g. 'zombie234'
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setActor($actorType, $actorId) {
+        if(
+                !is_string($actorType) || !trim($actorType)
+            || !is_string($actorId)   || !trim($actorId)
+        ) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+        $this->data['actorType'] = trim($actorType);
+        $this->data['actorId']   = trim($actorId);
+        return $this;
+    }
+
+    /**
+     * returns the creation date of the comment.
+     *
+     * If not explicitly set, it shall default to the time of initialization.
+     *
+     * @return \DateTime
+     * @since 9.0.0
+     */
+    public function getCreationDateTime() {
+        return $this->data['creationDT'];
+    }
+
+    /**
+     * sets the creation date of the comment and returns itself
+     *
+     * @param \DateTime $timestamp
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setCreationDateTime(\DateTime $timestamp) {
+        $this->data['creationDT'] = $timestamp;
+        return $this;
+    }
+
+    /**
+     * returns the DateTime of the most recent child, if set, otherwise null
+     *
+     * @return \DateTime|null
+     * @since 9.0.0
+     */
+    public function getLatestChildDateTime() {
+        return $this->data['latestChildDT'];
+    }
+
+    /**
+     * sets the date of the most recent child
+     *
+     * @param \DateTime $dateTime
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setLatestChildDateTime(\DateTime $dateTime = null) {
+        $this->data['latestChildDT'] = $dateTime;
+        return $this;
+    }
+
+    /**
+     * returns the object type the comment is attached to
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getObjectType() {
+        return $this->data['objectType'];
+    }
+
+    /**
+     * returns the object id the comment is attached to
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getObjectId() {
+        return $this->data['objectId'];
+    }
+
+    /**
+     * sets (overwrites) the object of the comment
+     *
+     * @param string $objectType e.g. 'files'
+     * @param string $objectId e.g. '16435'
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setObject($objectType, $objectId) {
+        if(
+                !is_string($objectType) || !trim($objectType)
+            || !is_string($objectId)   || !trim($objectId)
+        ) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+        $this->data['objectType'] = trim($objectType);
+        $this->data['objectId']   = trim($objectId);
+        return $this;
+    }
+
+    /**
+     * sets the comment data based on an array with keys as taken from the
+     * database.
+     *
+     * @param array $data
+     * @return IComment
+     */
+    protected function fromArray($data) {
+        foreach(array_keys($data) as $key) {
+            // translate DB keys to internal setter names
+            $setter = 'set' . implode('', array_map('ucfirst', explode('_', $key)));
+            $setter = str_replace('Timestamp', 'DateTime', $setter);
+
+            if(method_exists($this, $setter)) {
+                $this->$setter($data[$key]);
+            }
+        }
+
+        foreach(['actor', 'object'] as $role) {
+            if(isset($data[$role . '_type']) && isset($data[$role . '_id'])) {
+                $setter = 'set' . ucfirst($role);
+                $this->$setter($data[$role . '_type'], $data[$role . '_id']);
+            }
+        }
+
+        return $this;
+    }
 }