@@ -34,48 +34,48 @@ |
||
| 34 | 34 | */ |
| 35 | 35 | class Attachment implements IAttachment { |
| 36 | 36 | |
| 37 | - /** @var \Swift_Mime_Attachment */ |
|
| 38 | - protected $swiftAttachment; |
|
| 37 | + /** @var \Swift_Mime_Attachment */ |
|
| 38 | + protected $swiftAttachment; |
|
| 39 | 39 | |
| 40 | - public function __construct(\Swift_Mime_Attachment $attachment) { |
|
| 41 | - $this->swiftAttachment = $attachment; |
|
| 42 | - } |
|
| 40 | + public function __construct(\Swift_Mime_Attachment $attachment) { |
|
| 41 | + $this->swiftAttachment = $attachment; |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * @param string $filename |
|
| 46 | - * @return $this |
|
| 47 | - * @since 13.0.0 |
|
| 48 | - */ |
|
| 49 | - public function setFilename(string $filename): IAttachment { |
|
| 50 | - $this->swiftAttachment->setFilename($filename); |
|
| 51 | - return $this; |
|
| 52 | - } |
|
| 44 | + /** |
|
| 45 | + * @param string $filename |
|
| 46 | + * @return $this |
|
| 47 | + * @since 13.0.0 |
|
| 48 | + */ |
|
| 49 | + public function setFilename(string $filename): IAttachment { |
|
| 50 | + $this->swiftAttachment->setFilename($filename); |
|
| 51 | + return $this; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * @param string $contentType |
|
| 56 | - * @return $this |
|
| 57 | - * @since 13.0.0 |
|
| 58 | - */ |
|
| 59 | - public function setContentType(string $contentType): IAttachment { |
|
| 60 | - $this->swiftAttachment->setContentType($contentType); |
|
| 61 | - return $this; |
|
| 62 | - } |
|
| 54 | + /** |
|
| 55 | + * @param string $contentType |
|
| 56 | + * @return $this |
|
| 57 | + * @since 13.0.0 |
|
| 58 | + */ |
|
| 59 | + public function setContentType(string $contentType): IAttachment { |
|
| 60 | + $this->swiftAttachment->setContentType($contentType); |
|
| 61 | + return $this; |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * @param string $body |
|
| 66 | - * @return $this |
|
| 67 | - * @since 13.0.0 |
|
| 68 | - */ |
|
| 69 | - public function setBody(string $body): IAttachment { |
|
| 70 | - $this->swiftAttachment->setBody($body); |
|
| 71 | - return $this; |
|
| 72 | - } |
|
| 64 | + /** |
|
| 65 | + * @param string $body |
|
| 66 | + * @return $this |
|
| 67 | + * @since 13.0.0 |
|
| 68 | + */ |
|
| 69 | + public function setBody(string $body): IAttachment { |
|
| 70 | + $this->swiftAttachment->setBody($body); |
|
| 71 | + return $this; |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * @return \Swift_Mime_Attachment |
|
| 76 | - */ |
|
| 77 | - public function getSwiftAttachment(): \Swift_Mime_Attachment { |
|
| 78 | - return $this->swiftAttachment; |
|
| 79 | - } |
|
| 74 | + /** |
|
| 75 | + * @return \Swift_Mime_Attachment |
|
| 76 | + */ |
|
| 77 | + public function getSwiftAttachment(): \Swift_Mime_Attachment { |
|
| 78 | + return $this->swiftAttachment; |
|
| 79 | + } |
|
| 80 | 80 | |
| 81 | 81 | } |
@@ -46,60 +46,60 @@ |
||
| 46 | 46 | * @since 8.1.0 |
| 47 | 47 | */ |
| 48 | 48 | interface IMailer { |
| 49 | - /** |
|
| 50 | - * Creates a new message object that can be passed to send() |
|
| 51 | - * |
|
| 52 | - * @return IMessage |
|
| 53 | - * @since 8.1.0 |
|
| 54 | - */ |
|
| 55 | - public function createMessage(): IMessage; |
|
| 49 | + /** |
|
| 50 | + * Creates a new message object that can be passed to send() |
|
| 51 | + * |
|
| 52 | + * @return IMessage |
|
| 53 | + * @since 8.1.0 |
|
| 54 | + */ |
|
| 55 | + public function createMessage(): IMessage; |
|
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * @param string|null $data |
|
| 59 | - * @param string|null $filename |
|
| 60 | - * @param string|null $contentType |
|
| 61 | - * @return IAttachment |
|
| 62 | - * @since 13.0.0 |
|
| 63 | - */ |
|
| 64 | - public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment; |
|
| 57 | + /** |
|
| 58 | + * @param string|null $data |
|
| 59 | + * @param string|null $filename |
|
| 60 | + * @param string|null $contentType |
|
| 61 | + * @return IAttachment |
|
| 62 | + * @since 13.0.0 |
|
| 63 | + */ |
|
| 64 | + public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment; |
|
| 65 | 65 | |
| 66 | - /** |
|
| 67 | - * @param string $path |
|
| 68 | - * @param string|null $contentType |
|
| 69 | - * @return IAttachment |
|
| 70 | - * @since 13.0.0 |
|
| 71 | - */ |
|
| 72 | - public function createAttachmentFromPath(string $path, $contentType = null): IAttachment; |
|
| 66 | + /** |
|
| 67 | + * @param string $path |
|
| 68 | + * @param string|null $contentType |
|
| 69 | + * @return IAttachment |
|
| 70 | + * @since 13.0.0 |
|
| 71 | + */ |
|
| 72 | + public function createAttachmentFromPath(string $path, $contentType = null): IAttachment; |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * Creates a new email template object |
|
| 76 | - * |
|
| 77 | - * @param string $emailId |
|
| 78 | - * @param array $data |
|
| 79 | - * @return IEMailTemplate |
|
| 80 | - * @since 12.0.0 Parameters added in 12.0.3 |
|
| 81 | - */ |
|
| 82 | - public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate; |
|
| 74 | + /** |
|
| 75 | + * Creates a new email template object |
|
| 76 | + * |
|
| 77 | + * @param string $emailId |
|
| 78 | + * @param array $data |
|
| 79 | + * @return IEMailTemplate |
|
| 80 | + * @since 12.0.0 Parameters added in 12.0.3 |
|
| 81 | + */ |
|
| 82 | + public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate; |
|
| 83 | 83 | |
| 84 | - /** |
|
| 85 | - * Send the specified message. Also sets the from address to the value defined in config.php |
|
| 86 | - * if no-one has been passed. |
|
| 87 | - * |
|
| 88 | - * @param IMessage $message Message to send |
|
| 89 | - * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and |
|
| 90 | - * therefore should be considered |
|
| 91 | - * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address |
|
| 92 | - * has been supplied.) |
|
| 93 | - * @since 8.1.0 |
|
| 94 | - */ |
|
| 95 | - public function send(IMessage $message): array; |
|
| 84 | + /** |
|
| 85 | + * Send the specified message. Also sets the from address to the value defined in config.php |
|
| 86 | + * if no-one has been passed. |
|
| 87 | + * |
|
| 88 | + * @param IMessage $message Message to send |
|
| 89 | + * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and |
|
| 90 | + * therefore should be considered |
|
| 91 | + * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address |
|
| 92 | + * has been supplied.) |
|
| 93 | + * @since 8.1.0 |
|
| 94 | + */ |
|
| 95 | + public function send(IMessage $message): array; |
|
| 96 | 96 | |
| 97 | - /** |
|
| 98 | - * Checks if an e-mail address is valid |
|
| 99 | - * |
|
| 100 | - * @param string $email Email address to be validated |
|
| 101 | - * @return bool True if the mail address is valid, false otherwise |
|
| 102 | - * @since 8.1.0 |
|
| 103 | - */ |
|
| 104 | - public function validateMailAddress(string $email): bool; |
|
| 97 | + /** |
|
| 98 | + * Checks if an e-mail address is valid |
|
| 99 | + * |
|
| 100 | + * @param string $email Email address to be validated |
|
| 101 | + * @return bool True if the mail address is valid, false otherwise |
|
| 102 | + * @since 8.1.0 |
|
| 103 | + */ |
|
| 104 | + public function validateMailAddress(string $email): bool; |
|
| 105 | 105 | } |
@@ -32,25 +32,25 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | interface IAttachment { |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @param string $filename |
|
| 37 | - * @return IAttachment |
|
| 38 | - * @since 13.0.0 |
|
| 39 | - */ |
|
| 40 | - public function setFilename(string $filename): IAttachment; |
|
| 35 | + /** |
|
| 36 | + * @param string $filename |
|
| 37 | + * @return IAttachment |
|
| 38 | + * @since 13.0.0 |
|
| 39 | + */ |
|
| 40 | + public function setFilename(string $filename): IAttachment; |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @param string $contentType |
|
| 44 | - * @return IAttachment |
|
| 45 | - * @since 13.0.0 |
|
| 46 | - */ |
|
| 47 | - public function setContentType(string $contentType): IAttachment; |
|
| 42 | + /** |
|
| 43 | + * @param string $contentType |
|
| 44 | + * @return IAttachment |
|
| 45 | + * @since 13.0.0 |
|
| 46 | + */ |
|
| 47 | + public function setContentType(string $contentType): IAttachment; |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * @param string $body |
|
| 51 | - * @return IAttachment |
|
| 52 | - * @since 13.0.0 |
|
| 53 | - */ |
|
| 54 | - public function setBody(string $body): IAttachment; |
|
| 49 | + /** |
|
| 50 | + * @param string $body |
|
| 51 | + * @return IAttachment |
|
| 52 | + * @since 13.0.0 |
|
| 53 | + */ |
|
| 54 | + public function setBody(string $body): IAttachment; |
|
| 55 | 55 | |
| 56 | 56 | } |
@@ -32,64 +32,64 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | interface IMessage { |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @param IAttachment $attachment |
|
| 37 | - * @return IMessage |
|
| 38 | - * @since 13.0.0 |
|
| 39 | - */ |
|
| 40 | - public function attach(IAttachment $attachment): IMessage; |
|
| 35 | + /** |
|
| 36 | + * @param IAttachment $attachment |
|
| 37 | + * @return IMessage |
|
| 38 | + * @since 13.0.0 |
|
| 39 | + */ |
|
| 40 | + public function attach(IAttachment $attachment): IMessage; |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * Set the from address of this message. |
|
| 44 | - * |
|
| 45 | - * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php |
|
| 46 | - * |
|
| 47 | - * @param array $addresses Example: array('[email protected]', '[email protected]' => 'A name') |
|
| 48 | - * @return IMessage |
|
| 49 | - * @since 13.0.0 |
|
| 50 | - */ |
|
| 51 | - public function setFrom(array $addresses): IMessage; |
|
| 42 | + /** |
|
| 43 | + * Set the from address of this message. |
|
| 44 | + * |
|
| 45 | + * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php |
|
| 46 | + * |
|
| 47 | + * @param array $addresses Example: array('[email protected]', '[email protected]' => 'A name') |
|
| 48 | + * @return IMessage |
|
| 49 | + * @since 13.0.0 |
|
| 50 | + */ |
|
| 51 | + public function setFrom(array $addresses): IMessage; |
|
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * Set the Reply-To address of this message |
|
| 55 | - * |
|
| 56 | - * @param array $addresses |
|
| 57 | - * @return IMessage |
|
| 58 | - * @since 13.0.0 |
|
| 59 | - */ |
|
| 60 | - public function setReplyTo(array $addresses): IMessage; |
|
| 53 | + /** |
|
| 54 | + * Set the Reply-To address of this message |
|
| 55 | + * |
|
| 56 | + * @param array $addresses |
|
| 57 | + * @return IMessage |
|
| 58 | + * @since 13.0.0 |
|
| 59 | + */ |
|
| 60 | + public function setReplyTo(array $addresses): IMessage; |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * Set the to addresses of this message. |
|
| 64 | - * |
|
| 65 | - * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name') |
|
| 66 | - * @return IMessage |
|
| 67 | - * @since 13.0.0 |
|
| 68 | - */ |
|
| 69 | - public function setTo(array $recipients): IMessage; |
|
| 62 | + /** |
|
| 63 | + * Set the to addresses of this message. |
|
| 64 | + * |
|
| 65 | + * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name') |
|
| 66 | + * @return IMessage |
|
| 67 | + * @since 13.0.0 |
|
| 68 | + */ |
|
| 69 | + public function setTo(array $recipients): IMessage; |
|
| 70 | 70 | |
| 71 | - /** |
|
| 72 | - * Set the CC recipients of this message. |
|
| 73 | - * |
|
| 74 | - * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name') |
|
| 75 | - * @return IMessage |
|
| 76 | - * @since 13.0.0 |
|
| 77 | - */ |
|
| 78 | - public function setCc(array $recipients): IMessage; |
|
| 71 | + /** |
|
| 72 | + * Set the CC recipients of this message. |
|
| 73 | + * |
|
| 74 | + * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name') |
|
| 75 | + * @return IMessage |
|
| 76 | + * @since 13.0.0 |
|
| 77 | + */ |
|
| 78 | + public function setCc(array $recipients): IMessage; |
|
| 79 | 79 | |
| 80 | - /** |
|
| 81 | - * Set the BCC recipients of this message. |
|
| 82 | - * |
|
| 83 | - * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name') |
|
| 84 | - * @return IMessage |
|
| 85 | - * @since 13.0.0 |
|
| 86 | - */ |
|
| 87 | - public function setBcc(array $recipients): IMessage; |
|
| 80 | + /** |
|
| 81 | + * Set the BCC recipients of this message. |
|
| 82 | + * |
|
| 83 | + * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name') |
|
| 84 | + * @return IMessage |
|
| 85 | + * @since 13.0.0 |
|
| 86 | + */ |
|
| 87 | + public function setBcc(array $recipients): IMessage; |
|
| 88 | 88 | |
| 89 | - /** |
|
| 90 | - * @param IEMailTemplate $emailTemplate |
|
| 91 | - * @return IMessage |
|
| 92 | - * @since 13.0.0 |
|
| 93 | - */ |
|
| 94 | - public function useTemplate(IEMailTemplate $emailTemplate): IMessage; |
|
| 89 | + /** |
|
| 90 | + * @param IEMailTemplate $emailTemplate |
|
| 91 | + * @return IMessage |
|
| 92 | + * @since 13.0.0 |
|
| 93 | + */ |
|
| 94 | + public function useTemplate(IEMailTemplate $emailTemplate): IMessage; |
|
| 95 | 95 | } |
@@ -32,23 +32,23 @@ |
||
| 32 | 32 | * @package OC\Security\CSRF |
| 33 | 33 | */ |
| 34 | 34 | class CsrfTokenGenerator { |
| 35 | - /** @var ISecureRandom */ |
|
| 36 | - private $random; |
|
| 35 | + /** @var ISecureRandom */ |
|
| 36 | + private $random; |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @param ISecureRandom $random |
|
| 40 | - */ |
|
| 41 | - public function __construct(ISecureRandom $random) { |
|
| 42 | - $this->random = $random; |
|
| 43 | - } |
|
| 38 | + /** |
|
| 39 | + * @param ISecureRandom $random |
|
| 40 | + */ |
|
| 41 | + public function __construct(ISecureRandom $random) { |
|
| 42 | + $this->random = $random; |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * Generate a new CSRF token. |
|
| 47 | - * |
|
| 48 | - * @param int $length Length of the token in characters. |
|
| 49 | - * @return string |
|
| 50 | - */ |
|
| 51 | - public function generateToken(int $length = 32): string { |
|
| 52 | - return $this->random->generate($length); |
|
| 53 | - } |
|
| 45 | + /** |
|
| 46 | + * Generate a new CSRF token. |
|
| 47 | + * |
|
| 48 | + * @param int $length Length of the token in characters. |
|
| 49 | + * @return string |
|
| 50 | + */ |
|
| 51 | + public function generateToken(int $length = 32): string { |
|
| 52 | + return $this->random->generate($length); |
|
| 53 | + } |
|
| 54 | 54 | } |
@@ -25,25 +25,25 @@ |
||
| 25 | 25 | namespace OC\Security\IdentityProof; |
| 26 | 26 | |
| 27 | 27 | class Key { |
| 28 | - /** @var string */ |
|
| 29 | - private $publicKey; |
|
| 30 | - /** @var string */ |
|
| 31 | - private $privateKey; |
|
| 28 | + /** @var string */ |
|
| 29 | + private $publicKey; |
|
| 30 | + /** @var string */ |
|
| 31 | + private $privateKey; |
|
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * @param string $publicKey |
|
| 35 | - * @param string $privateKey |
|
| 36 | - */ |
|
| 37 | - public function __construct(string $publicKey, string $privateKey) { |
|
| 38 | - $this->publicKey = $publicKey; |
|
| 39 | - $this->privateKey = $privateKey; |
|
| 40 | - } |
|
| 33 | + /** |
|
| 34 | + * @param string $publicKey |
|
| 35 | + * @param string $privateKey |
|
| 36 | + */ |
|
| 37 | + public function __construct(string $publicKey, string $privateKey) { |
|
| 38 | + $this->publicKey = $publicKey; |
|
| 39 | + $this->privateKey = $privateKey; |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - public function getPrivate(): string { |
|
| 43 | - return $this->privateKey; |
|
| 44 | - } |
|
| 42 | + public function getPrivate(): string { |
|
| 43 | + return $this->privateKey; |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - public function getPublic(): string { |
|
| 47 | - return $this->publicKey; |
|
| 48 | - } |
|
| 46 | + public function getPublic(): string { |
|
| 47 | + return $this->publicKey; |
|
| 48 | + } |
|
| 49 | 49 | } |
@@ -100,7 +100,7 @@ |
||
| 100 | 100 | |
| 101 | 101 | // casted to string because cast to float cause equality for non equal numbers |
| 102 | 102 | // and integer has the problem of limited size on 32 bit systems |
| 103 | - if ((string)$expectedSize !== (string)$actualSize) { |
|
| 103 | + if ((string) $expectedSize !== (string) $actualSize) { |
|
| 104 | 104 | throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes"); |
| 105 | 105 | } |
| 106 | 106 | } |
@@ -35,97 +35,97 @@ |
||
| 35 | 35 | |
| 36 | 36 | class ChunkingPlugin extends ServerPlugin { |
| 37 | 37 | |
| 38 | - /** @var Server */ |
|
| 39 | - private $server; |
|
| 40 | - /** @var FutureFile */ |
|
| 41 | - private $sourceNode; |
|
| 38 | + /** @var Server */ |
|
| 39 | + private $server; |
|
| 40 | + /** @var FutureFile */ |
|
| 41 | + private $sourceNode; |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @inheritdoc |
|
| 45 | - */ |
|
| 46 | - public function initialize(Server $server) { |
|
| 47 | - $server->on('beforeMove', [$this, 'beforeMove']); |
|
| 48 | - $this->server = $server; |
|
| 49 | - } |
|
| 43 | + /** |
|
| 44 | + * @inheritdoc |
|
| 45 | + */ |
|
| 46 | + public function initialize(Server $server) { |
|
| 47 | + $server->on('beforeMove', [$this, 'beforeMove']); |
|
| 48 | + $this->server = $server; |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * @param string $sourcePath source path |
|
| 53 | - * @param string $destination destination path |
|
| 54 | - * @return bool|void |
|
| 55 | - * @throws BadRequest |
|
| 56 | - * @throws NotFound |
|
| 57 | - */ |
|
| 58 | - public function beforeMove($sourcePath, $destination) { |
|
| 59 | - $this->sourceNode = $this->server->tree->getNodeForPath($sourcePath); |
|
| 60 | - if (!$this->sourceNode instanceof FutureFile) { |
|
| 61 | - // skip handling as the source is not a chunked FutureFile |
|
| 62 | - return; |
|
| 63 | - } |
|
| 51 | + /** |
|
| 52 | + * @param string $sourcePath source path |
|
| 53 | + * @param string $destination destination path |
|
| 54 | + * @return bool|void |
|
| 55 | + * @throws BadRequest |
|
| 56 | + * @throws NotFound |
|
| 57 | + */ |
|
| 58 | + public function beforeMove($sourcePath, $destination) { |
|
| 59 | + $this->sourceNode = $this->server->tree->getNodeForPath($sourcePath); |
|
| 60 | + if (!$this->sourceNode instanceof FutureFile) { |
|
| 61 | + // skip handling as the source is not a chunked FutureFile |
|
| 62 | + return; |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - try { |
|
| 66 | - /** @var INode $destinationNode */ |
|
| 67 | - $destinationNode = $this->server->tree->getNodeForPath($destination); |
|
| 68 | - if ($destinationNode instanceof Directory) { |
|
| 69 | - throw new BadRequest("The given destination $destination is a directory."); |
|
| 70 | - } |
|
| 71 | - } catch (NotFound $e) { |
|
| 72 | - // If the destination does not exist yet it's not a directory either ;) |
|
| 73 | - } |
|
| 65 | + try { |
|
| 66 | + /** @var INode $destinationNode */ |
|
| 67 | + $destinationNode = $this->server->tree->getNodeForPath($destination); |
|
| 68 | + if ($destinationNode instanceof Directory) { |
|
| 69 | + throw new BadRequest("The given destination $destination is a directory."); |
|
| 70 | + } |
|
| 71 | + } catch (NotFound $e) { |
|
| 72 | + // If the destination does not exist yet it's not a directory either ;) |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - $this->verifySize(); |
|
| 76 | - return $this->performMove($sourcePath, $destination); |
|
| 77 | - } |
|
| 75 | + $this->verifySize(); |
|
| 76 | + return $this->performMove($sourcePath, $destination); |
|
| 77 | + } |
|
| 78 | 78 | |
| 79 | - /** |
|
| 80 | - * Move handler for future file. |
|
| 81 | - * |
|
| 82 | - * This overrides the default move behavior to prevent Sabre |
|
| 83 | - * to delete the target file before moving. Because deleting would |
|
| 84 | - * lose the file id and metadata. |
|
| 85 | - * |
|
| 86 | - * @param string $path source path |
|
| 87 | - * @param string $destination destination path |
|
| 88 | - * @return bool|void false to stop handling, void to skip this handler |
|
| 89 | - */ |
|
| 90 | - public function performMove($path, $destination) { |
|
| 91 | - $fileExists = $this->server->tree->nodeExists($destination); |
|
| 92 | - // do a move manually, skipping Sabre's default "delete" for existing nodes |
|
| 93 | - try { |
|
| 94 | - $this->server->tree->move($path, $destination); |
|
| 95 | - } catch (Forbidden $e) { |
|
| 96 | - $sourceNode = $this->server->tree->getNodeForPath($path); |
|
| 97 | - if ($sourceNode instanceof FutureFile) { |
|
| 98 | - $sourceNode->delete(); |
|
| 99 | - } |
|
| 100 | - throw $e; |
|
| 101 | - } |
|
| 79 | + /** |
|
| 80 | + * Move handler for future file. |
|
| 81 | + * |
|
| 82 | + * This overrides the default move behavior to prevent Sabre |
|
| 83 | + * to delete the target file before moving. Because deleting would |
|
| 84 | + * lose the file id and metadata. |
|
| 85 | + * |
|
| 86 | + * @param string $path source path |
|
| 87 | + * @param string $destination destination path |
|
| 88 | + * @return bool|void false to stop handling, void to skip this handler |
|
| 89 | + */ |
|
| 90 | + public function performMove($path, $destination) { |
|
| 91 | + $fileExists = $this->server->tree->nodeExists($destination); |
|
| 92 | + // do a move manually, skipping Sabre's default "delete" for existing nodes |
|
| 93 | + try { |
|
| 94 | + $this->server->tree->move($path, $destination); |
|
| 95 | + } catch (Forbidden $e) { |
|
| 96 | + $sourceNode = $this->server->tree->getNodeForPath($path); |
|
| 97 | + if ($sourceNode instanceof FutureFile) { |
|
| 98 | + $sourceNode->delete(); |
|
| 99 | + } |
|
| 100 | + throw $e; |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | - // trigger all default events (copied from CorePlugin::move) |
|
| 104 | - $this->server->emit('afterMove', [$path, $destination]); |
|
| 105 | - $this->server->emit('afterUnbind', [$path]); |
|
| 106 | - $this->server->emit('afterBind', [$destination]); |
|
| 103 | + // trigger all default events (copied from CorePlugin::move) |
|
| 104 | + $this->server->emit('afterMove', [$path, $destination]); |
|
| 105 | + $this->server->emit('afterUnbind', [$path]); |
|
| 106 | + $this->server->emit('afterBind', [$destination]); |
|
| 107 | 107 | |
| 108 | - $response = $this->server->httpResponse; |
|
| 109 | - $response->setHeader('Content-Length', '0'); |
|
| 110 | - $response->setStatus($fileExists ? 204 : 201); |
|
| 108 | + $response = $this->server->httpResponse; |
|
| 109 | + $response->setHeader('Content-Length', '0'); |
|
| 110 | + $response->setStatus($fileExists ? 204 : 201); |
|
| 111 | 111 | |
| 112 | - return false; |
|
| 113 | - } |
|
| 112 | + return false; |
|
| 113 | + } |
|
| 114 | 114 | |
| 115 | - /** |
|
| 116 | - * @throws BadRequest |
|
| 117 | - */ |
|
| 118 | - private function verifySize() { |
|
| 119 | - $expectedSize = $this->server->httpRequest->getHeader('OC-Total-Length'); |
|
| 120 | - if ($expectedSize === null) { |
|
| 121 | - return; |
|
| 122 | - } |
|
| 123 | - $actualSize = $this->sourceNode->getSize(); |
|
| 115 | + /** |
|
| 116 | + * @throws BadRequest |
|
| 117 | + */ |
|
| 118 | + private function verifySize() { |
|
| 119 | + $expectedSize = $this->server->httpRequest->getHeader('OC-Total-Length'); |
|
| 120 | + if ($expectedSize === null) { |
|
| 121 | + return; |
|
| 122 | + } |
|
| 123 | + $actualSize = $this->sourceNode->getSize(); |
|
| 124 | 124 | |
| 125 | - // casted to string because cast to float cause equality for non equal numbers |
|
| 126 | - // and integer has the problem of limited size on 32 bit systems |
|
| 127 | - if ((string)$expectedSize !== (string)$actualSize) { |
|
| 128 | - throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes"); |
|
| 129 | - } |
|
| 130 | - } |
|
| 125 | + // casted to string because cast to float cause equality for non equal numbers |
|
| 126 | + // and integer has the problem of limited size on 32 bit systems |
|
| 127 | + if ((string)$expectedSize !== (string)$actualSize) { |
|
| 128 | + throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes"); |
|
| 129 | + } |
|
| 130 | + } |
|
| 131 | 131 | } |
@@ -32,18 +32,18 @@ |
||
| 32 | 32 | * @deprecated 14.0.0 |
| 33 | 33 | */ |
| 34 | 34 | class BackgroundJob { |
| 35 | - /** |
|
| 36 | - * @since 5.0.0 |
|
| 37 | - * @deprecated 14.0.0 |
|
| 38 | - */ |
|
| 39 | - public static function getExecutionType() { |
|
| 40 | - return ''; |
|
| 41 | - } |
|
| 35 | + /** |
|
| 36 | + * @since 5.0.0 |
|
| 37 | + * @deprecated 14.0.0 |
|
| 38 | + */ |
|
| 39 | + public static function getExecutionType() { |
|
| 40 | + return ''; |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @since 5.0.0 |
|
| 45 | - * @deprecated 14.0.0 |
|
| 46 | - */ |
|
| 47 | - public static function setExecutionType($type) { |
|
| 48 | - } |
|
| 43 | + /** |
|
| 44 | + * @since 5.0.0 |
|
| 45 | + * @deprecated 14.0.0 |
|
| 46 | + */ |
|
| 47 | + public static function setExecutionType($type) { |
|
| 48 | + } |
|
| 49 | 49 | } |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | protected function buildPath($path) { |
| 59 | - $fullPath = \OC\Files\Filesystem::normalizePath($this->root . '/' . $path); |
|
| 59 | + $fullPath = \OC\Files\Filesystem::normalizePath($this->root.'/'.$path); |
|
| 60 | 60 | return ltrim($fullPath, '/'); |
| 61 | 61 | } |
| 62 | 62 | |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | } catch (FileNotFoundException $e) { |
| 164 | 164 | return false; |
| 165 | 165 | } |
| 166 | - $names = array_map(function ($object) { |
|
| 166 | + $names = array_map(function($object) { |
|
| 167 | 167 | return $object['basename']; |
| 168 | 168 | }, $content); |
| 169 | 169 | return IteratorDirectory::wrap($names); |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); |
| 210 | 210 | } |
| 211 | 211 | $source = fopen($tmpFile, $mode); |
| 212 | - return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath) { |
|
| 212 | + return CallbackWrapper::wrap($source, null, null, function() use ($tmpFile, $fullPath) { |
|
| 213 | 213 | $this->flysystem->putStream($fullPath, fopen($tmpFile, 'r')); |
| 214 | 214 | unlink($tmpFile); |
| 215 | 215 | }); |
@@ -37,228 +37,228 @@ |
||
| 37 | 37 | * To use: subclass and call $this->buildFlysystem with the flysystem adapter of choice |
| 38 | 38 | */ |
| 39 | 39 | abstract class Flysystem extends Common { |
| 40 | - /** |
|
| 41 | - * @var Filesystem |
|
| 42 | - */ |
|
| 43 | - protected $flysystem; |
|
| 40 | + /** |
|
| 41 | + * @var Filesystem |
|
| 42 | + */ |
|
| 43 | + protected $flysystem; |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @var string |
|
| 47 | - */ |
|
| 48 | - protected $root = ''; |
|
| 45 | + /** |
|
| 46 | + * @var string |
|
| 47 | + */ |
|
| 48 | + protected $root = ''; |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * Initialize the storage backend with a flyssytem adapter |
|
| 52 | - * |
|
| 53 | - * @param \League\Flysystem\AdapterInterface $adapter |
|
| 54 | - */ |
|
| 55 | - protected function buildFlySystem(AdapterInterface $adapter) { |
|
| 56 | - $this->flysystem = new Filesystem($adapter); |
|
| 57 | - $this->flysystem->addPlugin(new GetWithMetadata()); |
|
| 58 | - } |
|
| 50 | + /** |
|
| 51 | + * Initialize the storage backend with a flyssytem adapter |
|
| 52 | + * |
|
| 53 | + * @param \League\Flysystem\AdapterInterface $adapter |
|
| 54 | + */ |
|
| 55 | + protected function buildFlySystem(AdapterInterface $adapter) { |
|
| 56 | + $this->flysystem = new Filesystem($adapter); |
|
| 57 | + $this->flysystem->addPlugin(new GetWithMetadata()); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - protected function buildPath($path) { |
|
| 61 | - $fullPath = \OC\Files\Filesystem::normalizePath($this->root . '/' . $path); |
|
| 62 | - return ltrim($fullPath, '/'); |
|
| 63 | - } |
|
| 60 | + protected function buildPath($path) { |
|
| 61 | + $fullPath = \OC\Files\Filesystem::normalizePath($this->root . '/' . $path); |
|
| 62 | + return ltrim($fullPath, '/'); |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * {@inheritdoc} |
|
| 67 | - */ |
|
| 68 | - public function file_get_contents($path) { |
|
| 69 | - return $this->flysystem->read($this->buildPath($path)); |
|
| 70 | - } |
|
| 65 | + /** |
|
| 66 | + * {@inheritdoc} |
|
| 67 | + */ |
|
| 68 | + public function file_get_contents($path) { |
|
| 69 | + return $this->flysystem->read($this->buildPath($path)); |
|
| 70 | + } |
|
| 71 | 71 | |
| 72 | - /** |
|
| 73 | - * {@inheritdoc} |
|
| 74 | - */ |
|
| 75 | - public function file_put_contents($path, $data) { |
|
| 76 | - $result = $this->flysystem->put($this->buildPath($path), $data); |
|
| 77 | - if ($result === true) { |
|
| 78 | - return strlen($data); |
|
| 79 | - } |
|
| 80 | - return $result; |
|
| 81 | - } |
|
| 72 | + /** |
|
| 73 | + * {@inheritdoc} |
|
| 74 | + */ |
|
| 75 | + public function file_put_contents($path, $data) { |
|
| 76 | + $result = $this->flysystem->put($this->buildPath($path), $data); |
|
| 77 | + if ($result === true) { |
|
| 78 | + return strlen($data); |
|
| 79 | + } |
|
| 80 | + return $result; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - /** |
|
| 84 | - * {@inheritdoc} |
|
| 85 | - */ |
|
| 86 | - public function file_exists($path) { |
|
| 87 | - return $this->flysystem->has($this->buildPath($path)); |
|
| 88 | - } |
|
| 83 | + /** |
|
| 84 | + * {@inheritdoc} |
|
| 85 | + */ |
|
| 86 | + public function file_exists($path) { |
|
| 87 | + return $this->flysystem->has($this->buildPath($path)); |
|
| 88 | + } |
|
| 89 | 89 | |
| 90 | - /** |
|
| 91 | - * {@inheritdoc} |
|
| 92 | - */ |
|
| 93 | - public function unlink($path) { |
|
| 94 | - if ($this->is_dir($path)) { |
|
| 95 | - return $this->rmdir($path); |
|
| 96 | - } |
|
| 97 | - try { |
|
| 98 | - return $this->flysystem->delete($this->buildPath($path)); |
|
| 99 | - } catch (FileNotFoundException $e) { |
|
| 100 | - return false; |
|
| 101 | - } |
|
| 102 | - } |
|
| 90 | + /** |
|
| 91 | + * {@inheritdoc} |
|
| 92 | + */ |
|
| 93 | + public function unlink($path) { |
|
| 94 | + if ($this->is_dir($path)) { |
|
| 95 | + return $this->rmdir($path); |
|
| 96 | + } |
|
| 97 | + try { |
|
| 98 | + return $this->flysystem->delete($this->buildPath($path)); |
|
| 99 | + } catch (FileNotFoundException $e) { |
|
| 100 | + return false; |
|
| 101 | + } |
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - /** |
|
| 105 | - * {@inheritdoc} |
|
| 106 | - */ |
|
| 107 | - public function rename($source, $target) { |
|
| 108 | - if ($this->file_exists($target)) { |
|
| 109 | - $this->unlink($target); |
|
| 110 | - } |
|
| 111 | - return $this->flysystem->rename($this->buildPath($source), $this->buildPath($target)); |
|
| 112 | - } |
|
| 104 | + /** |
|
| 105 | + * {@inheritdoc} |
|
| 106 | + */ |
|
| 107 | + public function rename($source, $target) { |
|
| 108 | + if ($this->file_exists($target)) { |
|
| 109 | + $this->unlink($target); |
|
| 110 | + } |
|
| 111 | + return $this->flysystem->rename($this->buildPath($source), $this->buildPath($target)); |
|
| 112 | + } |
|
| 113 | 113 | |
| 114 | - /** |
|
| 115 | - * {@inheritdoc} |
|
| 116 | - */ |
|
| 117 | - public function copy($source, $target) { |
|
| 118 | - if ($this->file_exists($target)) { |
|
| 119 | - $this->unlink($target); |
|
| 120 | - } |
|
| 121 | - return $this->flysystem->copy($this->buildPath($source), $this->buildPath($target)); |
|
| 122 | - } |
|
| 114 | + /** |
|
| 115 | + * {@inheritdoc} |
|
| 116 | + */ |
|
| 117 | + public function copy($source, $target) { |
|
| 118 | + if ($this->file_exists($target)) { |
|
| 119 | + $this->unlink($target); |
|
| 120 | + } |
|
| 121 | + return $this->flysystem->copy($this->buildPath($source), $this->buildPath($target)); |
|
| 122 | + } |
|
| 123 | 123 | |
| 124 | - /** |
|
| 125 | - * {@inheritdoc} |
|
| 126 | - */ |
|
| 127 | - public function filesize($path) { |
|
| 128 | - if ($this->is_dir($path)) { |
|
| 129 | - return 0; |
|
| 130 | - } else { |
|
| 131 | - return $this->flysystem->getSize($this->buildPath($path)); |
|
| 132 | - } |
|
| 133 | - } |
|
| 124 | + /** |
|
| 125 | + * {@inheritdoc} |
|
| 126 | + */ |
|
| 127 | + public function filesize($path) { |
|
| 128 | + if ($this->is_dir($path)) { |
|
| 129 | + return 0; |
|
| 130 | + } else { |
|
| 131 | + return $this->flysystem->getSize($this->buildPath($path)); |
|
| 132 | + } |
|
| 133 | + } |
|
| 134 | 134 | |
| 135 | - /** |
|
| 136 | - * {@inheritdoc} |
|
| 137 | - */ |
|
| 138 | - public function mkdir($path) { |
|
| 139 | - if ($this->file_exists($path)) { |
|
| 140 | - return false; |
|
| 141 | - } |
|
| 142 | - return $this->flysystem->createDir($this->buildPath($path)); |
|
| 143 | - } |
|
| 135 | + /** |
|
| 136 | + * {@inheritdoc} |
|
| 137 | + */ |
|
| 138 | + public function mkdir($path) { |
|
| 139 | + if ($this->file_exists($path)) { |
|
| 140 | + return false; |
|
| 141 | + } |
|
| 142 | + return $this->flysystem->createDir($this->buildPath($path)); |
|
| 143 | + } |
|
| 144 | 144 | |
| 145 | - /** |
|
| 146 | - * {@inheritdoc} |
|
| 147 | - */ |
|
| 148 | - public function filemtime($path) { |
|
| 149 | - return $this->flysystem->getTimestamp($this->buildPath($path)); |
|
| 150 | - } |
|
| 145 | + /** |
|
| 146 | + * {@inheritdoc} |
|
| 147 | + */ |
|
| 148 | + public function filemtime($path) { |
|
| 149 | + return $this->flysystem->getTimestamp($this->buildPath($path)); |
|
| 150 | + } |
|
| 151 | 151 | |
| 152 | - /** |
|
| 153 | - * {@inheritdoc} |
|
| 154 | - */ |
|
| 155 | - public function rmdir($path) { |
|
| 156 | - try { |
|
| 157 | - return @$this->flysystem->deleteDir($this->buildPath($path)); |
|
| 158 | - } catch (FileNotFoundException $e) { |
|
| 159 | - return false; |
|
| 160 | - } |
|
| 161 | - } |
|
| 152 | + /** |
|
| 153 | + * {@inheritdoc} |
|
| 154 | + */ |
|
| 155 | + public function rmdir($path) { |
|
| 156 | + try { |
|
| 157 | + return @$this->flysystem->deleteDir($this->buildPath($path)); |
|
| 158 | + } catch (FileNotFoundException $e) { |
|
| 159 | + return false; |
|
| 160 | + } |
|
| 161 | + } |
|
| 162 | 162 | |
| 163 | - /** |
|
| 164 | - * {@inheritdoc} |
|
| 165 | - */ |
|
| 166 | - public function opendir($path) { |
|
| 167 | - try { |
|
| 168 | - $content = $this->flysystem->listContents($this->buildPath($path)); |
|
| 169 | - } catch (FileNotFoundException $e) { |
|
| 170 | - return false; |
|
| 171 | - } |
|
| 172 | - $names = array_map(function ($object) { |
|
| 173 | - return $object['basename']; |
|
| 174 | - }, $content); |
|
| 175 | - return IteratorDirectory::wrap($names); |
|
| 176 | - } |
|
| 163 | + /** |
|
| 164 | + * {@inheritdoc} |
|
| 165 | + */ |
|
| 166 | + public function opendir($path) { |
|
| 167 | + try { |
|
| 168 | + $content = $this->flysystem->listContents($this->buildPath($path)); |
|
| 169 | + } catch (FileNotFoundException $e) { |
|
| 170 | + return false; |
|
| 171 | + } |
|
| 172 | + $names = array_map(function ($object) { |
|
| 173 | + return $object['basename']; |
|
| 174 | + }, $content); |
|
| 175 | + return IteratorDirectory::wrap($names); |
|
| 176 | + } |
|
| 177 | 177 | |
| 178 | - /** |
|
| 179 | - * {@inheritdoc} |
|
| 180 | - */ |
|
| 181 | - public function fopen($path, $mode) { |
|
| 182 | - $fullPath = $this->buildPath($path); |
|
| 183 | - $useExisting = true; |
|
| 184 | - switch ($mode) { |
|
| 185 | - case 'r': |
|
| 186 | - case 'rb': |
|
| 187 | - try { |
|
| 188 | - return $this->flysystem->readStream($fullPath); |
|
| 189 | - } catch (FileNotFoundException $e) { |
|
| 190 | - return false; |
|
| 191 | - } |
|
| 192 | - case 'w': |
|
| 193 | - case 'w+': |
|
| 194 | - case 'wb': |
|
| 195 | - case 'wb+': |
|
| 196 | - $useExisting = false; |
|
| 197 | - // no break |
|
| 198 | - case 'a': |
|
| 199 | - case 'ab': |
|
| 200 | - case 'r+': |
|
| 201 | - case 'a+': |
|
| 202 | - case 'x': |
|
| 203 | - case 'x+': |
|
| 204 | - case 'c': |
|
| 205 | - case 'c+': |
|
| 206 | - //emulate these |
|
| 207 | - if ($useExisting and $this->file_exists($path)) { |
|
| 208 | - if (!$this->isUpdatable($path)) { |
|
| 209 | - return false; |
|
| 210 | - } |
|
| 211 | - $tmpFile = $this->getCachedFile($path); |
|
| 212 | - } else { |
|
| 213 | - if (!$this->isCreatable(dirname($path))) { |
|
| 214 | - return false; |
|
| 215 | - } |
|
| 216 | - $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); |
|
| 217 | - } |
|
| 218 | - $source = fopen($tmpFile, $mode); |
|
| 219 | - return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath) { |
|
| 220 | - $this->flysystem->putStream($fullPath, fopen($tmpFile, 'r')); |
|
| 221 | - unlink($tmpFile); |
|
| 222 | - }); |
|
| 223 | - } |
|
| 224 | - return false; |
|
| 225 | - } |
|
| 178 | + /** |
|
| 179 | + * {@inheritdoc} |
|
| 180 | + */ |
|
| 181 | + public function fopen($path, $mode) { |
|
| 182 | + $fullPath = $this->buildPath($path); |
|
| 183 | + $useExisting = true; |
|
| 184 | + switch ($mode) { |
|
| 185 | + case 'r': |
|
| 186 | + case 'rb': |
|
| 187 | + try { |
|
| 188 | + return $this->flysystem->readStream($fullPath); |
|
| 189 | + } catch (FileNotFoundException $e) { |
|
| 190 | + return false; |
|
| 191 | + } |
|
| 192 | + case 'w': |
|
| 193 | + case 'w+': |
|
| 194 | + case 'wb': |
|
| 195 | + case 'wb+': |
|
| 196 | + $useExisting = false; |
|
| 197 | + // no break |
|
| 198 | + case 'a': |
|
| 199 | + case 'ab': |
|
| 200 | + case 'r+': |
|
| 201 | + case 'a+': |
|
| 202 | + case 'x': |
|
| 203 | + case 'x+': |
|
| 204 | + case 'c': |
|
| 205 | + case 'c+': |
|
| 206 | + //emulate these |
|
| 207 | + if ($useExisting and $this->file_exists($path)) { |
|
| 208 | + if (!$this->isUpdatable($path)) { |
|
| 209 | + return false; |
|
| 210 | + } |
|
| 211 | + $tmpFile = $this->getCachedFile($path); |
|
| 212 | + } else { |
|
| 213 | + if (!$this->isCreatable(dirname($path))) { |
|
| 214 | + return false; |
|
| 215 | + } |
|
| 216 | + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); |
|
| 217 | + } |
|
| 218 | + $source = fopen($tmpFile, $mode); |
|
| 219 | + return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath) { |
|
| 220 | + $this->flysystem->putStream($fullPath, fopen($tmpFile, 'r')); |
|
| 221 | + unlink($tmpFile); |
|
| 222 | + }); |
|
| 223 | + } |
|
| 224 | + return false; |
|
| 225 | + } |
|
| 226 | 226 | |
| 227 | - /** |
|
| 228 | - * {@inheritdoc} |
|
| 229 | - */ |
|
| 230 | - public function touch($path, $mtime = null) { |
|
| 231 | - if ($this->file_exists($path)) { |
|
| 232 | - return false; |
|
| 233 | - } else { |
|
| 234 | - $this->file_put_contents($path, ''); |
|
| 235 | - return true; |
|
| 236 | - } |
|
| 237 | - } |
|
| 227 | + /** |
|
| 228 | + * {@inheritdoc} |
|
| 229 | + */ |
|
| 230 | + public function touch($path, $mtime = null) { |
|
| 231 | + if ($this->file_exists($path)) { |
|
| 232 | + return false; |
|
| 233 | + } else { |
|
| 234 | + $this->file_put_contents($path, ''); |
|
| 235 | + return true; |
|
| 236 | + } |
|
| 237 | + } |
|
| 238 | 238 | |
| 239 | - /** |
|
| 240 | - * {@inheritdoc} |
|
| 241 | - */ |
|
| 242 | - public function stat($path) { |
|
| 243 | - $info = $this->flysystem->getWithMetadata($this->buildPath($path), ['timestamp', 'size']); |
|
| 244 | - return [ |
|
| 245 | - 'mtime' => $info['timestamp'], |
|
| 246 | - 'size' => $info['size'] |
|
| 247 | - ]; |
|
| 248 | - } |
|
| 239 | + /** |
|
| 240 | + * {@inheritdoc} |
|
| 241 | + */ |
|
| 242 | + public function stat($path) { |
|
| 243 | + $info = $this->flysystem->getWithMetadata($this->buildPath($path), ['timestamp', 'size']); |
|
| 244 | + return [ |
|
| 245 | + 'mtime' => $info['timestamp'], |
|
| 246 | + 'size' => $info['size'] |
|
| 247 | + ]; |
|
| 248 | + } |
|
| 249 | 249 | |
| 250 | - /** |
|
| 251 | - * {@inheritdoc} |
|
| 252 | - */ |
|
| 253 | - public function filetype($path) { |
|
| 254 | - if ($path === '' or $path === '/' or $path === '.') { |
|
| 255 | - return 'dir'; |
|
| 256 | - } |
|
| 257 | - try { |
|
| 258 | - $info = $this->flysystem->getMetadata($this->buildPath($path)); |
|
| 259 | - } catch (FileNotFoundException $e) { |
|
| 260 | - return false; |
|
| 261 | - } |
|
| 262 | - return $info['type']; |
|
| 263 | - } |
|
| 250 | + /** |
|
| 251 | + * {@inheritdoc} |
|
| 252 | + */ |
|
| 253 | + public function filetype($path) { |
|
| 254 | + if ($path === '' or $path === '/' or $path === '.') { |
|
| 255 | + return 'dir'; |
|
| 256 | + } |
|
| 257 | + try { |
|
| 258 | + $info = $this->flysystem->getMetadata($this->buildPath($path)); |
|
| 259 | + } catch (FileNotFoundException $e) { |
|
| 260 | + return false; |
|
| 261 | + } |
|
| 262 | + return $info['type']; |
|
| 263 | + } |
|
| 264 | 264 | } |