nextcloud / server

lib/private/FullTextSearch/Model/SearchTemplate.php

Indentation +191 added lines, -191 removed lines

@@ -65,196 +65,196 @@
 final class SearchTemplate implements ISearchTemplate, JsonSerializable {
 
 
-	/** @var string */
-	private $icon = '';
-
-	/** @var string */
-	private $css = '';
-
-	/** @var string */
-	private $template = '';
-
-	/** @var SearchOption[] */
-	private $panelOptions = [];
-
-	/** @var SearchOption[] */
-	private $navigationOptions = [];
-
-
-	/**
-	 * ISearchTemplate constructor.
-	 *
-	 * the class of the icon and the css file to be loaded can be set during the
-	 * creation of the object.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $icon
-	 * @param string $css
-	 */
-	public function __construct(string $icon = '', string $css = '') {
-		$this->icon = $icon;
-		$this->css = $css;
-	}
-
-
-	/**
-	 * Set the class of the icon to be displayed in the left panel of the
-	 * FullTextSearch navigation page, in front of the related Content Provider.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $class
-	 *
-	 * @return ISearchTemplate
-	 */
-	public function setIcon(string $class): ISearchTemplate {
-		$this->icon = $class;
-
-		return $this;
-	}
-
-	/**
-	 * Get the class of the icon.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getIcon(): string {
-		return $this->icon;
-	}
-
-
-	/**
-	 * Set the path of a CSS file that will be loaded when needed.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $css
-	 *
-	 * @return ISearchTemplate
-	 */
-	public function setCss(string $css): ISearchTemplate {
-		$this->css = $css;
-
-		return $this;
-	}
-
-	/**
-	 * Get the path of the CSS file.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getCss(): string {
-		return $this->css;
-	}
-
-
-	/**
-	 * Set the path of the file of a template that the HTML will be displayed
-	 * below the Options.
-	 * This should only be used if your Content Provider needs to set options in
-	 * a way not generated by FullTextSearch
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $template
-	 *
-	 * @return ISearchTemplate
-	 */
-	public function setTemplate(string $template): ISearchTemplate {
-		$this->template = $template;
-
-		return $this;
-	}
-
-	/**
-	 * Get the path of the template file.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getTemplate(): string {
-		return $this->template;
-	}
-
-
-	/**
-	 * Add an option in the Panel that is displayed when the user start a search
-	 * within the app that generate the content.
-	 *
-	 * @see ISearchOption
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param ISearchOption $option
-	 *
-	 * @return ISearchTemplate
-	 */
-	public function addPanelOption(ISearchOption $option): ISearchTemplate {
-		$this->panelOptions[] = $option;
-
-		return $this;
-	}
-
-	/**
-	 * Get all options to be displayed in the Panel.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return SearchOption[]
-	 */
-	public function getPanelOptions(): array {
-		return $this->panelOptions;
-	}
-
-
-	/**
-	 * Add an option in the left panel of the FullTextSearch navigation page.
-	 *
-	 * @see ISearchOption
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param ISearchOption $option
-	 *
-	 * @return ISearchTemplate
-	 */
-	public function addNavigationOption(ISearchOption $option): ISearchTemplate {
-		$this->navigationOptions[] = $option;
-
-		return $this;
-	}
-
-	/**
-	 * Get all options to be displayed in the FullTextSearch navigation page.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return array
-	 */
-	public function getNavigationOptions(): array {
-		return $this->navigationOptions;
-	}
-
-
-	/**
-	 * @since 15.0.0
-	 *
-	 * @return array
-	 */
-	public function jsonSerialize(): array {
-		return [
-			'icon' => $this->getIcon(),
-			'css' => $this->getCss(),
-			'template' => $this->getTemplate(),
-			'panel' => $this->getPanelOptions(),
-			'navigation' => $this->getNavigationOptions()
-		];
-	}
+    /** @var string */
+    private $icon = '';
+
+    /** @var string */
+    private $css = '';
+
+    /** @var string */
+    private $template = '';
+
+    /** @var SearchOption[] */
+    private $panelOptions = [];
+
+    /** @var SearchOption[] */
+    private $navigationOptions = [];
+
+
+    /**
+     * ISearchTemplate constructor.
+     *
+     * the class of the icon and the css file to be loaded can be set during the
+     * creation of the object.
+     *
+     * @since 15.0.0
+     *
+     * @param string $icon
+     * @param string $css
+     */
+    public function __construct(string $icon = '', string $css = '') {
+        $this->icon = $icon;
+        $this->css = $css;
+    }
+
+
+    /**
+     * Set the class of the icon to be displayed in the left panel of the
+     * FullTextSearch navigation page, in front of the related Content Provider.
+     *
+     * @since 15.0.0
+     *
+     * @param string $class
+     *
+     * @return ISearchTemplate
+     */
+    public function setIcon(string $class): ISearchTemplate {
+        $this->icon = $class;
+
+        return $this;
+    }
+
+    /**
+     * Get the class of the icon.
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getIcon(): string {
+        return $this->icon;
+    }
+
+
+    /**
+     * Set the path of a CSS file that will be loaded when needed.
+     *
+     * @since 15.0.0
+     *
+     * @param string $css
+     *
+     * @return ISearchTemplate
+     */
+    public function setCss(string $css): ISearchTemplate {
+        $this->css = $css;
+
+        return $this;
+    }
+
+    /**
+     * Get the path of the CSS file.
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getCss(): string {
+        return $this->css;
+    }
+
+
+    /**
+     * Set the path of the file of a template that the HTML will be displayed
+     * below the Options.
+     * This should only be used if your Content Provider needs to set options in
+     * a way not generated by FullTextSearch
+     *
+     * @since 15.0.0
+     *
+     * @param string $template
+     *
+     * @return ISearchTemplate
+     */
+    public function setTemplate(string $template): ISearchTemplate {
+        $this->template = $template;
+
+        return $this;
+    }
+
+    /**
+     * Get the path of the template file.
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getTemplate(): string {
+        return $this->template;
+    }
+
+
+    /**
+     * Add an option in the Panel that is displayed when the user start a search
+     * within the app that generate the content.
+     *
+     * @see ISearchOption
+     *
+     * @since 15.0.0
+     *
+     * @param ISearchOption $option
+     *
+     * @return ISearchTemplate
+     */
+    public function addPanelOption(ISearchOption $option): ISearchTemplate {
+        $this->panelOptions[] = $option;
+
+        return $this;
+    }
+
+    /**
+     * Get all options to be displayed in the Panel.
+     *
+     * @since 15.0.0
+     *
+     * @return SearchOption[]
+     */
+    public function getPanelOptions(): array {
+        return $this->panelOptions;
+    }
+
+
+    /**
+     * Add an option in the left panel of the FullTextSearch navigation page.
+     *
+     * @see ISearchOption
+     *
+     * @since 15.0.0
+     *
+     * @param ISearchOption $option
+     *
+     * @return ISearchTemplate
+     */
+    public function addNavigationOption(ISearchOption $option): ISearchTemplate {
+        $this->navigationOptions[] = $option;
+
+        return $this;
+    }
+
+    /**
+     * Get all options to be displayed in the FullTextSearch navigation page.
+     *
+     * @since 15.0.0
+     *
+     * @return array
+     */
+    public function getNavigationOptions(): array {
+        return $this->navigationOptions;
+    }
+
+
+    /**
+     * @since 15.0.0
+     *
+     * @return array
+     */
+    public function jsonSerialize(): array {
+        return [
+            'icon' => $this->getIcon(),
+            'css' => $this->getCss(),
+            'template' => $this->getTemplate(),
+            'panel' => $this->getPanelOptions(),
+            'navigation' => $this->getNavigationOptions()
+        ];
+    }
 }
 

lib/private/FullTextSearch/Model/DocumentAccess.php

Indentation +303 added lines, -303 removed lines

@@ -58,308 +58,308 @@
 final class DocumentAccess implements IDocumentAccess, JsonSerializable {
 
 
-	/** @var string */
-	private $ownerId;
-
-	/** @var string */
-	private $viewerId = '';
-
-	/** @var array */
-	private $users = [];
-
-	/** @var array */
-	private $groups = [];
-
-	/** @var array */
-	private $circles = [];
-
-	/** @var array */
-	private $links = [];
-
-
-	/**
-	 * Owner of the document can be set at the init of the object.
-	 *
-	 * @since 16.0.0
-	 *
-	 * IDocumentAccess constructor.
-	 *
-	 * @param string $ownerId
-	 */
-	public function __construct(string $ownerId = '') {
-		$this->setOwnerId($ownerId);
-	}
-
-
-	/**
-	 * Set the Owner of the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $ownerId
-	 *
-	 * @return IDocumentAccess
-	 */
-	public function setOwnerId(string $ownerId): IDocumentAccess {
-		$this->ownerId = $ownerId;
-
-		return $this;
-	}
-
-	/**
-	 * Get the Owner of the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return string
-	 */
-	public function getOwnerId(): string {
-		return $this->ownerId;
-	}
-
-
-	/**
-	 * Set the viewer of the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $viewerId
-	 *
-	 * @return IDocumentAccess
-	 */
-	public function setViewerId(string $viewerId): IDocumentAccess {
-		$this->viewerId = $viewerId;
-
-		return $this;
-	}
-
-	/**
-	 * Get the viewer of the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return string
-	 */
-	public function getViewerId(): string {
-		return $this->viewerId;
-	}
-
-
-	/**
-	 * Set the list of users that have read access to the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param array $users
-	 *
-	 * @return IDocumentAccess
-	 */
-	public function setUsers(array $users): IDocumentAccess {
-		$this->users = $users;
-
-		return $this;
-	}
-
-	/**
-	 * Add an entry to the list of users that have read access to the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $user
-	 *
-	 * @return IDocumentAccess
-	 */
-	public function addUser(string $user): IDocumentAccess {
-		$this->users[] = $user;
-
-		return $this;
-	}
-
-	/**
-	 * Add multiple entries to the list of users that have read access to the
-	 * document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param array $users
-	 *
-	 * @return IDocumentAccess
-	 */
-	public function addUsers($users): IDocumentAccess {
-		$this->users = array_merge($this->users, $users);
-
-		return $this;
-	}
-
-	/**
-	 * Get the complete list of users that have read access to the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return array
-	 */
-	public function getUsers(): array {
-		return $this->users;
-	}
-
-
-	/**
-	 * Set the list of groups that have read access to the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param array $groups
-	 *
-	 * @return IDocumentAccess
-	 */
-	public function setGroups(array $groups): IDocumentAccess {
-		$this->groups = $groups;
-
-		return $this;
-	}
-
-	/**
-	 * Add an entry to the list of groups that have read access to the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $group
-	 *
-	 * @return IDocumentAccess
-	 */
-	public function addGroup(string $group): IDocumentAccess {
-		$this->groups[] = $group;
-
-		return $this;
-	}
-
-	/**
-	 * Add multiple entries to the list of groups that have read access to the
-	 * document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param array $groups
-	 *
-	 * @return IDocumentAccess
-	 */
-	public function addGroups(array $groups) {
-		$this->groups = array_merge($this->groups, $groups);
-
-		return $this;
-	}
-
-	/**
-	 * Get the complete list of groups that have read access to the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return array
-	 */
-	public function getGroups(): array {
-		return $this->groups;
-	}
-
-
-	/**
-	 * Set the list of circles that have read access to the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param array $circles
-	 *
-	 * @return IDocumentAccess
-	 */
-	public function setCircles(array $circles): IDocumentAccess {
-		$this->circles = $circles;
-
-		return $this;
-	}
-
-	/**
-	 * Add an entry to the list of circles that have read access to the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $circle
-	 *
-	 * @return IDocumentAccess
-	 */
-	public function addCircle(string $circle): IDocumentAccess {
-		$this->circles[] = $circle;
-
-		return $this;
-	}
-
-	/**
-	 * Add multiple entries to the list of groups that have read access to the
-	 * document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param array $circles
-	 *
-	 * @return IDocumentAccess
-	 */
-	public function addCircles(array $circles): IDocumentAccess {
-		$this->circles = array_merge($this->circles, $circles);
-
-		return $this;
-	}
-
-	/**
-	 * Get the complete list of circles that have read access to the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return array
-	 */
-	public function getCircles(): array {
-		return $this->circles;
-	}
-
-
-	/**
-	 * Set the list of links that have read access to the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param array $links
-	 *
-	 * @return IDocumentAccess
-	 */
-	public function setLinks(array $links): IDocumentAccess {
-		$this->links = $links;
-
-		return $this;
-	}
-
-	/**
-	 * Get the list of links that have read access to the document.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return array
-	 */
-	public function getLinks(): array {
-		return $this->links;
-	}
-
-
-	/**
-	 * @since 16.0.0
-	 *
-	 * @return array
-	 */
-	public function jsonSerialize(): array {
-		return [
-			'ownerId' => $this->getOwnerId(),
-			'viewerId' => $this->getViewerId(),
-			'users' => $this->getUsers(),
-			'groups' => $this->getGroups(),
-			'circles' => $this->getCircles(),
-			'links' => $this->getLinks()
-		];
-	}
+    /** @var string */
+    private $ownerId;
+
+    /** @var string */
+    private $viewerId = '';
+
+    /** @var array */
+    private $users = [];
+
+    /** @var array */
+    private $groups = [];
+
+    /** @var array */
+    private $circles = [];
+
+    /** @var array */
+    private $links = [];
+
+
+    /**
+     * Owner of the document can be set at the init of the object.
+     *
+     * @since 16.0.0
+     *
+     * IDocumentAccess constructor.
+     *
+     * @param string $ownerId
+     */
+    public function __construct(string $ownerId = '') {
+        $this->setOwnerId($ownerId);
+    }
+
+
+    /**
+     * Set the Owner of the document.
+     *
+     * @since 16.0.0
+     *
+     * @param string $ownerId
+     *
+     * @return IDocumentAccess
+     */
+    public function setOwnerId(string $ownerId): IDocumentAccess {
+        $this->ownerId = $ownerId;
+
+        return $this;
+    }
+
+    /**
+     * Get the Owner of the document.
+     *
+     * @since 16.0.0
+     *
+     * @return string
+     */
+    public function getOwnerId(): string {
+        return $this->ownerId;
+    }
+
+
+    /**
+     * Set the viewer of the document.
+     *
+     * @since 16.0.0
+     *
+     * @param string $viewerId
+     *
+     * @return IDocumentAccess
+     */
+    public function setViewerId(string $viewerId): IDocumentAccess {
+        $this->viewerId = $viewerId;
+
+        return $this;
+    }
+
+    /**
+     * Get the viewer of the document.
+     *
+     * @since 16.0.0
+     *
+     * @return string
+     */
+    public function getViewerId(): string {
+        return $this->viewerId;
+    }
+
+
+    /**
+     * Set the list of users that have read access to the document.
+     *
+     * @since 16.0.0
+     *
+     * @param array $users
+     *
+     * @return IDocumentAccess
+     */
+    public function setUsers(array $users): IDocumentAccess {
+        $this->users = $users;
+
+        return $this;
+    }
+
+    /**
+     * Add an entry to the list of users that have read access to the document.
+     *
+     * @since 16.0.0
+     *
+     * @param string $user
+     *
+     * @return IDocumentAccess
+     */
+    public function addUser(string $user): IDocumentAccess {
+        $this->users[] = $user;
+
+        return $this;
+    }
+
+    /**
+     * Add multiple entries to the list of users that have read access to the
+     * document.
+     *
+     * @since 16.0.0
+     *
+     * @param array $users
+     *
+     * @return IDocumentAccess
+     */
+    public function addUsers($users): IDocumentAccess {
+        $this->users = array_merge($this->users, $users);
+
+        return $this;
+    }
+
+    /**
+     * Get the complete list of users that have read access to the document.
+     *
+     * @since 16.0.0
+     *
+     * @return array
+     */
+    public function getUsers(): array {
+        return $this->users;
+    }
+
+
+    /**
+     * Set the list of groups that have read access to the document.
+     *
+     * @since 16.0.0
+     *
+     * @param array $groups
+     *
+     * @return IDocumentAccess
+     */
+    public function setGroups(array $groups): IDocumentAccess {
+        $this->groups = $groups;
+
+        return $this;
+    }
+
+    /**
+     * Add an entry to the list of groups that have read access to the document.
+     *
+     * @since 16.0.0
+     *
+     * @param string $group
+     *
+     * @return IDocumentAccess
+     */
+    public function addGroup(string $group): IDocumentAccess {
+        $this->groups[] = $group;
+
+        return $this;
+    }
+
+    /**
+     * Add multiple entries to the list of groups that have read access to the
+     * document.
+     *
+     * @since 16.0.0
+     *
+     * @param array $groups
+     *
+     * @return IDocumentAccess
+     */
+    public function addGroups(array $groups) {
+        $this->groups = array_merge($this->groups, $groups);
+
+        return $this;
+    }
+
+    /**
+     * Get the complete list of groups that have read access to the document.
+     *
+     * @since 16.0.0
+     *
+     * @return array
+     */
+    public function getGroups(): array {
+        return $this->groups;
+    }
+
+
+    /**
+     * Set the list of circles that have read access to the document.
+     *
+     * @since 16.0.0
+     *
+     * @param array $circles
+     *
+     * @return IDocumentAccess
+     */
+    public function setCircles(array $circles): IDocumentAccess {
+        $this->circles = $circles;
+
+        return $this;
+    }
+
+    /**
+     * Add an entry to the list of circles that have read access to the document.
+     *
+     * @since 16.0.0
+     *
+     * @param string $circle
+     *
+     * @return IDocumentAccess
+     */
+    public function addCircle(string $circle): IDocumentAccess {
+        $this->circles[] = $circle;
+
+        return $this;
+    }
+
+    /**
+     * Add multiple entries to the list of groups that have read access to the
+     * document.
+     *
+     * @since 16.0.0
+     *
+     * @param array $circles
+     *
+     * @return IDocumentAccess
+     */
+    public function addCircles(array $circles): IDocumentAccess {
+        $this->circles = array_merge($this->circles, $circles);
+
+        return $this;
+    }
+
+    /**
+     * Get the complete list of circles that have read access to the document.
+     *
+     * @since 16.0.0
+     *
+     * @return array
+     */
+    public function getCircles(): array {
+        return $this->circles;
+    }
+
+
+    /**
+     * Set the list of links that have read access to the document.
+     *
+     * @since 16.0.0
+     *
+     * @param array $links
+     *
+     * @return IDocumentAccess
+     */
+    public function setLinks(array $links): IDocumentAccess {
+        $this->links = $links;
+
+        return $this;
+    }
+
+    /**
+     * Get the list of links that have read access to the document.
+     *
+     * @since 16.0.0
+     *
+     * @return array
+     */
+    public function getLinks(): array {
+        return $this->links;
+    }
+
+
+    /**
+     * @since 16.0.0
+     *
+     * @return array
+     */
+    public function jsonSerialize(): array {
+        return [
+            'ownerId' => $this->getOwnerId(),
+            'viewerId' => $this->getViewerId(),
+            'users' => $this->getUsers(),
+            'groups' => $this->getGroups(),
+            'circles' => $this->getCircles(),
+            'links' => $this->getLinks()
+        ];
+    }
 }
 

apps/twofactor_backupcodes/lib/Listener/ProviderDisabled.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 		$providers = $this->registry->getProviderStates($event->getUser());
 
 		// Loop over all providers. If all are disabled we remove the job
-		$state = array_reduce($providers, function (bool $carry, bool $enabled) {
+		$state = array_reduce($providers, function(bool $carry, bool $enabled) {
 			return $carry || $enabled;
 		}, false);
 

Indentation +22 added lines, -22 removed lines

@@ -35,33 +35,33 @@
 
 class ProviderDisabled implements IEventListener {
 
-	/** @var IRegistry */
-	private $registry;
+    /** @var IRegistry */
+    private $registry;
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IRegistry $registry,
-								IJobList $jobList) {
-		$this->registry = $registry;
-		$this->jobList = $jobList;
-	}
+    public function __construct(IRegistry $registry,
+                                IJobList $jobList) {
+        $this->registry = $registry;
+        $this->jobList = $jobList;
+    }
 
-	public function handle(Event $event): void {
-		if (!($event instanceof RegistryEvent)) {
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof RegistryEvent)) {
+            return;
+        }
 
-		$providers = $this->registry->getProviderStates($event->getUser());
+        $providers = $this->registry->getProviderStates($event->getUser());
 
-		// Loop over all providers. If all are disabled we remove the job
-		$state = array_reduce($providers, function (bool $carry, bool $enabled) {
-			return $carry || $enabled;
-		}, false);
+        // Loop over all providers. If all are disabled we remove the job
+        $state = array_reduce($providers, function (bool $carry, bool $enabled) {
+            return $carry || $enabled;
+        }, false);
 
-		if ($state === false) {
-			$this->jobList->remove(RememberBackupCodesJob::class, ['uid' => $event->getUser()->getUID()]);
-		}
-	}
+        if ($state === false) {
+            $this->jobList->remove(RememberBackupCodesJob::class, ['uid' => $event->getUser()->getUID()]);
+        }
+    }
 
 }

lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php

Indentation +25 added lines, -25 removed lines

@@ -29,31 +29,31 @@
 
 class PgSqlExpressionBuilder extends ExpressionBuilder {
 
-	/**
-	 * Returns a IQueryFunction that casts the column to the given type
-	 *
-	 * @param string $column
-	 * @param mixed $type One of IQueryBuilder::PARAM_*
-	 * @return string
-	 */
-	public function castColumn($column, $type) {
-		switch ($type) {
-			case IQueryBuilder::PARAM_INT:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS INT)');
-			case IQueryBuilder::PARAM_STR:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS TEXT)');
-			default:
-				return parent::castColumn($column, $type);
-		}
-	}
+    /**
+     * Returns a IQueryFunction that casts the column to the given type
+     *
+     * @param string $column
+     * @param mixed $type One of IQueryBuilder::PARAM_*
+     * @return string
+     */
+    public function castColumn($column, $type) {
+        switch ($type) {
+            case IQueryBuilder::PARAM_INT:
+                return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS INT)');
+            case IQueryBuilder::PARAM_STR:
+                return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS TEXT)');
+            default:
+                return parent::castColumn($column, $type);
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function iLike($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->comparison($x, 'ILIKE', $y);
-	}
+    /**
+     * @inheritdoc
+     */
+    public function iLike($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->comparison($x, 'ILIKE', $y);
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -39,9 +39,9 @@
 	public function castColumn($column, $type) {
 		switch ($type) {
 			case IQueryBuilder::PARAM_INT:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS INT)');
+				return new QueryFunction('CAST('.$this->helper->quoteColumnName($column).' AS INT)');
 			case IQueryBuilder::PARAM_STR:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS TEXT)');
+				return new QueryFunction('CAST('.$this->helper->quoteColumnName($column).' AS TEXT)');
 			default:
 				return parent::castColumn($column, $type);
 		}

apps/user_ldap/templates/renewpassword.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php /** @var $l OC_L10N */ ?>
 <?php
 script('user_ldap', [
-	'renewPassword',
+    'renewPassword',
 ]);
 style('user_ldap', 'renewPassword');
 ?>

Spacing +3 added lines, -3 removed lines

@@ -24,14 +24,14 @@ 
 		<?php endif; ?>
 		<div id="message" class="hidden">
 			<img class="float-spinner" alt=""
-				src="<?php p(image_path('core', 'loading-dark.gif'));?>">
+				src="<?php p(image_path('core', 'loading-dark.gif')); ?>">
 			<span id="messageText"></span>
 			<!-- the following div ensures that the spinner is always inside the #message div -->
 			<div style="clear: both;"></div>
 		</div>
 		<p class="grouptop">
 			<input type="password" id="oldPassword" name="oldPassword"
-				placeholder="<?php echo $l->t('Current password');?>"
+				placeholder="<?php echo $l->t('Current password'); ?>"
 				autofocus autocomplete="off" autocapitalize="off" autocorrect="off" required/>
 			<label for="oldPassword" class="infield"><?php p($l->t('Current password')); ?></label>
 		</p>
@@ -40,7 +40,7 @@ 
 			<input type="checkbox" id="personal-show" name="show" class="hidden-visually" /><label for="personal-show"></label>
 			<label id="newPassword-label" for="newPassword" class="infield"><?php p($l->t('New password')); ?></label>
 			<input type="password" id="newPassword" name="newPassword"
-				placeholder="<?php echo $l->t('New password');?>"
+				placeholder="<?php echo $l->t('New password'); ?>"
 				data-typetoggle="#personal-show" autofocus autocomplete="off" autocapitalize="off" autocorrect="off" required/>
 		</p>
 		

apps/files_external/lib/Command/Notify.php

Spacing +6 added lines, -6 removed lines

@@ -128,7 +128,7 @@ 
 			return 1;
 		}
 		if (!$storage instanceof INotifyStorage) {
-			$output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
+			$output->writeln('<error>Mount of type "'.$mount->getBackend()->getText().'" does not support active update notifications</error>');
 			return 1;
 		}
 
@@ -137,7 +137,7 @@ 
 		$path = trim($input->getOption('path'), '/');
 		$notifyHandler = $storage->notify($path);
 		$this->selfTest($storage, $notifyHandler, $verbose, $output);
-		$notifyHandler->listen(function (IChange $change) use ($mount, $verbose, $output) {
+		$notifyHandler->listen(function(IChange $change) use ($mount, $verbose, $output) {
 			if ($verbose) {
 				$this->logUpdate($change, $output);
 			}
@@ -168,14 +168,14 @@ 
 			$storageIds = $this->getStorageIds($mountId);
 		}
 		if (count($storageIds) === 0) {
-			throw new StorageNotAvailableException('No storages found by mount ID ' . $mountId);
+			throw new StorageNotAvailableException('No storages found by mount ID '.$mountId);
 		}
 		$storageIds = array_map('intval', $storageIds);
 
 		$result = $this->updateParent($storageIds, $parent);
 		if ($result === 0) {
 			//TODO: Find existing parent further up the tree in the database and register that folder instead.
-			$this->logger->info('Failed updating parent for "' . $path . '" while trying to register change. It may not exist in the filecache.');
+			$this->logger->info('Failed updating parent for "'.$path.'" while trying to register change. It may not exist in the filecache.');
 		}
 	}
 
@@ -197,9 +197,9 @@ 
 				return;
 		}
 
-		$text .= ' ' . $change->getPath();
+		$text .= ' '.$change->getPath();
 		if ($change instanceof IRenameChange) {
-			$text .= ' to ' . $change->getTargetPath();
+			$text .= ' to '.$change->getTargetPath();
 		}
 
 		$output->writeln($text);

Indentation +223 added lines, -223 removed lines

@@ -45,252 +45,252 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Notify extends Base {
-	/** @var GlobalStoragesService */
-	private $globalService;
-	/** @var IDBConnection */
-	private $connection;
-	/** @var ILogger */
-	private $logger;
+    /** @var GlobalStoragesService */
+    private $globalService;
+    /** @var IDBConnection */
+    private $connection;
+    /** @var ILogger */
+    private $logger;
 
-	public function __construct(GlobalStoragesService $globalService, IDBConnection $connection, ILogger $logger) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->connection = $connection;
-		$this->logger = $logger;
-	}
+    public function __construct(GlobalStoragesService $globalService, IDBConnection $connection, ILogger $logger) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->connection = $connection;
+        $this->logger = $logger;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:notify')
-			->setDescription('Listen for active update notifications for a configured external mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'the mount id of the mount to listen to'
-			)->addOption(
-				'user',
-				'u',
-				InputOption::VALUE_REQUIRED,
-				'The username for the remote mount (required only for some mount configuration that don\'t store credentials)'
-			)->addOption(
-				'password',
-				'p',
-				InputOption::VALUE_REQUIRED,
-				'The password for the remote mount (required only for some mount configuration that don\'t store credentials)'
-			)->addOption(
-				'path',
-				'',
-				InputOption::VALUE_REQUIRED,
-				'The directory in the storage to listen for updates in',
-				'/'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:notify')
+            ->setDescription('Listen for active update notifications for a configured external mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'the mount id of the mount to listen to'
+            )->addOption(
+                'user',
+                'u',
+                InputOption::VALUE_REQUIRED,
+                'The username for the remote mount (required only for some mount configuration that don\'t store credentials)'
+            )->addOption(
+                'password',
+                'p',
+                InputOption::VALUE_REQUIRED,
+                'The password for the remote mount (required only for some mount configuration that don\'t store credentials)'
+            )->addOption(
+                'path',
+                '',
+                InputOption::VALUE_REQUIRED,
+                'The directory in the storage to listen for updates in',
+                '/'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$mount = $this->globalService->getStorage($input->getArgument('mount_id'));
-		if (is_null($mount)) {
-			$output->writeln('<error>Mount not found</error>');
-			return 1;
-		}
-		$noAuth = false;
-		try {
-			$authBackend = $mount->getAuthMechanism();
-			$authBackend->manipulateStorageConfig($mount);
-		} catch (InsufficientDataForMeaningfulAnswerException $e) {
-			$noAuth = true;
-		} catch (StorageNotAvailableException $e) {
-			$noAuth = true;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $mount = $this->globalService->getStorage($input->getArgument('mount_id'));
+        if (is_null($mount)) {
+            $output->writeln('<error>Mount not found</error>');
+            return 1;
+        }
+        $noAuth = false;
+        try {
+            $authBackend = $mount->getAuthMechanism();
+            $authBackend->manipulateStorageConfig($mount);
+        } catch (InsufficientDataForMeaningfulAnswerException $e) {
+            $noAuth = true;
+        } catch (StorageNotAvailableException $e) {
+            $noAuth = true;
+        }
 
-		if ($input->getOption('user')) {
-			$mount->setBackendOption('user', $input->getOption('user'));
-		} elseif (isset($_ENV['NOTIFY_USER'])) {
-			$mount->setBackendOption('user', $_ENV['NOTIFY_USER']);
-		} elseif (isset($_SERVER['NOTIFY_USER'])) {
-			$mount->setBackendOption('user', $_SERVER['NOTIFY_USER']);
-		}
-		if ($input->getOption('password')) {
-			$mount->setBackendOption('password', $input->getOption('password'));
-		} elseif (isset($_ENV['NOTIFY_PASSWORD'])) {
-			$mount->setBackendOption('password', $_ENV['NOTIFY_PASSWORD']);
-		} elseif (isset($_SERVER['NOTIFY_PASSWORD'])) {
-			$mount->setBackendOption('password', $_SERVER['NOTIFY_PASSWORD']);
-		}
+        if ($input->getOption('user')) {
+            $mount->setBackendOption('user', $input->getOption('user'));
+        } elseif (isset($_ENV['NOTIFY_USER'])) {
+            $mount->setBackendOption('user', $_ENV['NOTIFY_USER']);
+        } elseif (isset($_SERVER['NOTIFY_USER'])) {
+            $mount->setBackendOption('user', $_SERVER['NOTIFY_USER']);
+        }
+        if ($input->getOption('password')) {
+            $mount->setBackendOption('password', $input->getOption('password'));
+        } elseif (isset($_ENV['NOTIFY_PASSWORD'])) {
+            $mount->setBackendOption('password', $_ENV['NOTIFY_PASSWORD']);
+        } elseif (isset($_SERVER['NOTIFY_PASSWORD'])) {
+            $mount->setBackendOption('password', $_SERVER['NOTIFY_PASSWORD']);
+        }
 
-		try {
-			$storage = $this->createStorage($mount);
-		} catch (\Exception $e) {
-			$output->writeln('<error>Error while trying to create storage</error>');
-			if ($noAuth) {
-				$output->writeln('<error>Username and/or password required</error>');
-			}
-			return 1;
-		}
-		if (!$storage instanceof INotifyStorage) {
-			$output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
-			return 1;
-		}
+        try {
+            $storage = $this->createStorage($mount);
+        } catch (\Exception $e) {
+            $output->writeln('<error>Error while trying to create storage</error>');
+            if ($noAuth) {
+                $output->writeln('<error>Username and/or password required</error>');
+            }
+            return 1;
+        }
+        if (!$storage instanceof INotifyStorage) {
+            $output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
+            return 1;
+        }
 
-		$verbose = $input->getOption('verbose');
+        $verbose = $input->getOption('verbose');
 
-		$path = trim($input->getOption('path'), '/');
-		$notifyHandler = $storage->notify($path);
-		$this->selfTest($storage, $notifyHandler, $verbose, $output);
-		$notifyHandler->listen(function (IChange $change) use ($mount, $verbose, $output) {
-			if ($verbose) {
-				$this->logUpdate($change, $output);
-			}
-			if ($change instanceof IRenameChange) {
-				$this->markParentAsOutdated($mount->getId(), $change->getTargetPath(), $output);
-			}
-			$this->markParentAsOutdated($mount->getId(), $change->getPath(), $output);
-		});
-	}
+        $path = trim($input->getOption('path'), '/');
+        $notifyHandler = $storage->notify($path);
+        $this->selfTest($storage, $notifyHandler, $verbose, $output);
+        $notifyHandler->listen(function (IChange $change) use ($mount, $verbose, $output) {
+            if ($verbose) {
+                $this->logUpdate($change, $output);
+            }
+            if ($change instanceof IRenameChange) {
+                $this->markParentAsOutdated($mount->getId(), $change->getTargetPath(), $output);
+            }
+            $this->markParentAsOutdated($mount->getId(), $change->getPath(), $output);
+        });
+    }
 
-	private function createStorage(StorageConfig $mount) {
-		$class = $mount->getBackend()->getStorageClass();
-		return new $class($mount->getBackendOptions());
-	}
+    private function createStorage(StorageConfig $mount) {
+        $class = $mount->getBackend()->getStorageClass();
+        return new $class($mount->getBackendOptions());
+    }
 
-	private function markParentAsOutdated($mountId, $path, OutputInterface $output) {
-		$parent = ltrim(dirname($path), '/');
-		if ($parent === '.') {
-			$parent = '';
-		}
+    private function markParentAsOutdated($mountId, $path, OutputInterface $output) {
+        $parent = ltrim(dirname($path), '/');
+        if ($parent === '.') {
+            $parent = '';
+        }
 
-		try {
-			$storageIds = $this->getStorageIds($mountId);
-		} catch (DriverException $ex) {
-			$this->logger->logException($ex, ['message' => 'Error while trying to find correct storage ids.', 'level' => ILogger::WARN]);
-			$this->connection = $this->reconnectToDatabase($this->connection, $output);
-			$output->writeln('<info>Needed to reconnect to the database</info>');
-			$storageIds = $this->getStorageIds($mountId);
-		}
-		if (count($storageIds) === 0) {
-			throw new StorageNotAvailableException('No storages found by mount ID ' . $mountId);
-		}
-		$storageIds = array_map('intval', $storageIds);
+        try {
+            $storageIds = $this->getStorageIds($mountId);
+        } catch (DriverException $ex) {
+            $this->logger->logException($ex, ['message' => 'Error while trying to find correct storage ids.', 'level' => ILogger::WARN]);
+            $this->connection = $this->reconnectToDatabase($this->connection, $output);
+            $output->writeln('<info>Needed to reconnect to the database</info>');
+            $storageIds = $this->getStorageIds($mountId);
+        }
+        if (count($storageIds) === 0) {
+            throw new StorageNotAvailableException('No storages found by mount ID ' . $mountId);
+        }
+        $storageIds = array_map('intval', $storageIds);
 
-		$result = $this->updateParent($storageIds, $parent);
-		if ($result === 0) {
-			//TODO: Find existing parent further up the tree in the database and register that folder instead.
-			$this->logger->info('Failed updating parent for "' . $path . '" while trying to register change. It may not exist in the filecache.');
-		}
-	}
+        $result = $this->updateParent($storageIds, $parent);
+        if ($result === 0) {
+            //TODO: Find existing parent further up the tree in the database and register that folder instead.
+            $this->logger->info('Failed updating parent for "' . $path . '" while trying to register change. It may not exist in the filecache.');
+        }
+    }
 
-	private function logUpdate(IChange $change, OutputInterface $output) {
-		switch ($change->getType()) {
-			case INotifyStorage::NOTIFY_ADDED:
-				$text = 'added';
-				break;
-			case INotifyStorage::NOTIFY_MODIFIED:
-				$text = 'modified';
-				break;
-			case INotifyStorage::NOTIFY_REMOVED:
-				$text = 'removed';
-				break;
-			case INotifyStorage::NOTIFY_RENAMED:
-				$text = 'renamed';
-				break;
-			default:
-				return;
-		}
+    private function logUpdate(IChange $change, OutputInterface $output) {
+        switch ($change->getType()) {
+            case INotifyStorage::NOTIFY_ADDED:
+                $text = 'added';
+                break;
+            case INotifyStorage::NOTIFY_MODIFIED:
+                $text = 'modified';
+                break;
+            case INotifyStorage::NOTIFY_REMOVED:
+                $text = 'removed';
+                break;
+            case INotifyStorage::NOTIFY_RENAMED:
+                $text = 'renamed';
+                break;
+            default:
+                return;
+        }
 
-		$text .= ' ' . $change->getPath();
-		if ($change instanceof IRenameChange) {
-			$text .= ' to ' . $change->getTargetPath();
-		}
+        $text .= ' ' . $change->getPath();
+        if ($change instanceof IRenameChange) {
+            $text .= ' to ' . $change->getTargetPath();
+        }
 
-		$output->writeln($text);
-	}
+        $output->writeln($text);
+    }
 
-	/**
-	 * @param int $mountId
-	 * @return array
-	 */
-	private function getStorageIds($mountId) {
-		$qb = $this->connection->getQueryBuilder();
-		return $qb
-			->select('storage_id')
-			->from('mounts')
-			->where($qb->expr()->eq('mount_id', $qb->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
-			->execute()
-			->fetchAll(\PDO::FETCH_COLUMN);
-	}
+    /**
+     * @param int $mountId
+     * @return array
+     */
+    private function getStorageIds($mountId) {
+        $qb = $this->connection->getQueryBuilder();
+        return $qb
+            ->select('storage_id')
+            ->from('mounts')
+            ->where($qb->expr()->eq('mount_id', $qb->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
+            ->execute()
+            ->fetchAll(\PDO::FETCH_COLUMN);
+    }
 
-	/**
-	 * @param array $storageIds
-	 * @param string $parent
-	 * @return int
-	 */
-	private function updateParent($storageIds, $parent) {
-		$pathHash = md5(trim(\OC_Util::normalizeUnicode($parent), '/'));
-		$qb = $this->connection->getQueryBuilder();
-		return $qb
-			->update('filecache')
-			->set('size', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
-			->where($qb->expr()->in('storage', $qb->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY, ':storage_ids')))
-			->andWhere($qb->expr()->eq('path_hash', $qb->createNamedParameter($pathHash, IQueryBuilder::PARAM_STR)))
-			->execute();
-	}
+    /**
+     * @param array $storageIds
+     * @param string $parent
+     * @return int
+     */
+    private function updateParent($storageIds, $parent) {
+        $pathHash = md5(trim(\OC_Util::normalizeUnicode($parent), '/'));
+        $qb = $this->connection->getQueryBuilder();
+        return $qb
+            ->update('filecache')
+            ->set('size', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
+            ->where($qb->expr()->in('storage', $qb->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY, ':storage_ids')))
+            ->andWhere($qb->expr()->eq('path_hash', $qb->createNamedParameter($pathHash, IQueryBuilder::PARAM_STR)))
+            ->execute();
+    }
 
-	/**
-	 * @return \OCP\IDBConnection
-	 */
-	private function reconnectToDatabase(IDBConnection $connection, OutputInterface $output) {
-		try {
-			$connection->close();
-		} catch (\Exception $ex) {
-			$this->logger->logException($ex, ['app' => 'files_external', 'message' => 'Error while disconnecting from DB', 'level' => ILogger::WARN]);
-			$output->writeln("<info>Error while disconnecting from database: {$ex->getMessage()}</info>");
-		}
-		while (!$connection->isConnected()) {
-			try {
-				$connection->connect();
-			} catch (\Exception $ex) {
-				$this->logger->logException($ex, ['app' => 'files_external', 'message' => 'Error while re-connecting to database', 'level' => ILogger::WARN]);
-				$output->writeln("<info>Error while re-connecting to database: {$ex->getMessage()}</info>");
-				sleep(60);
-			}
-		}
-		return $connection;
-	}
+    /**
+     * @return \OCP\IDBConnection
+     */
+    private function reconnectToDatabase(IDBConnection $connection, OutputInterface $output) {
+        try {
+            $connection->close();
+        } catch (\Exception $ex) {
+            $this->logger->logException($ex, ['app' => 'files_external', 'message' => 'Error while disconnecting from DB', 'level' => ILogger::WARN]);
+            $output->writeln("<info>Error while disconnecting from database: {$ex->getMessage()}</info>");
+        }
+        while (!$connection->isConnected()) {
+            try {
+                $connection->connect();
+            } catch (\Exception $ex) {
+                $this->logger->logException($ex, ['app' => 'files_external', 'message' => 'Error while re-connecting to database', 'level' => ILogger::WARN]);
+                $output->writeln("<info>Error while re-connecting to database: {$ex->getMessage()}</info>");
+                sleep(60);
+            }
+        }
+        return $connection;
+    }
 
 
-	private function selfTest(IStorage $storage, INotifyHandler $notifyHandler, $verbose, OutputInterface $output) {
-		usleep(100 * 1000); //give time for the notify to start
-		$storage->file_put_contents('/.nc_test_file.txt', 'test content');
-		$storage->mkdir('/.nc_test_folder');
-		$storage->file_put_contents('/.nc_test_folder/subfile.txt', 'test content');
+    private function selfTest(IStorage $storage, INotifyHandler $notifyHandler, $verbose, OutputInterface $output) {
+        usleep(100 * 1000); //give time for the notify to start
+        $storage->file_put_contents('/.nc_test_file.txt', 'test content');
+        $storage->mkdir('/.nc_test_folder');
+        $storage->file_put_contents('/.nc_test_folder/subfile.txt', 'test content');
 
-		usleep(100 * 1000); //time for all changes to be processed
-		$changes = $notifyHandler->getChanges();
+        usleep(100 * 1000); //time for all changes to be processed
+        $changes = $notifyHandler->getChanges();
 
-		$storage->unlink('/.nc_test_file.txt');
-		$storage->unlink('/.nc_test_folder/subfile.txt');
-		$storage->rmdir('/.nc_test_folder');
+        $storage->unlink('/.nc_test_file.txt');
+        $storage->unlink('/.nc_test_folder/subfile.txt');
+        $storage->rmdir('/.nc_test_folder');
 
-		usleep(100 * 1000); //time for all changes to be processed
-		$notifyHandler->getChanges(); // flush
+        usleep(100 * 1000); //time for all changes to be processed
+        $notifyHandler->getChanges(); // flush
 
-		$foundRootChange = false;
-		$foundSubfolderChange = false;
+        $foundRootChange = false;
+        $foundSubfolderChange = false;
 
-		foreach ($changes as $change) {
-			if ($change->getPath() === '/.nc_test_file.txt' || $change->getPath() === '.nc_test_file.txt') {
-				$foundRootChange = true;
-			} elseif ($change->getPath() === '/.nc_test_folder/subfile.txt' || $change->getPath() === '.nc_test_folder/subfile.txt') {
-				$foundSubfolderChange = true;
-			}
-		}
+        foreach ($changes as $change) {
+            if ($change->getPath() === '/.nc_test_file.txt' || $change->getPath() === '.nc_test_file.txt') {
+                $foundRootChange = true;
+            } elseif ($change->getPath() === '/.nc_test_folder/subfile.txt' || $change->getPath() === '.nc_test_folder/subfile.txt') {
+                $foundSubfolderChange = true;
+            }
+        }
 
-		if ($foundRootChange && $foundSubfolderChange && $verbose) {
-			$output->writeln('<info>Self-test successful</info>');
-		} elseif ($foundRootChange && !$foundSubfolderChange) {
-			$output->writeln('<error>Error while running self-test, change is subfolder not detected</error>');
-		} elseif (!$foundRootChange) {
-			$output->writeln('<error>Error while running self-test, no changes detected</error>');
-		}
-	}
+        if ($foundRootChange && $foundSubfolderChange && $verbose) {
+            $output->writeln('<info>Self-test successful</info>');
+        } elseif ($foundRootChange && !$foundSubfolderChange) {
+            $output->writeln('<error>Error while running self-test, change is subfolder not detected</error>');
+        } elseif (!$foundRootChange) {
+            $output->writeln('<error>Error while running self-test, no changes detected</error>');
+        }
+    }
 }

lib/private/Collaboration/Resources/Resource.php

Indentation +125 added lines, -125 removed lines

@@ -31,129 +31,129 @@
 
 class Resource implements IResource {
 
-	/** @var IManager */
-	protected $manager;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var string */
-	protected $type;
-
-	/** @var string */
-	protected $id;
-
-	/** @var IUser|null */
-	protected $userForAccess;
-
-	/** @var bool|null */
-	protected $access;
-
-	/** @var array|null */
-	protected $data;
-
-	public function __construct(
-		IManager $manager,
-		IDBConnection $connection,
-		string $type,
-		string $id,
-		?IUser $userForAccess = null,
-		?bool $access = null
-	) {
-		$this->manager = $manager;
-		$this->connection = $connection;
-		$this->type = $type;
-		$this->id = $id;
-		$this->userForAccess = $userForAccess;
-		$this->access = $access;
-	}
-
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getType(): string {
-		return $this->type;
-	}
-
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getId(): string {
-		return $this->id;
-	}
-
-	/**
-	 * @return array
-	 * @since 16.0.0
-	 */
-	public function getRichObject(): array {
-		if ($this->data === null) {
-			$this->data = $this->manager->getResourceRichObject($this);
-		}
-
-		return $this->data;
-	}
-
-	/**
-	 * Can a user/guest access the resource
-	 *
-	 * @param IUser|null $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccess(?IUser $user): bool {
-		if ($user instanceof IUser) {
-			return $this->canUserAccess($user);
-		}
-		return $this->canGuestAccess();
-	}
-
-	protected function canUserAccess(IUser $user): bool {
-		if (\is_bool($this->access) && $this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
-			return $this->access;
-		}
-
-		$access = $this->manager->canAccessResource($this, $user);
-		if ($this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	protected function canGuestAccess(): bool {
-		if (\is_bool($this->access) && !$this->userForAccess instanceof IUser) {
-			return $this->access;
-		}
-
-		$access = $this->manager->canAccessResource($this, null);
-		if (!$this->userForAccess instanceof IUser) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	/**
-	 * @return ICollection[]
-	 * @since 16.0.0
-	 */
-	public function getCollections(): array {
-		$collections = [];
-
-		$query = $this->connection->getQueryBuilder();
-
-		$query->select('collection_id')
-			->from('collres_resources')
-			->where($query->expr()->eq('resource_type', $query->createNamedParameter($this->getType())))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($this->getId())));
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$collections[] = $this->manager->getCollection((int) $row['collection_id']);
-		}
-		$result->closeCursor();
-
-		return $collections;
-	}
+    /** @var IManager */
+    protected $manager;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var string */
+    protected $type;
+
+    /** @var string */
+    protected $id;
+
+    /** @var IUser|null */
+    protected $userForAccess;
+
+    /** @var bool|null */
+    protected $access;
+
+    /** @var array|null */
+    protected $data;
+
+    public function __construct(
+        IManager $manager,
+        IDBConnection $connection,
+        string $type,
+        string $id,
+        ?IUser $userForAccess = null,
+        ?bool $access = null
+    ) {
+        $this->manager = $manager;
+        $this->connection = $connection;
+        $this->type = $type;
+        $this->id = $id;
+        $this->userForAccess = $userForAccess;
+        $this->access = $access;
+    }
+
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getType(): string {
+        return $this->type;
+    }
+
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getId(): string {
+        return $this->id;
+    }
+
+    /**
+     * @return array
+     * @since 16.0.0
+     */
+    public function getRichObject(): array {
+        if ($this->data === null) {
+            $this->data = $this->manager->getResourceRichObject($this);
+        }
+
+        return $this->data;
+    }
+
+    /**
+     * Can a user/guest access the resource
+     *
+     * @param IUser|null $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccess(?IUser $user): bool {
+        if ($user instanceof IUser) {
+            return $this->canUserAccess($user);
+        }
+        return $this->canGuestAccess();
+    }
+
+    protected function canUserAccess(IUser $user): bool {
+        if (\is_bool($this->access) && $this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
+            return $this->access;
+        }
+
+        $access = $this->manager->canAccessResource($this, $user);
+        if ($this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    protected function canGuestAccess(): bool {
+        if (\is_bool($this->access) && !$this->userForAccess instanceof IUser) {
+            return $this->access;
+        }
+
+        $access = $this->manager->canAccessResource($this, null);
+        if (!$this->userForAccess instanceof IUser) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    /**
+     * @return ICollection[]
+     * @since 16.0.0
+     */
+    public function getCollections(): array {
+        $collections = [];
+
+        $query = $this->connection->getQueryBuilder();
+
+        $query->select('collection_id')
+            ->from('collres_resources')
+            ->where($query->expr()->eq('resource_type', $query->createNamedParameter($this->getType())))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($this->getId())));
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $collections[] = $this->manager->getCollection((int) $row['collection_id']);
+        }
+        $result->closeCursor();
+
+        return $collections;
+    }
 }

lib/public/Collaboration/Resources/IResource.php

Indentation +28 added lines, -28 removed lines

@@ -29,36 +29,36 @@
  */
 interface IResource {
 
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getType(): string;
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getType(): string;
 
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getId(): string;
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getId(): string;
 
-	/**
-	 * @return array
-	 * @since 16.0.0
-	 */
-	public function getRichObject(): array;
+    /**
+     * @return array
+     * @since 16.0.0
+     */
+    public function getRichObject(): array;
 
-	/**
-	 * Can a user/guest access the resource
-	 *
-	 * @param IUser|null $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccess(?IUser $user): bool;
+    /**
+     * Can a user/guest access the resource
+     *
+     * @param IUser|null $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccess(?IUser $user): bool;
 
-	/**
-	 * @return ICollection[]
-	 * @since 16.0.0
-	 */
-	public function getCollections(): array;
+    /**
+     * @return ICollection[]
+     * @since 16.0.0
+     */
+    public function getCollections(): array;
 }

apps/dav/lib/Migration/Version1004Date20170924124212.php

Indentation +16 added lines, -16 removed lines

@@ -28,23 +28,23 @@
 
 class Version1004Date20170924124212 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('cards');
-		$table->addIndex(['addressbookid'], 'cards_abid');
+        $table = $schema->getTable('cards');
+        $table->addIndex(['addressbookid'], 'cards_abid');
 
-		$table = $schema->getTable('cards_properties');
-		$table->addIndex(['addressbookid'], 'cards_prop_abid');
+        $table = $schema->getTable('cards_properties');
+        $table->addIndex(['addressbookid'], 'cards_prop_abid');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }