nextcloud / server

core/Command/Base.php

Spacing +5 added lines, -5 removed lines

@@ -73,19 +73,19 @@
 			default:
 				foreach ($items as $key => $item) {
 					if (is_array($item)) {
-						$output->writeln($prefix . $key . ':');
-						$this->writeArrayInOutputFormat($input, $output, $item, '  ' . $prefix);
+						$output->writeln($prefix.$key.':');
+						$this->writeArrayInOutputFormat($input, $output, $item, '  '.$prefix);
 						continue;
 					}
 					if (!is_int($key) || ListCommand::class === get_class($this)) {
 						$value = $this->valueToString($item);
 						if (!is_null($value)) {
-							$output->writeln($prefix . $key . ': ' . $value);
+							$output->writeln($prefix.$key.': '.$value);
 						} else {
-							$output->writeln($prefix . $key);
+							$output->writeln($prefix.$key);
 						}
 					} else {
-						$output->writeln($prefix . $this->valueToString($item));
+						$output->writeln($prefix.$this->valueToString($item));
 					}
 				}
 				break;

Indentation +154 added lines, -154 removed lines

@@ -34,158 +34,158 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Base extends Command implements CompletionAwareInterface {
-	public const OUTPUT_FORMAT_PLAIN = 'plain';
-	public const OUTPUT_FORMAT_JSON = 'json';
-	public const OUTPUT_FORMAT_JSON_PRETTY = 'json_pretty';
-
-	protected $defaultOutputFormat = self::OUTPUT_FORMAT_PLAIN;
-
-	/** @var boolean */
-	private $php_pcntl_signal = false;
-
-	/** @var boolean */
-	private $interrupted = false;
-
-	protected function configure() {
-		$this
-			->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			)
-		;
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @param array $items
-	 * @param string $prefix
-	 */
-	protected function writeArrayInOutputFormat(InputInterface $input, OutputInterface $output, $items, $prefix = '  - ') {
-		switch ($input->getOption('output')) {
-			case self::OUTPUT_FORMAT_JSON:
-				$output->writeln(json_encode($items));
-				break;
-			case self::OUTPUT_FORMAT_JSON_PRETTY:
-				$output->writeln(json_encode($items, JSON_PRETTY_PRINT));
-				break;
-			default:
-				foreach ($items as $key => $item) {
-					if (is_array($item)) {
-						$output->writeln($prefix . $key . ':');
-						$this->writeArrayInOutputFormat($input, $output, $item, '  ' . $prefix);
-						continue;
-					}
-					if (!is_int($key) || ListCommand::class === get_class($this)) {
-						$value = $this->valueToString($item);
-						if (!is_null($value)) {
-							$output->writeln($prefix . $key . ': ' . $value);
-						} else {
-							$output->writeln($prefix . $key);
-						}
-					} else {
-						$output->writeln($prefix . $this->valueToString($item));
-					}
-				}
-				break;
-		}
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @param mixed $item
-	 */
-	protected function writeMixedInOutputFormat(InputInterface $input, OutputInterface $output, $item) {
-		if (is_array($item)) {
-			$this->writeArrayInOutputFormat($input, $output, $item, '');
-			return;
-		}
-
-		switch ($input->getOption('output')) {
-			case self::OUTPUT_FORMAT_JSON:
-				$output->writeln(json_encode($item));
-				break;
-			case self::OUTPUT_FORMAT_JSON_PRETTY:
-				$output->writeln(json_encode($item, JSON_PRETTY_PRINT));
-				break;
-			default:
-				$output->writeln($this->valueToString($item, false));
-				break;
-		}
-	}
-
-	protected function valueToString($value, $returnNull = true) {
-		if ($value === false) {
-			return 'false';
-		} elseif ($value === true) {
-			return 'true';
-		} elseif ($value === null) {
-			return $returnNull ? null : 'null';
-		} else {
-			return $value;
-		}
-	}
-
-	/**
-	 * Throw InterruptedException when interrupted by user
-	 *
-	 * @throws InterruptedException
-	 */
-	protected function abortIfInterrupted() {
-		if ($this->php_pcntl_signal === false) {
-			return;
-		}
-
-		pcntl_signal_dispatch();
-
-		if ($this->interrupted === true) {
-			throw new InterruptedException('Command interrupted by user');
-		}
-	}
-
-	/**
-	 * Changes the status of the command to "interrupted" if ctrl-c has been pressed
-	 *
-	 * Gives a chance to the command to properly terminate what it's doing
-	 */
-	protected function cancelOperation() {
-		$this->interrupted = true;
-	}
-
-	public function run(InputInterface $input, OutputInterface $output) {
-		// check if the php pcntl_signal functions are accessible
-		$this->php_pcntl_signal = function_exists('pcntl_signal');
-		if ($this->php_pcntl_signal) {
-			// Collect interrupts and notify the running command
-			pcntl_signal(SIGTERM, [$this, 'cancelOperation']);
-			pcntl_signal(SIGINT, [$this, 'cancelOperation']);
-		}
-
-		return parent::run($input, $output);
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'output') {
-			return ['plain', 'json', 'json_pretty'];
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		return [];
-	}
+    public const OUTPUT_FORMAT_PLAIN = 'plain';
+    public const OUTPUT_FORMAT_JSON = 'json';
+    public const OUTPUT_FORMAT_JSON_PRETTY = 'json_pretty';
+
+    protected $defaultOutputFormat = self::OUTPUT_FORMAT_PLAIN;
+
+    /** @var boolean */
+    private $php_pcntl_signal = false;
+
+    /** @var boolean */
+    private $interrupted = false;
+
+    protected function configure() {
+        $this
+            ->addOption(
+                'output',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Output format (plain, json or json_pretty, default is plain)',
+                $this->defaultOutputFormat
+            )
+        ;
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param array $items
+     * @param string $prefix
+     */
+    protected function writeArrayInOutputFormat(InputInterface $input, OutputInterface $output, $items, $prefix = '  - ') {
+        switch ($input->getOption('output')) {
+            case self::OUTPUT_FORMAT_JSON:
+                $output->writeln(json_encode($items));
+                break;
+            case self::OUTPUT_FORMAT_JSON_PRETTY:
+                $output->writeln(json_encode($items, JSON_PRETTY_PRINT));
+                break;
+            default:
+                foreach ($items as $key => $item) {
+                    if (is_array($item)) {
+                        $output->writeln($prefix . $key . ':');
+                        $this->writeArrayInOutputFormat($input, $output, $item, '  ' . $prefix);
+                        continue;
+                    }
+                    if (!is_int($key) || ListCommand::class === get_class($this)) {
+                        $value = $this->valueToString($item);
+                        if (!is_null($value)) {
+                            $output->writeln($prefix . $key . ': ' . $value);
+                        } else {
+                            $output->writeln($prefix . $key);
+                        }
+                    } else {
+                        $output->writeln($prefix . $this->valueToString($item));
+                    }
+                }
+                break;
+        }
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param mixed $item
+     */
+    protected function writeMixedInOutputFormat(InputInterface $input, OutputInterface $output, $item) {
+        if (is_array($item)) {
+            $this->writeArrayInOutputFormat($input, $output, $item, '');
+            return;
+        }
+
+        switch ($input->getOption('output')) {
+            case self::OUTPUT_FORMAT_JSON:
+                $output->writeln(json_encode($item));
+                break;
+            case self::OUTPUT_FORMAT_JSON_PRETTY:
+                $output->writeln(json_encode($item, JSON_PRETTY_PRINT));
+                break;
+            default:
+                $output->writeln($this->valueToString($item, false));
+                break;
+        }
+    }
+
+    protected function valueToString($value, $returnNull = true) {
+        if ($value === false) {
+            return 'false';
+        } elseif ($value === true) {
+            return 'true';
+        } elseif ($value === null) {
+            return $returnNull ? null : 'null';
+        } else {
+            return $value;
+        }
+    }
+
+    /**
+     * Throw InterruptedException when interrupted by user
+     *
+     * @throws InterruptedException
+     */
+    protected function abortIfInterrupted() {
+        if ($this->php_pcntl_signal === false) {
+            return;
+        }
+
+        pcntl_signal_dispatch();
+
+        if ($this->interrupted === true) {
+            throw new InterruptedException('Command interrupted by user');
+        }
+    }
+
+    /**
+     * Changes the status of the command to "interrupted" if ctrl-c has been pressed
+     *
+     * Gives a chance to the command to properly terminate what it's doing
+     */
+    protected function cancelOperation() {
+        $this->interrupted = true;
+    }
+
+    public function run(InputInterface $input, OutputInterface $output) {
+        // check if the php pcntl_signal functions are accessible
+        $this->php_pcntl_signal = function_exists('pcntl_signal');
+        if ($this->php_pcntl_signal) {
+            // Collect interrupts and notify the running command
+            pcntl_signal(SIGTERM, [$this, 'cancelOperation']);
+            pcntl_signal(SIGINT, [$this, 'cancelOperation']);
+        }
+
+        return parent::run($input, $output);
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'output') {
+            return ['plain', 'json', 'json_pretty'];
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        return [];
+    }
 }

lib/public/AppFramework/Http/StrictEvalContentSecurityPolicy.php

Indentation +6 added lines, -6 removed lines

@@ -42,10 +42,10 @@
  */
 class StrictEvalContentSecurityPolicy extends ContentSecurityPolicy {
 
-	/**
-	 * @since 14.0.0
-	 */
-	public function __construct() {
-		$this->evalScriptAllowed = false;
-	}
+    /**
+     * @since 14.0.0
+     */
+    public function __construct() {
+        $this->evalScriptAllowed = false;
+    }
 }

apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php

Indentation +20 added lines, -20 removed lines

@@ -30,24 +30,24 @@
 
 class CleanupInvitationTokenJob extends TimedJob {
 
-	/** @var IDBConnection  */
-	private $db;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
-		$this->db = $db;
-		$this->timeFactory = $timeFactory;
-
-		$this->setInterval(60 * 60 * 24);
-	}
-
-	public function run($argument) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('calendar_invitations')
-			->where($query->expr()->lt('expiration',
-				$query->createNamedParameter($this->timeFactory->getTime())))
-			->execute();
-	}
+    /** @var IDBConnection  */
+    private $db;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
+        $this->db = $db;
+        $this->timeFactory = $timeFactory;
+
+        $this->setInterval(60 * 60 * 24);
+    }
+
+    public function run($argument) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('calendar_invitations')
+            ->where($query->expr()->lt('expiration',
+                $query->createNamedParameter($this->timeFactory->getTime())))
+            ->execute();
+    }
 }

lib/public/L10N/ILanguageIterator.php

Indentation +24 added lines, -24 removed lines

@@ -44,31 +44,31 @@
  */
 interface ILanguageIterator extends \Iterator {
 
-	/**
-	 * Return the current element
-	 *
-	 * @since 14.0.0
-	 */
-	public function current(): string;
+    /**
+     * Return the current element
+     *
+     * @since 14.0.0
+     */
+    public function current(): string;
 
-	/**
-	 * Move forward to next element
-	 *
-	 * @since 14.0.0
-	 */
-	public function next();
+    /**
+     * Move forward to next element
+     *
+     * @since 14.0.0
+     */
+    public function next();
 
-	/**
-	 * Return the key of the current element
-	 *
-	 * @since 14.0.0
-	 */
-	public function key():int;
+    /**
+     * Return the key of the current element
+     *
+     * @since 14.0.0
+     */
+    public function key():int;
 
-	/**
-	 * Checks if current position is valid
-	 *
-	 * @since 14.0.0
-	 */
-	public function valid():bool;
+    /**
+     * Checks if current position is valid
+     *
+     * @since 14.0.0
+     */
+    public function valid():bool;
 }

apps/files/lib/Activity/Filter/FileChanges.php

Indentation +60 added lines, -60 removed lines

@@ -30,72 +30,72 @@
 
 class FileChanges implements IFilter {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	/**
-	 * @param IL10N $l
-	 * @param IURLGenerator $url
-	 */
-	public function __construct(IL10N $l, IURLGenerator $url) {
-		$this->l = $l;
-		$this->url = $url;
-	}
+    /**
+     * @param IL10N $l
+     * @param IURLGenerator $url
+     */
+    public function __construct(IL10N $l, IURLGenerator $url) {
+        $this->l = $l;
+        $this->url = $url;
+    }
 
-	/**
-	 * @return string Lowercase a-z only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'files';
-	}
+    /**
+     * @return string Lowercase a-z only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'files';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('File changes');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('File changes');
+    }
 
-	/**
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 30;
-	}
+    /**
+     * @return int
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 30;
+    }
 
-	/**
-	 * @return string Full URL to an icon, empty string when none is given
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/files.svg'));
-	}
+    /**
+     * @return string Full URL to an icon, empty string when none is given
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/files.svg'));
+    }
 
-	/**
-	 * @param string[] $types
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function filterTypes(array $types) {
-		return array_intersect([
-			'file_created',
-			'file_changed',
-			'file_deleted',
-			'file_restored',
-		], $types);
-	}
+    /**
+     * @param string[] $types
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function filterTypes(array $types) {
+        return array_intersect([
+            'file_created',
+            'file_changed',
+            'file_deleted',
+            'file_restored',
+        ], $types);
+    }
 
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return ['files'];
-	}
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return ['files'];
+    }
 }

apps/dav/lib/CalDAV/Activity/Filter/Calendar.php

Indentation +53 added lines, -53 removed lines

@@ -30,65 +30,65 @@
 
 class Calendar implements IFilter {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	public function __construct(IL10N $l, IURLGenerator $url) {
-		$this->l = $l;
-		$this->url = $url;
-	}
+    public function __construct(IL10N $l, IURLGenerator $url) {
+        $this->l = $l;
+        $this->url = $url;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'calendar';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'calendar';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('Calendar');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('Calendar');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 40;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 40;
+    }
 
-	/**
-	 * @return string Full URL to an icon, empty string when none is given
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg'));
-	}
+    /**
+     * @return string Full URL to an icon, empty string when none is given
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg'));
+    }
 
-	/**
-	 * @param string[] $types
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function filterTypes(array $types) {
-		return array_intersect(['calendar', 'calendar_event'], $types);
-	}
+    /**
+     * @param string[] $types
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function filterTypes(array $types) {
+        return array_intersect(['calendar', 'calendar_event'], $types);
+    }
 
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return [];
-	}
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return [];
+    }
 }

core/Migrations/Version14000Date20180712153140.php

Indentation +7 added lines, -7 removed lines

@@ -30,14 +30,14 @@
  * Class Version14000Date20180712153140
  */
 class Version14000Date20180712153140 extends SimpleMigrationStep {
-	public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
+    public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
 
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('share');
-		$table->addColumn('note', 'text', ['notnull' => false]);
+        $table = $schema->getTable('share');
+        $table->addColumn('note', 'text', ['notnull' => false]);
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/Controller/NavigationController.php

Indentation +82 added lines, -82 removed lines

@@ -31,92 +31,92 @@
 
 class NavigationController extends OCSController {
 
-	/** @var INavigationManager */
-	private $navigationManager;
+    /** @var INavigationManager */
+    private $navigationManager;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(string $appName, IRequest $request, INavigationManager $navigationManager, IURLGenerator $urlGenerator) {
-		parent::__construct($appName, $request);
-		$this->navigationManager = $navigationManager;
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(string $appName, IRequest $request, INavigationManager $navigationManager, IURLGenerator $urlGenerator) {
+        parent::__construct($appName, $request);
+        $this->navigationManager = $navigationManager;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param bool $absolute
-	 * @return DataResponse
-	 */
-	public function getAppsNavigation(bool $absolute = false): DataResponse {
-		$navigation = $this->navigationManager->getAll();
-		if ($absolute) {
-			$navigation = $this->rewriteToAbsoluteUrls($navigation);
-		}
-		$navigation = array_values($navigation);
-		$etag = $this->generateETag($navigation);
-		if ($this->request->getHeader('If-None-Match') === $etag) {
-			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
-		}
-		$response = new DataResponse($navigation);
-		$response->setETag($etag);
-		return $response;
-	}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param bool $absolute
+     * @return DataResponse
+     */
+    public function getAppsNavigation(bool $absolute = false): DataResponse {
+        $navigation = $this->navigationManager->getAll();
+        if ($absolute) {
+            $navigation = $this->rewriteToAbsoluteUrls($navigation);
+        }
+        $navigation = array_values($navigation);
+        $etag = $this->generateETag($navigation);
+        if ($this->request->getHeader('If-None-Match') === $etag) {
+            return new DataResponse([], Http::STATUS_NOT_MODIFIED);
+        }
+        $response = new DataResponse($navigation);
+        $response->setETag($etag);
+        return $response;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param bool $absolute
-	 * @return DataResponse
-	 */
-	public function getSettingsNavigation(bool $absolute = false): DataResponse {
-		$navigation = $this->navigationManager->getAll('settings');
-		if ($absolute) {
-			$navigation = $this->rewriteToAbsoluteUrls($navigation);
-		}
-		$navigation = array_values($navigation);
-		$etag = $this->generateETag($navigation);
-		if ($this->request->getHeader('If-None-Match') === $etag) {
-			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
-		}
-		$response = new DataResponse($navigation);
-		$response->setETag($etag);
-		return $response;
-	}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param bool $absolute
+     * @return DataResponse
+     */
+    public function getSettingsNavigation(bool $absolute = false): DataResponse {
+        $navigation = $this->navigationManager->getAll('settings');
+        if ($absolute) {
+            $navigation = $this->rewriteToAbsoluteUrls($navigation);
+        }
+        $navigation = array_values($navigation);
+        $etag = $this->generateETag($navigation);
+        if ($this->request->getHeader('If-None-Match') === $etag) {
+            return new DataResponse([], Http::STATUS_NOT_MODIFIED);
+        }
+        $response = new DataResponse($navigation);
+        $response->setETag($etag);
+        return $response;
+    }
 
-	/**
-	 * Generate an ETag for a list of navigation entries
-	 *
-	 * @param array $navigation
-	 * @return string
-	 */
-	private function generateETag(array $navigation): string {
-		foreach ($navigation as &$nav) {
-			if ($nav['id'] === 'logout') {
-				$nav['href'] = 'logout';
-			}
-		}
-		return md5(json_encode($navigation));
-	}
+    /**
+     * Generate an ETag for a list of navigation entries
+     *
+     * @param array $navigation
+     * @return string
+     */
+    private function generateETag(array $navigation): string {
+        foreach ($navigation as &$nav) {
+            if ($nav['id'] === 'logout') {
+                $nav['href'] = 'logout';
+            }
+        }
+        return md5(json_encode($navigation));
+    }
 
-	/**
-	 * Rewrite href attribute of navigation entries to an absolute URL
-	 *
-	 * @param array $navigation
-	 * @return array
-	 */
-	private function rewriteToAbsoluteUrls(array $navigation): array {
-		foreach ($navigation as &$entry) {
-			if (0 !== strpos($entry['href'], $this->urlGenerator->getBaseUrl())) {
-				$entry['href'] = $this->urlGenerator->getAbsoluteURL($entry['href']);
-			}
-			if (0 !== strpos($entry['icon'], $this->urlGenerator->getBaseUrl())) {
-				$entry['icon'] = $this->urlGenerator->getAbsoluteURL($entry['icon']);
-			}
-		}
-		return $navigation;
-	}
+    /**
+     * Rewrite href attribute of navigation entries to an absolute URL
+     *
+     * @param array $navigation
+     * @return array
+     */
+    private function rewriteToAbsoluteUrls(array $navigation): array {
+        foreach ($navigation as &$entry) {
+            if (0 !== strpos($entry['href'], $this->urlGenerator->getBaseUrl())) {
+                $entry['href'] = $this->urlGenerator->getAbsoluteURL($entry['href']);
+            }
+            if (0 !== strpos($entry['icon'], $this->urlGenerator->getBaseUrl())) {
+                $entry['icon'] = $this->urlGenerator->getAbsoluteURL($entry['icon']);
+            }
+        }
+        return $navigation;
+    }
 }

lib/public/IAvatar.php

Indentation +56 added lines, -56 removed lines

@@ -37,67 +37,67 @@
  */
 interface IAvatar {
 
-	/**
-	 * get the users avatar
-	 * @param int $size size in px of the avatar, avatars are square, defaults to 64, -1 can be used to not scale the image
-	 * @return boolean|\OCP\IImage containing the avatar or false if there's no image
-	 * @since 6.0.0 - size of -1 was added in 9.0.0
-	 */
-	public function get($size = 64);
+    /**
+     * get the users avatar
+     * @param int $size size in px of the avatar, avatars are square, defaults to 64, -1 can be used to not scale the image
+     * @return boolean|\OCP\IImage containing the avatar or false if there's no image
+     * @since 6.0.0 - size of -1 was added in 9.0.0
+     */
+    public function get($size = 64);
 
-	/**
-	 * Check if an avatar exists for the user
-	 *
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function exists();
+    /**
+     * Check if an avatar exists for the user
+     *
+     * @return bool
+     * @since 8.1.0
+     */
+    public function exists();
 
-	/**
-	 * Check if the avatar of a user is a custom uploaded one
-	 *
-	 * @return bool
-	 * @since 14.0.0
-	 */
-	public function isCustomAvatar(): bool;
+    /**
+     * Check if the avatar of a user is a custom uploaded one
+     *
+     * @return bool
+     * @since 14.0.0
+     */
+    public function isCustomAvatar(): bool;
 
-	/**
-	 * sets the users avatar
-	 * @param \OCP\IImage|resource|string $data An image object, imagedata or path to set a new avatar
-	 * @throws \Exception if the provided file is not a jpg or png image
-	 * @throws \Exception if the provided image is not valid
-	 * @throws \OC\NotSquareException if the image is not square
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function set($data);
+    /**
+     * sets the users avatar
+     * @param \OCP\IImage|resource|string $data An image object, imagedata or path to set a new avatar
+     * @throws \Exception if the provided file is not a jpg or png image
+     * @throws \Exception if the provided image is not valid
+     * @throws \OC\NotSquareException if the image is not square
+     * @return void
+     * @since 6.0.0
+     */
+    public function set($data);
 
-	/**
-	 * remove the users avatar
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function remove();
+    /**
+     * remove the users avatar
+     * @return void
+     * @since 6.0.0
+     */
+    public function remove();
 
-	/**
-	 * Get the file of the avatar
-	 * @param int $size -1 can be used to not scale the image
-	 * @return File
-	 * @throws NotFoundException
-	 * @since 9.0.0
-	 */
-	public function getFile($size);
+    /**
+     * Get the file of the avatar
+     * @param int $size -1 can be used to not scale the image
+     * @return File
+     * @throws NotFoundException
+     * @since 9.0.0
+     */
+    public function getFile($size);
 
-	/**
-	 * @param string $text
-	 * @return Color Object containting r g b int in the range [0, 255]
-	 * @since 14.0.0
-	 */
-	public function avatarBackgroundColor(string $text);
+    /**
+     * @param string $text
+     * @return Color Object containting r g b int in the range [0, 255]
+     * @since 14.0.0
+     */
+    public function avatarBackgroundColor(string $text);
 
-	/**
-	 * Handle a changed user
-	 * @since 13.0.0
-	 */
-	public function userChanged($feature, $oldValue, $newValue);
+    /**
+     * Handle a changed user
+     * @since 13.0.0
+     */
+    public function userChanged($feature, $oldValue, $newValue);
 }