Inspection of "Merge pull request #34172 from audriga/add-scim-js..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( fcf578...0af4e9 )

by Joas

created 2022-12-20 07:58 UTC

Status

Indentation +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -28,38 +28,38 @@
 block discarded – undo
 
 class Capabilities implements ICapability {
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(IURLGenerator $urlGenerator) {
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(IURLGenerator $urlGenerator) {
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * Function an app uses to return the capabilities
-	 *
-	 * @return array Array containing the apps capabilities
-	 * @since 8.2.0
-	 */
-	public function getCapabilities() {
-		$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
-		$capabilities = ['ocm' =>
-			[
-				'enabled' => true,
-				'apiVersion' => '1.0-proposal1',
-				'endPoint' => substr($url, 0, strrpos($url, '/')),
-				'resourceTypes' => [
-					[
-						'name' => 'file',
-						'shareTypes' => ['user', 'group'],
-						'protocols' => [
-							'webdav' => '/public.php/webdav/',
-						]
-					],
-				]
-			]
-		];
+    /**
+     * Function an app uses to return the capabilities
+     *
+     * @return array Array containing the apps capabilities
+     * @since 8.2.0
+     */
+    public function getCapabilities() {
+        $url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
+        $capabilities = ['ocm' =>
+            [
+                'enabled' => true,
+                'apiVersion' => '1.0-proposal1',
+                'endPoint' => substr($url, 0, strrpos($url, '/')),
+                'resourceTypes' => [
+                    [
+                        'name' => 'file',
+                        'shareTypes' => ['user', 'group'],
+                        'protocols' => [
+                            'webdav' => '/public.php/webdav/',
+                        ]
+                    ],
+                ]
+            ]
+        ];
 
-		return $capabilities;
-	}
+        return $capabilities;
+    }
 }

Please login to merge, or discard this patch.

lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php 1 patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -31,19 +31,19 @@
 block discarded – undo
 
 class AddClenupLoginFlowV2BackgroundJob implements IRepairStep {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IJobList $jobList) {
-		$this->jobList = $jobList;
-	}
+    public function __construct(IJobList $jobList) {
+        $this->jobList = $jobList;
+    }
 
-	public function getName(): string {
-		return 'Add background job to cleanup login flow v2 tokens';
-	}
+    public function getName(): string {
+        return 'Add background job to cleanup login flow v2 tokens';
+    }
 
-	public function run(IOutput $output) {
-		$this->jobList->add(CleanupLoginFlowV2::class);
-	}
+    public function run(IOutput $output) {
+        $this->jobList->add(CleanupLoginFlowV2::class);
+    }
 
 }

Please login to merge, or discard this patch.

core/Data/LoginFlowV2Credentials.php 1 patch

Indentation +36 added lines, -36 removed lines patch added patch discarded remove patch

@@ -25,47 +25,47 @@
 block discarded – undo
 namespace OC\Core\Data;
 
 class LoginFlowV2Credentials implements \JsonSerializable {
-	/** @var string */
-	private $server;
-	/** @var string */
-	private $loginName;
-	/** @var string */
-	private $appPassword;
+    /** @var string */
+    private $server;
+    /** @var string */
+    private $loginName;
+    /** @var string */
+    private $appPassword;
 
-	public function __construct(string $server, string $loginName, string $appPassword) {
-		$this->server = $server;
-		$this->loginName = $loginName;
-		$this->appPassword = $appPassword;
-	}
+    public function __construct(string $server, string $loginName, string $appPassword) {
+        $this->server = $server;
+        $this->loginName = $loginName;
+        $this->appPassword = $appPassword;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getServer(): string {
-		return $this->server;
-	}
+    /**
+     * @return string
+     */
+    public function getServer(): string {
+        return $this->server;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getLoginName(): string {
-		return $this->loginName;
-	}
+    /**
+     * @return string
+     */
+    public function getLoginName(): string {
+        return $this->loginName;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getAppPassword(): string {
-		return $this->appPassword;
-	}
+    /**
+     * @return string
+     */
+    public function getAppPassword(): string {
+        return $this->appPassword;
+    }
 
-	public function jsonSerialize(): array {
-		return [
-			'server' => $this->server,
-			'loginName' => $this->loginName,
-			'appPassword' => $this->appPassword,
-		];
-	}
+    public function jsonSerialize(): array {
+        return [
+            'server' => $this->server,
+            'loginName' => $this->loginName,
+            'appPassword' => $this->appPassword,
+        ];
+    }
 
 
 }

Please login to merge, or discard this patch.

core/Db/LoginFlowV2.php 1 patch

Indentation +32 added lines, -32 removed lines patch added patch discarded remove patch

@@ -49,37 +49,37 @@
 block discarded – undo
  * @method void setAppPassword(string $appPassword)
  */
 class LoginFlowV2 extends Entity {
-	/** @var int */
-	protected $timestamp;
-	/** @var int */
-	protected $started;
-	/** @var string */
-	protected $pollToken;
-	/** @var string */
-	protected $loginToken;
-	/** @var string */
-	protected $publicKey;
-	/** @var string */
-	protected $privateKey;
-	/** @var string */
-	protected $clientName;
-	/** @var string */
-	protected $loginName;
-	/** @var string */
-	protected $server;
-	/** @var string */
-	protected $appPassword;
+    /** @var int */
+    protected $timestamp;
+    /** @var int */
+    protected $started;
+    /** @var string */
+    protected $pollToken;
+    /** @var string */
+    protected $loginToken;
+    /** @var string */
+    protected $publicKey;
+    /** @var string */
+    protected $privateKey;
+    /** @var string */
+    protected $clientName;
+    /** @var string */
+    protected $loginName;
+    /** @var string */
+    protected $server;
+    /** @var string */
+    protected $appPassword;
 
-	public function __construct() {
-		$this->addType('timestamp', 'int');
-		$this->addType('started', 'int');
-		$this->addType('pollToken', 'string');
-		$this->addType('loginToken', 'string');
-		$this->addType('publicKey', 'string');
-		$this->addType('privateKey', 'string');
-		$this->addType('clientName', 'string');
-		$this->addType('loginName', 'string');
-		$this->addType('server', 'string');
-		$this->addType('appPassword', 'string');
-	}
+    public function __construct() {
+        $this->addType('timestamp', 'int');
+        $this->addType('started', 'int');
+        $this->addType('pollToken', 'string');
+        $this->addType('loginToken', 'string');
+        $this->addType('publicKey', 'string');
+        $this->addType('privateKey', 'string');
+        $this->addType('clientName', 'string');
+        $this->addType('loginName', 'string');
+        $this->addType('server', 'string');
+        $this->addType('appPassword', 'string');
+    }
 }

Please login to merge, or discard this patch.

core/Db/LoginFlowV2Mapper.php 1 patch

Indentation +57 added lines, -57 removed lines patch added patch discarded remove patch

@@ -30,71 +30,71 @@
 block discarded – undo
 use OCP\IDBConnection;
 
 class LoginFlowV2Mapper extends QBMapper {
-	private const lifetime = 1200;
+    private const lifetime = 1200;
 
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
-		parent::__construct($db, 'login_flow_v2', LoginFlowV2::class);
-		$this->timeFactory = $timeFactory;
-	}
+    public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
+        parent::__construct($db, 'login_flow_v2', LoginFlowV2::class);
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @param string $pollToken
-	 * @return LoginFlowV2
-	 * @throws DoesNotExistException
-	 */
-	public function getByPollToken(string $pollToken): LoginFlowV2 {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->getTableName())
-			->where(
-				$qb->expr()->eq('poll_token', $qb->createNamedParameter($pollToken))
-			);
+    /**
+     * @param string $pollToken
+     * @return LoginFlowV2
+     * @throws DoesNotExistException
+     */
+    public function getByPollToken(string $pollToken): LoginFlowV2 {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where(
+                $qb->expr()->eq('poll_token', $qb->createNamedParameter($pollToken))
+            );
 
-		$entity = $this->findEntity($qb);
-		return $this->validateTimestamp($entity);
-	}
+        $entity = $this->findEntity($qb);
+        return $this->validateTimestamp($entity);
+    }
 
-	/**
-	 * @param string $loginToken
-	 * @return LoginFlowV2
-	 * @throws DoesNotExistException
-	 */
-	public function getByLoginToken(string $loginToken): LoginFlowV2 {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->getTableName())
-			->where(
-				$qb->expr()->eq('login_token', $qb->createNamedParameter($loginToken))
-			);
+    /**
+     * @param string $loginToken
+     * @return LoginFlowV2
+     * @throws DoesNotExistException
+     */
+    public function getByLoginToken(string $loginToken): LoginFlowV2 {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where(
+                $qb->expr()->eq('login_token', $qb->createNamedParameter($loginToken))
+            );
 
-		$entity = $this->findEntity($qb);
-		return $this->validateTimestamp($entity);
-	}
+        $entity = $this->findEntity($qb);
+        return $this->validateTimestamp($entity);
+    }
 
-	public function cleanup(): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->getTableName())
-			->where(
-				$qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
-			);
+    public function cleanup(): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->getTableName())
+            ->where(
+                $qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
+            );
 
-		$qb->execute();
-	}
+        $qb->execute();
+    }
 
-	/**
-	 * @param LoginFlowV2 $flowV2
-	 * @return LoginFlowV2
-	 * @throws DoesNotExistException
-	 */
-	private function validateTimestamp(LoginFlowV2 $flowV2): LoginFlowV2 {
-		if ($flowV2->getTimestamp() < ($this->timeFactory->getTime() - self::lifetime)) {
-			$this->delete($flowV2);
-			throw new DoesNotExistException('Token expired');
-		}
+    /**
+     * @param LoginFlowV2 $flowV2
+     * @return LoginFlowV2
+     * @throws DoesNotExistException
+     */
+    private function validateTimestamp(LoginFlowV2 $flowV2): LoginFlowV2 {
+        if ($flowV2->getTimestamp() < ($this->timeFactory->getTime() - self::lifetime)) {
+            $this->delete($flowV2);
+            throw new DoesNotExistException('Token expired');
+        }
 
-		return $flowV2;
-	}
+        return $flowV2;
+    }
 }

Please login to merge, or discard this patch.

lib/public/Group/Backend/IHideFromCollaborationBackend.php 1 patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -27,12 +27,12 @@
 block discarded – undo
  * Allow the backend to mark groups to be excluded from being shown in search dialogs
  */
 interface IHideFromCollaborationBackend {
-	/**
-	 * Check if a group should be hidden from search dialogs
-	 *
-	 * @param string $groupId
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function hideGroup(string $groupId): bool;
+    /**
+     * Check if a group should be hidden from search dialogs
+     *
+     * @param string $groupId
+     * @return bool
+     * @since 16.0.0
+     */
+    public function hideGroup(string $groupId): bool;
 }

Please login to merge, or discard this patch.

lib/public/Collaboration/AutoComplete/AutoCompleteEvent.php 1 patch

Indentation +57 added lines, -57 removed lines patch added patch discarded remove patch

@@ -30,70 +30,70 @@
 block discarded – undo
  */
 class AutoCompleteEvent extends GenericEvent {
 
-	/**
-	 * @param array $arguments
-	 * @since 16.0.0
-	 */
-	public function __construct(array $arguments) {
-		parent::__construct(null, $arguments);
-	}
+    /**
+     * @param array $arguments
+     * @since 16.0.0
+     */
+    public function __construct(array $arguments) {
+        parent::__construct(null, $arguments);
+    }
 
-	/**
-	 * @since 16.0.0
-	 */
-	public function getResults(): array {
-		return $this->getArgument('results');
-	}
+    /**
+     * @since 16.0.0
+     */
+    public function getResults(): array {
+        return $this->getArgument('results');
+    }
 
-	/**
-	 * @param array $results
-	 * @since 16.0.0
-	 */
-	public function setResults(array $results): void {
-		$this->setArgument('results', $results);
-	}
+    /**
+     * @param array $results
+     * @since 16.0.0
+     */
+    public function setResults(array $results): void {
+        $this->setArgument('results', $results);
+    }
 
-	/**
-	 * @since 16.0.0
-	 */
-	public function getSearchTerm(): string {
-		return $this->getArgument('search');
-	}
+    /**
+     * @since 16.0.0
+     */
+    public function getSearchTerm(): string {
+        return $this->getArgument('search');
+    }
 
-	/**
-	 * @return int[]
-	 * @since 16.0.0
-	 */
-	public function getShareTypes(): array {
-		return $this->getArgument('shareTypes');
-	}
+    /**
+     * @return int[]
+     * @since 16.0.0
+     */
+    public function getShareTypes(): array {
+        return $this->getArgument('shareTypes');
+    }
 
-	/**
-	 * @since 16.0.0
-	 */
-	public function getItemType(): string {
-		return $this->getArgument('itemType');
-	}
+    /**
+     * @since 16.0.0
+     */
+    public function getItemType(): string {
+        return $this->getArgument('itemType');
+    }
 
-	/**
-	 * @since 16.0.0
-	 */
-	public function getItemId(): string {
-		return $this->getArgument('itemId');
-	}
+    /**
+     * @since 16.0.0
+     */
+    public function getItemId(): string {
+        return $this->getArgument('itemId');
+    }
 
-	/**
-	 * @since 16.0.0
-	 */
-	public function getSorter(): string {
-		return $this->getArgument('sorter');
-	}
+    /**
+     * @since 16.0.0
+     */
+    public function getSorter(): string {
+        return $this->getArgument('sorter');
+    }
 
-	/**
-	 * @since 16.0.0
-	 */
-	public function getLimit(): int {
-		return $this->getArgument('limit');
-	}
+    /**
+     * @since 16.0.0
+     */
+    public function getLimit(): int {
+        return $this->getArgument('limit');
+    }
 
 }

Please login to merge, or discard this patch.

lib/private/Files/Node/NonExistingFile.php 1 patch

Indentation +115 added lines, -115 removed lines patch added patch discarded remove patch

@@ -26,119 +26,119 @@
 block discarded – undo
 use OCP\Files\NotFoundException;
 
 class NonExistingFile extends File {
-	/**
-	 * @param string $newPath
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function rename($newPath) {
-		throw new NotFoundException();
-	}
-
-	public function delete() {
-		throw new NotFoundException();
-	}
-
-	public function copy($newPath) {
-		throw new NotFoundException();
-	}
-
-	public function touch($mtime = null) {
-		throw new NotFoundException();
-	}
-
-	public function getId() {
-		if ($this->fileInfo) {
-			return parent::getId();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function stat() {
-		throw new NotFoundException();
-	}
-
-	public function getMTime() {
-		if ($this->fileInfo) {
-			return parent::getMTime();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getSize($includeMounts = true) {
-		if ($this->fileInfo) {
-			return parent::getSize($includeMounts);
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getEtag() {
-		if ($this->fileInfo) {
-			return parent::getEtag();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getPermissions() {
-		if ($this->fileInfo) {
-			return parent::getPermissions();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isReadable() {
-		if ($this->fileInfo) {
-			return parent::isReadable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isUpdateable() {
-		if ($this->fileInfo) {
-			return parent::isUpdateable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isDeletable() {
-		if ($this->fileInfo) {
-			return parent::isDeletable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isShareable() {
-		if ($this->fileInfo) {
-			return parent::isShareable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getContent() {
-		throw new NotFoundException();
-	}
-
-	public function putContent($data) {
-		throw new NotFoundException();
-	}
-
-	public function getMimeType() {
-		if ($this->fileInfo) {
-			return parent::getMimeType();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function fopen($mode) {
-		throw new NotFoundException();
-	}
+    /**
+     * @param string $newPath
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function rename($newPath) {
+        throw new NotFoundException();
+    }
+
+    public function delete() {
+        throw new NotFoundException();
+    }
+
+    public function copy($newPath) {
+        throw new NotFoundException();
+    }
+
+    public function touch($mtime = null) {
+        throw new NotFoundException();
+    }
+
+    public function getId() {
+        if ($this->fileInfo) {
+            return parent::getId();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function stat() {
+        throw new NotFoundException();
+    }
+
+    public function getMTime() {
+        if ($this->fileInfo) {
+            return parent::getMTime();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getSize($includeMounts = true) {
+        if ($this->fileInfo) {
+            return parent::getSize($includeMounts);
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getEtag() {
+        if ($this->fileInfo) {
+            return parent::getEtag();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getPermissions() {
+        if ($this->fileInfo) {
+            return parent::getPermissions();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isReadable() {
+        if ($this->fileInfo) {
+            return parent::isReadable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isUpdateable() {
+        if ($this->fileInfo) {
+            return parent::isUpdateable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isDeletable() {
+        if ($this->fileInfo) {
+            return parent::isDeletable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isShareable() {
+        if ($this->fileInfo) {
+            return parent::isShareable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getContent() {
+        throw new NotFoundException();
+    }
+
+    public function putContent($data) {
+        throw new NotFoundException();
+    }
+
+    public function getMimeType() {
+        if ($this->fileInfo) {
+            return parent::getMimeType();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function fopen($mode) {
+        throw new NotFoundException();
+    }
 }

Please login to merge, or discard this patch.

lib/public/Collaboration/Resources/ICollection.php 1 patch

Indentation +43 added lines, -43 removed lines patch added patch discarded remove patch

@@ -29,53 +29,53 @@
 block discarded – undo
  */
 interface ICollection {
 
-	/**
-	 * @return int
-	 * @since 16.0.0
-	 */
-	public function getId(): int;
+    /**
+     * @return int
+     * @since 16.0.0
+     */
+    public function getId(): int;
 
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getName(): string;
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getName(): string;
 
-	/**
-	 * @param string $name
-	 * @since 16.0.0
-	 */
-	public function setName(string $name): void;
+    /**
+     * @param string $name
+     * @since 16.0.0
+     */
+    public function setName(string $name): void;
 
-	/**
-	 * @return IResource[]
-	 * @since 16.0.0
-	 */
-	public function getResources(): array;
+    /**
+     * @return IResource[]
+     * @since 16.0.0
+     */
+    public function getResources(): array;
 
-	/**
-	 * Adds a resource to a collection
-	 *
-	 * @param IResource $resource
-	 * @throws ResourceException when the resource is already part of the collection
-	 * @since 16.0.0
-	 */
-	public function addResource(IResource $resource): void;
+    /**
+     * Adds a resource to a collection
+     *
+     * @param IResource $resource
+     * @throws ResourceException when the resource is already part of the collection
+     * @since 16.0.0
+     */
+    public function addResource(IResource $resource): void;
 
-	/**
-	 * Removes a resource from a collection
-	 *
-	 * @param IResource $resource
-	 * @since 16.0.0
-	 */
-	public function removeResource(IResource $resource): void;
+    /**
+     * Removes a resource from a collection
+     *
+     * @param IResource $resource
+     * @since 16.0.0
+     */
+    public function removeResource(IResource $resource): void;
 
-	/**
-	 * Can a user/guest access the collection
-	 *
-	 * @param IUser|null $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccess(?IUser $user): bool;
+    /**
+     * Can a user/guest access the collection
+     *
+     * @param IUser|null $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccess(?IUser $user): bool;
 }

Please login to merge, or discard this patch.

		@@ -28,38 +28,38 @@
		block discarded – undo
28	28
29	29	class Capabilities implements ICapability {
30	30
31		- /** @var IURLGenerator */
32		- private $urlGenerator;
	31	+ /** @var IURLGenerator */
	32	+ private $urlGenerator;
33	33
34		- public function __construct(IURLGenerator $urlGenerator) {
35		- $this->urlGenerator = $urlGenerator;
36		- }
	34	+ public function __construct(IURLGenerator $urlGenerator) {
	35	+ $this->urlGenerator = $urlGenerator;
	36	+ }
37	37
38		- /**
39		- * Function an app uses to return the capabilities
40		- *
41		- * @return array Array containing the apps capabilities
42		- * @since 8.2.0
43		- */
44		- public function getCapabilities() {
45		- $url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
46		- $capabilities = ['ocm' =>
47		- [
48		- 'enabled' => true,
49		- 'apiVersion' => '1.0-proposal1',
50		- 'endPoint' => substr($url, 0, strrpos($url, '/')),
51		- 'resourceTypes' => [
52		- [
53		- 'name' => 'file',
54		- 'shareTypes' => ['user', 'group'],
55		- 'protocols' => [
56		- 'webdav' => '/public.php/webdav/',
57		- ]
58		- ],
59		- ]
60		- ]
61		- ];
	38	+ /**
	39	+ * Function an app uses to return the capabilities
	40	+ *
	41	+ * @return array Array containing the apps capabilities
	42	+ * @since 8.2.0
	43	+ */
	44	+ public function getCapabilities() {
	45	+ $url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
	46	+ $capabilities = ['ocm' =>
	47	+ [
	48	+ 'enabled' => true,
	49	+ 'apiVersion' => '1.0-proposal1',
	50	+ 'endPoint' => substr($url, 0, strrpos($url, '/')),
	51	+ 'resourceTypes' => [
	52	+ [
	53	+ 'name' => 'file',
	54	+ 'shareTypes' => ['user', 'group'],
	55	+ 'protocols' => [
	56	+ 'webdav' => '/public.php/webdav/',
	57	+ ]
	58	+ ],
	59	+ ]
	60	+ ]
	61	+ ];
62	62
63		- return $capabilities;
64		- }
	63	+ return $capabilities;
	64	+ }
65	65	}

		@@ -31,19 +31,19 @@
		block discarded – undo
31	31
32	32	class AddClenupLoginFlowV2BackgroundJob implements IRepairStep {
33	33
34		- /** @var IJobList */
35		- private $jobList;
	34	+ /** @var IJobList */
	35	+ private $jobList;
36	36
37		- public function __construct(IJobList $jobList) {
38		- $this->jobList = $jobList;
39		- }
	37	+ public function __construct(IJobList $jobList) {
	38	+ $this->jobList = $jobList;
	39	+ }
40	40
41		- public function getName(): string {
42		- return 'Add background job to cleanup login flow v2 tokens';
43		- }
	41	+ public function getName(): string {
	42	+ return 'Add background job to cleanup login flow v2 tokens';
	43	+ }
44	44
45		- public function run(IOutput $output) {
46		- $this->jobList->add(CleanupLoginFlowV2::class);
47		- }
	45	+ public function run(IOutput $output) {
	46	+ $this->jobList->add(CleanupLoginFlowV2::class);
	47	+ }
48	48
49	49	}

		@@ -25,47 +25,47 @@
		block discarded – undo
25	25	namespace OC\Core\Data;
26	26
27	27	class LoginFlowV2Credentials implements \JsonSerializable {
28		- /** @var string */
29		- private $server;
30		- /** @var string */
31		- private $loginName;
32		- /** @var string */
33		- private $appPassword;
	28	+ /** @var string */
	29	+ private $server;
	30	+ /** @var string */
	31	+ private $loginName;
	32	+ /** @var string */
	33	+ private $appPassword;
34	34
35		- public function __construct(string $server, string $loginName, string $appPassword) {
36		- $this->server = $server;
37		- $this->loginName = $loginName;
38		- $this->appPassword = $appPassword;
39		- }
	35	+ public function __construct(string $server, string $loginName, string $appPassword) {
	36	+ $this->server = $server;
	37	+ $this->loginName = $loginName;
	38	+ $this->appPassword = $appPassword;
	39	+ }
40	40
41		- /**
42		- * @return string
43		- */
44		- public function getServer(): string {
45		- return $this->server;
46		- }
	41	+ /**
	42	+ * @return string
	43	+ */
	44	+ public function getServer(): string {
	45	+ return $this->server;
	46	+ }
47	47
48		- /**
49		- * @return string
50		- */
51		- public function getLoginName(): string {
52		- return $this->loginName;
53		- }
	48	+ /**
	49	+ * @return string
	50	+ */
	51	+ public function getLoginName(): string {
	52	+ return $this->loginName;
	53	+ }
54	54
55		- /**
56		- * @return string
57		- */
58		- public function getAppPassword(): string {
59		- return $this->appPassword;
60		- }
	55	+ /**
	56	+ * @return string
	57	+ */
	58	+ public function getAppPassword(): string {
	59	+ return $this->appPassword;
	60	+ }
61	61
62		- public function jsonSerialize(): array {
63		- return [
64		- 'server' => $this->server,
65		- 'loginName' => $this->loginName,
66		- 'appPassword' => $this->appPassword,
67		- ];
68		- }
	62	+ public function jsonSerialize(): array {
	63	+ return [
	64	+ 'server' => $this->server,
	65	+ 'loginName' => $this->loginName,
	66	+ 'appPassword' => $this->appPassword,
	67	+ ];
	68	+ }
69	69
70	70
71	71	}

		@@ -49,37 +49,37 @@
		block discarded – undo
49	49	* @method void setAppPassword(string $appPassword)
50	50	*/
51	51	class LoginFlowV2 extends Entity {
52		- /** @var int */
53		- protected $timestamp;
54		- /** @var int */
55		- protected $started;
56		- /** @var string */
57		- protected $pollToken;
58		- /** @var string */
59		- protected $loginToken;
60		- /** @var string */
61		- protected $publicKey;
62		- /** @var string */
63		- protected $privateKey;
64		- /** @var string */
65		- protected $clientName;
66		- /** @var string */
67		- protected $loginName;
68		- /** @var string */
69		- protected $server;
70		- /** @var string */
71		- protected $appPassword;
	52	+ /** @var int */
	53	+ protected $timestamp;
	54	+ /** @var int */
	55	+ protected $started;
	56	+ /** @var string */
	57	+ protected $pollToken;
	58	+ /** @var string */
	59	+ protected $loginToken;
	60	+ /** @var string */
	61	+ protected $publicKey;
	62	+ /** @var string */
	63	+ protected $privateKey;
	64	+ /** @var string */
	65	+ protected $clientName;
	66	+ /** @var string */
	67	+ protected $loginName;
	68	+ /** @var string */
	69	+ protected $server;
	70	+ /** @var string */
	71	+ protected $appPassword;
72	72
73		- public function __construct() {
74		- $this->addType('timestamp', 'int');
75		- $this->addType('started', 'int');
76		- $this->addType('pollToken', 'string');
77		- $this->addType('loginToken', 'string');
78		- $this->addType('publicKey', 'string');
79		- $this->addType('privateKey', 'string');
80		- $this->addType('clientName', 'string');
81		- $this->addType('loginName', 'string');
82		- $this->addType('server', 'string');
83		- $this->addType('appPassword', 'string');
84		- }
	73	+ public function __construct() {
	74	+ $this->addType('timestamp', 'int');
	75	+ $this->addType('started', 'int');
	76	+ $this->addType('pollToken', 'string');
	77	+ $this->addType('loginToken', 'string');
	78	+ $this->addType('publicKey', 'string');
	79	+ $this->addType('privateKey', 'string');
	80	+ $this->addType('clientName', 'string');
	81	+ $this->addType('loginName', 'string');
	82	+ $this->addType('server', 'string');
	83	+ $this->addType('appPassword', 'string');
	84	+ }
85	85	}

		@@ -30,71 +30,71 @@
		block discarded – undo
30	30	use OCP\IDBConnection;
31	31
32	32	class LoginFlowV2Mapper extends QBMapper {
33		- private const lifetime = 1200;
	33	+ private const lifetime = 1200;
34	34
35		- /** @var ITimeFactory */
36		- private $timeFactory;
	35	+ /** @var ITimeFactory */
	36	+ private $timeFactory;
37	37
38		- public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
39		- parent::__construct($db, 'login_flow_v2', LoginFlowV2::class);
40		- $this->timeFactory = $timeFactory;
41		- }
	38	+ public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
	39	+ parent::__construct($db, 'login_flow_v2', LoginFlowV2::class);
	40	+ $this->timeFactory = $timeFactory;
	41	+ }
42	42
43		- /**
44		- * @param string $pollToken
45		- * @return LoginFlowV2
46		- * @throws DoesNotExistException
47		- */
48		- public function getByPollToken(string $pollToken): LoginFlowV2 {
49		- $qb = $this->db->getQueryBuilder();
50		- $qb->select('*')
51		- ->from($this->getTableName())
52		- ->where(
53		- $qb->expr()->eq('poll_token', $qb->createNamedParameter($pollToken))
54		- );
	43	+ /**
	44	+ * @param string $pollToken
	45	+ * @return LoginFlowV2
	46	+ * @throws DoesNotExistException
	47	+ */
	48	+ public function getByPollToken(string $pollToken): LoginFlowV2 {
	49	+ $qb = $this->db->getQueryBuilder();
	50	+ $qb->select('*')
	51	+ ->from($this->getTableName())
	52	+ ->where(
	53	+ $qb->expr()->eq('poll_token', $qb->createNamedParameter($pollToken))
	54	+ );
55	55
56		- $entity = $this->findEntity($qb);
57		- return $this->validateTimestamp($entity);
58		- }
	56	+ $entity = $this->findEntity($qb);
	57	+ return $this->validateTimestamp($entity);
	58	+ }
59	59
60		- /**
61		- * @param string $loginToken
62		- * @return LoginFlowV2
63		- * @throws DoesNotExistException
64		- */
65		- public function getByLoginToken(string $loginToken): LoginFlowV2 {
66		- $qb = $this->db->getQueryBuilder();
67		- $qb->select('*')
68		- ->from($this->getTableName())
69		- ->where(
70		- $qb->expr()->eq('login_token', $qb->createNamedParameter($loginToken))
71		- );
	60	+ /**
	61	+ * @param string $loginToken
	62	+ * @return LoginFlowV2
	63	+ * @throws DoesNotExistException
	64	+ */
	65	+ public function getByLoginToken(string $loginToken): LoginFlowV2 {
	66	+ $qb = $this->db->getQueryBuilder();
	67	+ $qb->select('*')
	68	+ ->from($this->getTableName())
	69	+ ->where(
	70	+ $qb->expr()->eq('login_token', $qb->createNamedParameter($loginToken))
	71	+ );
72	72
73		- $entity = $this->findEntity($qb);
74		- return $this->validateTimestamp($entity);
75		- }
	73	+ $entity = $this->findEntity($qb);
	74	+ return $this->validateTimestamp($entity);
	75	+ }
76	76
77		- public function cleanup(): void {
78		- $qb = $this->db->getQueryBuilder();
79		- $qb->delete($this->getTableName())
80		- ->where(
81		- $qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
82		- );
	77	+ public function cleanup(): void {
	78	+ $qb = $this->db->getQueryBuilder();
	79	+ $qb->delete($this->getTableName())
	80	+ ->where(
	81	+ $qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
	82	+ );
83	83
84		- $qb->execute();
85		- }
	84	+ $qb->execute();
	85	+ }
86	86
87		- /**
88		- * @param LoginFlowV2 $flowV2
89		- * @return LoginFlowV2
90		- * @throws DoesNotExistException
91		- */
92		- private function validateTimestamp(LoginFlowV2 $flowV2): LoginFlowV2 {
93		- if ($flowV2->getTimestamp() < ($this->timeFactory->getTime() - self::lifetime)) {
94		- $this->delete($flowV2);
95		- throw new DoesNotExistException('Token expired');
96		- }
	87	+ /**
	88	+ * @param LoginFlowV2 $flowV2
	89	+ * @return LoginFlowV2
	90	+ * @throws DoesNotExistException
	91	+ */
	92	+ private function validateTimestamp(LoginFlowV2 $flowV2): LoginFlowV2 {
	93	+ if ($flowV2->getTimestamp() < ($this->timeFactory->getTime() - self::lifetime)) {
	94	+ $this->delete($flowV2);
	95	+ throw new DoesNotExistException('Token expired');
	96	+ }
97	97
98		- return $flowV2;
99		- }
	98	+ return $flowV2;
	99	+ }
100	100	}

		@@ -27,12 +27,12 @@
		block discarded – undo
27	27	* Allow the backend to mark groups to be excluded from being shown in search dialogs
28	28	*/
29	29	interface IHideFromCollaborationBackend {
30		- /**
31		- * Check if a group should be hidden from search dialogs
32		- *
33		- * @param string $groupId
34		- * @return bool
35		- * @since 16.0.0
36		- */
37		- public function hideGroup(string $groupId): bool;
	30	+ /**
	31	+ * Check if a group should be hidden from search dialogs
	32	+ *
	33	+ * @param string $groupId
	34	+ * @return bool
	35	+ * @since 16.0.0
	36	+ */
	37	+ public function hideGroup(string $groupId): bool;
38	38	}

		@@ -30,70 +30,70 @@
		block discarded – undo
30	30	*/
31	31	class AutoCompleteEvent extends GenericEvent {
32	32
33		- /**
34		- * @param array $arguments
35		- * @since 16.0.0
36		- */
37		- public function __construct(array $arguments) {
38		- parent::__construct(null, $arguments);
39		- }
	33	+ /**
	34	+ * @param array $arguments
	35	+ * @since 16.0.0
	36	+ */
	37	+ public function __construct(array $arguments) {
	38	+ parent::__construct(null, $arguments);
	39	+ }
40	40
41		- /**
42		- * @since 16.0.0
43		- */
44		- public function getResults(): array {
45		- return $this->getArgument('results');
46		- }
	41	+ /**
	42	+ * @since 16.0.0
	43	+ */
	44	+ public function getResults(): array {
	45	+ return $this->getArgument('results');
	46	+ }
47	47
48		- /**
49		- * @param array $results
50		- * @since 16.0.0
51		- */
52		- public function setResults(array $results): void {
53		- $this->setArgument('results', $results);
54		- }
	48	+ /**
	49	+ * @param array $results
	50	+ * @since 16.0.0
	51	+ */
	52	+ public function setResults(array $results): void {
	53	+ $this->setArgument('results', $results);
	54	+ }
55	55
56		- /**
57		- * @since 16.0.0
58		- */
59		- public function getSearchTerm(): string {
60		- return $this->getArgument('search');
61		- }
	56	+ /**
	57	+ * @since 16.0.0
	58	+ */
	59	+ public function getSearchTerm(): string {
	60	+ return $this->getArgument('search');
	61	+ }
62	62
63		- /**
64		- * @return int[]
65		- * @since 16.0.0
66		- */
67		- public function getShareTypes(): array {
68		- return $this->getArgument('shareTypes');
69		- }
	63	+ /**
	64	+ * @return int[]
	65	+ * @since 16.0.0
	66	+ */
	67	+ public function getShareTypes(): array {
	68	+ return $this->getArgument('shareTypes');
	69	+ }
70	70
71		- /**
72		- * @since 16.0.0
73		- */
74		- public function getItemType(): string {
75		- return $this->getArgument('itemType');
76		- }
	71	+ /**
	72	+ * @since 16.0.0
	73	+ */
	74	+ public function getItemType(): string {
	75	+ return $this->getArgument('itemType');
	76	+ }
77	77
78		- /**
79		- * @since 16.0.0
80		- */
81		- public function getItemId(): string {
82		- return $this->getArgument('itemId');
83		- }
	78	+ /**
	79	+ * @since 16.0.0
	80	+ */
	81	+ public function getItemId(): string {
	82	+ return $this->getArgument('itemId');
	83	+ }
84	84
85		- /**
86		- * @since 16.0.0
87		- */
88		- public function getSorter(): string {
89		- return $this->getArgument('sorter');
90		- }
	85	+ /**
	86	+ * @since 16.0.0
	87	+ */
	88	+ public function getSorter(): string {
	89	+ return $this->getArgument('sorter');
	90	+ }
91	91
92		- /**
93		- * @since 16.0.0
94		- */
95		- public function getLimit(): int {
96		- return $this->getArgument('limit');
97		- }
	92	+ /**
	93	+ * @since 16.0.0
	94	+ */
	95	+ public function getLimit(): int {
	96	+ return $this->getArgument('limit');
	97	+ }
98	98
99	99	}

		@@ -26,119 +26,119 @@
		block discarded – undo
26	26	use OCP\Files\NotFoundException;
27	27
28	28	class NonExistingFile extends File {
29		- /**
30		- * @param string $newPath
31		- * @throws \OCP\Files\NotFoundException
32		- */
33		- public function rename($newPath) {
34		- throw new NotFoundException();
35		- }
36		-
37		- public function delete() {
38		- throw new NotFoundException();
39		- }
40		-
41		- public function copy($newPath) {
42		- throw new NotFoundException();
43		- }
44		-
45		- public function touch($mtime = null) {
46		- throw new NotFoundException();
47		- }
48		-
49		- public function getId() {
50		- if ($this->fileInfo) {
51		- return parent::getId();
52		- } else {
53		- throw new NotFoundException();
54		- }
55		- }
56		-
57		- public function stat() {
58		- throw new NotFoundException();
59		- }
60		-
61		- public function getMTime() {
62		- if ($this->fileInfo) {
63		- return parent::getMTime();
64		- } else {
65		- throw new NotFoundException();
66		- }
67		- }
68		-
69		- public function getSize($includeMounts = true) {
70		- if ($this->fileInfo) {
71		- return parent::getSize($includeMounts);
72		- } else {
73		- throw new NotFoundException();
74		- }
75		- }
76		-
77		- public function getEtag() {
78		- if ($this->fileInfo) {
79		- return parent::getEtag();
80		- } else {
81		- throw new NotFoundException();
82		- }
83		- }
84		-
85		- public function getPermissions() {
86		- if ($this->fileInfo) {
87		- return parent::getPermissions();
88		- } else {
89		- throw new NotFoundException();
90		- }
91		- }
92		-
93		- public function isReadable() {
94		- if ($this->fileInfo) {
95		- return parent::isReadable();
96		- } else {
97		- throw new NotFoundException();
98		- }
99		- }
100		-
101		- public function isUpdateable() {
102		- if ($this->fileInfo) {
103		- return parent::isUpdateable();
104		- } else {
105		- throw new NotFoundException();
106		- }
107		- }
108		-
109		- public function isDeletable() {
110		- if ($this->fileInfo) {
111		- return parent::isDeletable();
112		- } else {
113		- throw new NotFoundException();
114		- }
115		- }
116		-
117		- public function isShareable() {
118		- if ($this->fileInfo) {
119		- return parent::isShareable();
120		- } else {
121		- throw new NotFoundException();
122		- }
123		- }
124		-
125		- public function getContent() {
126		- throw new NotFoundException();
127		- }
128		-
129		- public function putContent($data) {
130		- throw new NotFoundException();
131		- }
132		-
133		- public function getMimeType() {
134		- if ($this->fileInfo) {
135		- return parent::getMimeType();
136		- } else {
137		- throw new NotFoundException();
138		- }
139		- }
140		-
141		- public function fopen($mode) {
142		- throw new NotFoundException();
143		- }
	29	+ /**
	30	+ * @param string $newPath
	31	+ * @throws \OCP\Files\NotFoundException
	32	+ */
	33	+ public function rename($newPath) {
	34	+ throw new NotFoundException();
	35	+ }
	36	+
	37	+ public function delete() {
	38	+ throw new NotFoundException();
	39	+ }
	40	+
	41	+ public function copy($newPath) {
	42	+ throw new NotFoundException();
	43	+ }
	44	+
	45	+ public function touch($mtime = null) {
	46	+ throw new NotFoundException();
	47	+ }
	48	+
	49	+ public function getId() {
	50	+ if ($this->fileInfo) {
	51	+ return parent::getId();
	52	+ } else {
	53	+ throw new NotFoundException();
	54	+ }
	55	+ }
	56	+
	57	+ public function stat() {
	58	+ throw new NotFoundException();
	59	+ }
	60	+
	61	+ public function getMTime() {
	62	+ if ($this->fileInfo) {
	63	+ return parent::getMTime();
	64	+ } else {
	65	+ throw new NotFoundException();
	66	+ }
	67	+ }
	68	+
	69	+ public function getSize($includeMounts = true) {
	70	+ if ($this->fileInfo) {
	71	+ return parent::getSize($includeMounts);
	72	+ } else {
	73	+ throw new NotFoundException();
	74	+ }
	75	+ }
	76	+
	77	+ public function getEtag() {
	78	+ if ($this->fileInfo) {
	79	+ return parent::getEtag();
	80	+ } else {
	81	+ throw new NotFoundException();
	82	+ }
	83	+ }
	84	+
	85	+ public function getPermissions() {
	86	+ if ($this->fileInfo) {
	87	+ return parent::getPermissions();
	88	+ } else {
	89	+ throw new NotFoundException();
	90	+ }
	91	+ }
	92	+
	93	+ public function isReadable() {
	94	+ if ($this->fileInfo) {
	95	+ return parent::isReadable();
	96	+ } else {
	97	+ throw new NotFoundException();
	98	+ }
	99	+ }
	100	+
	101	+ public function isUpdateable() {
	102	+ if ($this->fileInfo) {
	103	+ return parent::isUpdateable();
	104	+ } else {
	105	+ throw new NotFoundException();
	106	+ }
	107	+ }
	108	+
	109	+ public function isDeletable() {
	110	+ if ($this->fileInfo) {
	111	+ return parent::isDeletable();
	112	+ } else {
	113	+ throw new NotFoundException();
	114	+ }
	115	+ }
	116	+
	117	+ public function isShareable() {
	118	+ if ($this->fileInfo) {
	119	+ return parent::isShareable();
	120	+ } else {
	121	+ throw new NotFoundException();
	122	+ }
	123	+ }
	124	+
	125	+ public function getContent() {
	126	+ throw new NotFoundException();
	127	+ }
	128	+
	129	+ public function putContent($data) {
	130	+ throw new NotFoundException();
	131	+ }
	132	+
	133	+ public function getMimeType() {
	134	+ if ($this->fileInfo) {
	135	+ return parent::getMimeType();
	136	+ } else {
	137	+ throw new NotFoundException();
	138	+ }
	139	+ }
	140	+
	141	+ public function fopen($mode) {
	142	+ throw new NotFoundException();
	143	+ }
144	144	}

		@@ -29,53 +29,53 @@
		block discarded – undo
29	29	*/
30	30	interface ICollection {
31	31
32		- /**
33		- * @return int
34		- * @since 16.0.0
35		- */
36		- public function getId(): int;
	32	+ /**
	33	+ * @return int
	34	+ * @since 16.0.0
	35	+ */
	36	+ public function getId(): int;
37	37
38		- /**
39		- * @return string
40		- * @since 16.0.0
41		- */
42		- public function getName(): string;
	38	+ /**
	39	+ * @return string
	40	+ * @since 16.0.0
	41	+ */
	42	+ public function getName(): string;
43	43
44		- /**
45		- * @param string $name
46		- * @since 16.0.0
47		- */
48		- public function setName(string $name): void;
	44	+ /**
	45	+ * @param string $name
	46	+ * @since 16.0.0
	47	+ */
	48	+ public function setName(string $name): void;
49	49
50		- /**
51		- * @return IResource[]
52		- * @since 16.0.0
53		- */
54		- public function getResources(): array;
	50	+ /**
	51	+ * @return IResource[]
	52	+ * @since 16.0.0
	53	+ */
	54	+ public function getResources(): array;
55	55
56		- /**
57		- * Adds a resource to a collection
58		- *
59		- * @param IResource $resource
60		- * @throws ResourceException when the resource is already part of the collection
61		- * @since 16.0.0
62		- */
63		- public function addResource(IResource $resource): void;
	56	+ /**
	57	+ * Adds a resource to a collection
	58	+ *
	59	+ * @param IResource $resource
	60	+ * @throws ResourceException when the resource is already part of the collection
	61	+ * @since 16.0.0
	62	+ */
	63	+ public function addResource(IResource $resource): void;
64	64
65		- /**
66		- * Removes a resource from a collection
67		- *
68		- * @param IResource $resource
69		- * @since 16.0.0
70		- */
71		- public function removeResource(IResource $resource): void;
	65	+ /**
	66	+ * Removes a resource from a collection
	67	+ *
	68	+ * @param IResource $resource
	69	+ * @since 16.0.0
	70	+ */
	71	+ public function removeResource(IResource $resource): void;
72	72
73		- /**
74		- * Can a user/guest access the collection
75		- *
76		- * @param IUser\|null $user
77		- * @return bool
78		- * @since 16.0.0
79		- */
80		- public function canAccess(?IUser $user): bool;
	73	+ /**
	74	+ * Can a user/guest access the collection
	75	+ *
	76	+ * @param IUser\|null $user
	77	+ * @return bool
	78	+ * @since 16.0.0
	79	+ */
	80	+ public function canAccess(?IUser $user): bool;
81	81	}

nextcloud / server

Push — master ( fcf578...0af4e9 )

Status

Category

Indentation +31 added lines, -31 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +36 added lines, -36 removed lines patch added patch discarded remove patch

Indentation +32 added lines, -32 removed lines patch added patch discarded remove patch

Indentation +57 added lines, -57 removed lines patch added patch discarded remove patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +57 added lines, -57 removed lines patch added patch discarded remove patch

Indentation +115 added lines, -115 removed lines patch added patch discarded remove patch

Indentation +43 added lines, -43 removed lines patch added patch discarded remove patch