@@ -25,33 +25,33 @@ |
||
| 25 | 25 | use OCP\Files\Search\ISearchOperator; |
| 26 | 26 | |
| 27 | 27 | class SearchBinaryOperator implements ISearchBinaryOperator { |
| 28 | - /** @var string */ |
|
| 29 | - private $type; |
|
| 30 | - /** @var ISearchOperator[] */ |
|
| 31 | - private $arguments; |
|
| 28 | + /** @var string */ |
|
| 29 | + private $type; |
|
| 30 | + /** @var ISearchOperator[] */ |
|
| 31 | + private $arguments; |
|
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * SearchBinaryOperator constructor. |
|
| 35 | - * |
|
| 36 | - * @param string $type |
|
| 37 | - * @param ISearchOperator[] $arguments |
|
| 38 | - */ |
|
| 39 | - public function __construct($type, array $arguments) { |
|
| 40 | - $this->type = $type; |
|
| 41 | - $this->arguments = $arguments; |
|
| 42 | - } |
|
| 33 | + /** |
|
| 34 | + * SearchBinaryOperator constructor. |
|
| 35 | + * |
|
| 36 | + * @param string $type |
|
| 37 | + * @param ISearchOperator[] $arguments |
|
| 38 | + */ |
|
| 39 | + public function __construct($type, array $arguments) { |
|
| 40 | + $this->type = $type; |
|
| 41 | + $this->arguments = $arguments; |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * @return string |
|
| 46 | - */ |
|
| 47 | - public function getType() { |
|
| 48 | - return $this->type; |
|
| 49 | - } |
|
| 44 | + /** |
|
| 45 | + * @return string |
|
| 46 | + */ |
|
| 47 | + public function getType() { |
|
| 48 | + return $this->type; |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * @return ISearchOperator[] |
|
| 53 | - */ |
|
| 54 | - public function getArguments() { |
|
| 55 | - return $this->arguments; |
|
| 56 | - } |
|
| 51 | + /** |
|
| 52 | + * @return ISearchOperator[] |
|
| 53 | + */ |
|
| 54 | + public function getArguments() { |
|
| 55 | + return $this->arguments; |
|
| 56 | + } |
|
| 57 | 57 | } |
@@ -23,18 +23,18 @@ |
||
| 23 | 23 | */ |
| 24 | 24 | |
| 25 | 25 | return [ |
| 26 | - 'routes' => [ |
|
| 27 | - ['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'], |
|
| 28 | - ['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'], |
|
| 29 | - ], |
|
| 30 | - 'ocs' => [ |
|
| 31 | - ['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'], |
|
| 32 | - ['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'], |
|
| 33 | - ['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'], |
|
| 34 | - ['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'], |
|
| 35 | - ['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'], |
|
| 36 | - ['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'], |
|
| 37 | - ['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'], |
|
| 38 | - ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'], |
|
| 39 | - ], |
|
| 26 | + 'routes' => [ |
|
| 27 | + ['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'], |
|
| 28 | + ['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'], |
|
| 29 | + ], |
|
| 30 | + 'ocs' => [ |
|
| 31 | + ['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'], |
|
| 32 | + ['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'], |
|
| 33 | + ['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'], |
|
| 34 | + ['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'], |
|
| 35 | + ['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'], |
|
| 36 | + ['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'], |
|
| 37 | + ['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'], |
|
| 38 | + ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'], |
|
| 39 | + ], |
|
| 40 | 40 | ]; |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | // no php execution timeout for webdav |
| 23 | 23 | if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) { |
| 24 | - @set_time_limit(0); |
|
| 24 | + @set_time_limit(0); |
|
| 25 | 25 | } |
| 26 | 26 | ignore_user_abort(true); |
| 27 | 27 | |
@@ -37,57 +37,57 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | class ConsoleOutput implements IOutput { |
| 39 | 39 | |
| 40 | - /** @var OutputInterface */ |
|
| 41 | - private $output; |
|
| 40 | + /** @var OutputInterface */ |
|
| 41 | + private $output; |
|
| 42 | 42 | |
| 43 | - /** @var ProgressBar */ |
|
| 44 | - private $progressBar; |
|
| 43 | + /** @var ProgressBar */ |
|
| 44 | + private $progressBar; |
|
| 45 | 45 | |
| 46 | - public function __construct(OutputInterface $output) { |
|
| 47 | - $this->output = $output; |
|
| 48 | - } |
|
| 46 | + public function __construct(OutputInterface $output) { |
|
| 47 | + $this->output = $output; |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * @param string $message |
|
| 52 | - */ |
|
| 53 | - public function info($message) { |
|
| 54 | - $this->output->writeln("<info>$message</info>"); |
|
| 55 | - } |
|
| 50 | + /** |
|
| 51 | + * @param string $message |
|
| 52 | + */ |
|
| 53 | + public function info($message) { |
|
| 54 | + $this->output->writeln("<info>$message</info>"); |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * @param string $message |
|
| 59 | - */ |
|
| 60 | - public function warning($message) { |
|
| 61 | - $this->output->writeln("<comment>$message</comment>"); |
|
| 62 | - } |
|
| 57 | + /** |
|
| 58 | + * @param string $message |
|
| 59 | + */ |
|
| 60 | + public function warning($message) { |
|
| 61 | + $this->output->writeln("<comment>$message</comment>"); |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * @param int $max |
|
| 66 | - */ |
|
| 67 | - public function startProgress($max = 0) { |
|
| 68 | - if (!is_null($this->progressBar)) { |
|
| 69 | - $this->progressBar->finish(); |
|
| 70 | - } |
|
| 71 | - $this->progressBar = new ProgressBar($this->output); |
|
| 72 | - $this->progressBar->start($max); |
|
| 73 | - } |
|
| 64 | + /** |
|
| 65 | + * @param int $max |
|
| 66 | + */ |
|
| 67 | + public function startProgress($max = 0) { |
|
| 68 | + if (!is_null($this->progressBar)) { |
|
| 69 | + $this->progressBar->finish(); |
|
| 70 | + } |
|
| 71 | + $this->progressBar = new ProgressBar($this->output); |
|
| 72 | + $this->progressBar->start($max); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - /** |
|
| 76 | - * @param int $step |
|
| 77 | - * @param string $description |
|
| 78 | - */ |
|
| 79 | - public function advance($step = 1, $description = '') { |
|
| 80 | - if (!is_null($this->progressBar)) { |
|
| 81 | - $this->progressBar = new ProgressBar($this->output); |
|
| 82 | - $this->progressBar->start(); |
|
| 83 | - } |
|
| 84 | - $this->progressBar->advance($step); |
|
| 85 | - } |
|
| 75 | + /** |
|
| 76 | + * @param int $step |
|
| 77 | + * @param string $description |
|
| 78 | + */ |
|
| 79 | + public function advance($step = 1, $description = '') { |
|
| 80 | + if (!is_null($this->progressBar)) { |
|
| 81 | + $this->progressBar = new ProgressBar($this->output); |
|
| 82 | + $this->progressBar->start(); |
|
| 83 | + } |
|
| 84 | + $this->progressBar->advance($step); |
|
| 85 | + } |
|
| 86 | 86 | |
| 87 | - public function finishProgress() { |
|
| 88 | - if (is_null($this->progressBar)) { |
|
| 89 | - return; |
|
| 90 | - } |
|
| 91 | - $this->progressBar->finish(); |
|
| 92 | - } |
|
| 87 | + public function finishProgress() { |
|
| 88 | + if (is_null($this->progressBar)) { |
|
| 89 | + return; |
|
| 90 | + } |
|
| 91 | + $this->progressBar->finish(); |
|
| 92 | + } |
|
| 93 | 93 | } |
@@ -31,36 +31,36 @@ |
||
| 31 | 31 | */ |
| 32 | 32 | interface IEntry extends JsonSerializable { |
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * @since 12.0 |
|
| 36 | - * @return string |
|
| 37 | - */ |
|
| 38 | - public function getFullName(); |
|
| 34 | + /** |
|
| 35 | + * @since 12.0 |
|
| 36 | + * @return string |
|
| 37 | + */ |
|
| 38 | + public function getFullName(); |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * @since 12.0 |
|
| 42 | - * @return string[] |
|
| 43 | - */ |
|
| 44 | - public function getEMailAddresses(); |
|
| 40 | + /** |
|
| 41 | + * @since 12.0 |
|
| 42 | + * @return string[] |
|
| 43 | + */ |
|
| 44 | + public function getEMailAddresses(); |
|
| 45 | 45 | |
| 46 | - /** |
|
| 47 | - * @since 12.0 |
|
| 48 | - * @return string|null image URI |
|
| 49 | - */ |
|
| 50 | - public function getAvatar(); |
|
| 46 | + /** |
|
| 47 | + * @since 12.0 |
|
| 48 | + * @return string|null image URI |
|
| 49 | + */ |
|
| 50 | + public function getAvatar(); |
|
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * @since 12.0 |
|
| 54 | - * @param IAction $action an action to show in the contacts menu |
|
| 55 | - */ |
|
| 56 | - public function addAction(IAction $action); |
|
| 52 | + /** |
|
| 53 | + * @since 12.0 |
|
| 54 | + * @param IAction $action an action to show in the contacts menu |
|
| 55 | + */ |
|
| 56 | + public function addAction(IAction $action); |
|
| 57 | 57 | |
| 58 | - /** |
|
| 59 | - * Get an arbitrary property from the contact |
|
| 60 | - * |
|
| 61 | - * @since 12.0 |
|
| 62 | - * @param string $key |
|
| 63 | - * @return mixed the value of the property or null |
|
| 64 | - */ |
|
| 65 | - public function getProperty($key); |
|
| 58 | + /** |
|
| 59 | + * Get an arbitrary property from the contact |
|
| 60 | + * |
|
| 61 | + * @since 12.0 |
|
| 62 | + * @param string $key |
|
| 63 | + * @return mixed the value of the property or null |
|
| 64 | + */ |
|
| 65 | + public function getProperty($key); |
|
| 66 | 66 | } |
@@ -7,23 +7,23 @@ |
||
| 7 | 7 | |
| 8 | 8 | class RootCollection extends AbstractPrincipalCollection { |
| 9 | 9 | |
| 10 | - /** |
|
| 11 | - * This method returns a node for a principal. |
|
| 12 | - * |
|
| 13 | - * The passed array contains principal information, and is guaranteed to |
|
| 14 | - * at least contain a uri item. Other properties may or may not be |
|
| 15 | - * supplied by the authentication backend. |
|
| 16 | - * |
|
| 17 | - * @param array $principalInfo |
|
| 18 | - * @return AvatarHome |
|
| 19 | - */ |
|
| 20 | - public function getChildForPrincipal(array $principalInfo) { |
|
| 21 | - $avatarManager = \OC::$server->getAvatarManager(); |
|
| 22 | - return new AvatarHome($principalInfo, $avatarManager); |
|
| 23 | - } |
|
| 10 | + /** |
|
| 11 | + * This method returns a node for a principal. |
|
| 12 | + * |
|
| 13 | + * The passed array contains principal information, and is guaranteed to |
|
| 14 | + * at least contain a uri item. Other properties may or may not be |
|
| 15 | + * supplied by the authentication backend. |
|
| 16 | + * |
|
| 17 | + * @param array $principalInfo |
|
| 18 | + * @return AvatarHome |
|
| 19 | + */ |
|
| 20 | + public function getChildForPrincipal(array $principalInfo) { |
|
| 21 | + $avatarManager = \OC::$server->getAvatarManager(); |
|
| 22 | + return new AvatarHome($principalInfo, $avatarManager); |
|
| 23 | + } |
|
| 24 | 24 | |
| 25 | - public function getName() { |
|
| 26 | - return 'avatars'; |
|
| 27 | - } |
|
| 25 | + public function getName() { |
|
| 26 | + return 'avatars'; |
|
| 27 | + } |
|
| 28 | 28 | |
| 29 | 29 | } |
@@ -33,87 +33,87 @@ |
||
| 33 | 33 | |
| 34 | 34 | class CalDAVRemoveEmptyValue implements IRepairStep { |
| 35 | 35 | |
| 36 | - /** @var IDBConnection */ |
|
| 37 | - private $db; |
|
| 38 | - |
|
| 39 | - /** @var CalDavBackend */ |
|
| 40 | - private $calDavBackend; |
|
| 41 | - |
|
| 42 | - /** @var ILogger */ |
|
| 43 | - private $logger; |
|
| 44 | - |
|
| 45 | - /** |
|
| 46 | - * @param IDBConnection $db |
|
| 47 | - * @param CalDavBackend $calDavBackend |
|
| 48 | - * @param ILogger $logger |
|
| 49 | - */ |
|
| 50 | - public function __construct(IDBConnection $db, CalDavBackend $calDavBackend, ILogger $logger) { |
|
| 51 | - $this->db = $db; |
|
| 52 | - $this->calDavBackend = $calDavBackend; |
|
| 53 | - $this->logger = $logger; |
|
| 54 | - } |
|
| 55 | - |
|
| 56 | - public function getName() { |
|
| 57 | - return 'Fix broken values of calendar objects'; |
|
| 58 | - } |
|
| 59 | - |
|
| 60 | - public function run(IOutput $output) { |
|
| 61 | - $pattern = ';VALUE=:'; |
|
| 62 | - $count = $warnings = 0; |
|
| 63 | - |
|
| 64 | - $objects = $this->getInvalidObjects($pattern); |
|
| 65 | - |
|
| 66 | - $output->startProgress(count($objects)); |
|
| 67 | - foreach ($objects as $row) { |
|
| 68 | - $calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']); |
|
| 69 | - $data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']); |
|
| 70 | - |
|
| 71 | - if ($data !== $calObject['calendardata']) { |
|
| 72 | - $output->advance(); |
|
| 73 | - |
|
| 74 | - try { |
|
| 75 | - $this->calDavBackend->getDenormalizedData($data); |
|
| 76 | - } catch (InvalidDataException $e) { |
|
| 77 | - $this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [ |
|
| 78 | - 'app' => 'dav', |
|
| 79 | - 'cal' => (int)$row['calendarid'], |
|
| 80 | - 'uri' => $row['uri'], |
|
| 81 | - ]); |
|
| 82 | - $warnings++; |
|
| 83 | - continue; |
|
| 84 | - } |
|
| 85 | - |
|
| 86 | - $this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data); |
|
| 87 | - $count++; |
|
| 88 | - } |
|
| 89 | - } |
|
| 90 | - $output->finishProgress(); |
|
| 91 | - |
|
| 92 | - if ($warnings > 0) { |
|
| 93 | - $output->warning(sprintf('%d events could not be updated, see log file for more information', $warnings)); |
|
| 94 | - } |
|
| 95 | - if ($count > 0) { |
|
| 96 | - $output->info(sprintf('Updated %d events', $count)); |
|
| 97 | - } |
|
| 98 | - } |
|
| 99 | - |
|
| 100 | - protected function getInvalidObjects($pattern) { |
|
| 101 | - $query = $this->db->getQueryBuilder(); |
|
| 102 | - $query->select(['calendarid', 'uri']) |
|
| 103 | - ->from('calendarobjects') |
|
| 104 | - ->where($query->expr()->like( |
|
| 105 | - 'calendardata', |
|
| 106 | - $query->createNamedParameter( |
|
| 107 | - '%' . $this->db->escapeLikeParameter($pattern) . '%', |
|
| 108 | - IQueryBuilder::PARAM_STR |
|
| 109 | - ), |
|
| 110 | - IQueryBuilder::PARAM_STR |
|
| 111 | - )); |
|
| 112 | - |
|
| 113 | - $result = $query->execute(); |
|
| 114 | - $rows = $result->fetchAll(); |
|
| 115 | - $result->closeCursor(); |
|
| 116 | - |
|
| 117 | - return $rows; |
|
| 118 | - } |
|
| 36 | + /** @var IDBConnection */ |
|
| 37 | + private $db; |
|
| 38 | + |
|
| 39 | + /** @var CalDavBackend */ |
|
| 40 | + private $calDavBackend; |
|
| 41 | + |
|
| 42 | + /** @var ILogger */ |
|
| 43 | + private $logger; |
|
| 44 | + |
|
| 45 | + /** |
|
| 46 | + * @param IDBConnection $db |
|
| 47 | + * @param CalDavBackend $calDavBackend |
|
| 48 | + * @param ILogger $logger |
|
| 49 | + */ |
|
| 50 | + public function __construct(IDBConnection $db, CalDavBackend $calDavBackend, ILogger $logger) { |
|
| 51 | + $this->db = $db; |
|
| 52 | + $this->calDavBackend = $calDavBackend; |
|
| 53 | + $this->logger = $logger; |
|
| 54 | + } |
|
| 55 | + |
|
| 56 | + public function getName() { |
|
| 57 | + return 'Fix broken values of calendar objects'; |
|
| 58 | + } |
|
| 59 | + |
|
| 60 | + public function run(IOutput $output) { |
|
| 61 | + $pattern = ';VALUE=:'; |
|
| 62 | + $count = $warnings = 0; |
|
| 63 | + |
|
| 64 | + $objects = $this->getInvalidObjects($pattern); |
|
| 65 | + |
|
| 66 | + $output->startProgress(count($objects)); |
|
| 67 | + foreach ($objects as $row) { |
|
| 68 | + $calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']); |
|
| 69 | + $data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']); |
|
| 70 | + |
|
| 71 | + if ($data !== $calObject['calendardata']) { |
|
| 72 | + $output->advance(); |
|
| 73 | + |
|
| 74 | + try { |
|
| 75 | + $this->calDavBackend->getDenormalizedData($data); |
|
| 76 | + } catch (InvalidDataException $e) { |
|
| 77 | + $this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [ |
|
| 78 | + 'app' => 'dav', |
|
| 79 | + 'cal' => (int)$row['calendarid'], |
|
| 80 | + 'uri' => $row['uri'], |
|
| 81 | + ]); |
|
| 82 | + $warnings++; |
|
| 83 | + continue; |
|
| 84 | + } |
|
| 85 | + |
|
| 86 | + $this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data); |
|
| 87 | + $count++; |
|
| 88 | + } |
|
| 89 | + } |
|
| 90 | + $output->finishProgress(); |
|
| 91 | + |
|
| 92 | + if ($warnings > 0) { |
|
| 93 | + $output->warning(sprintf('%d events could not be updated, see log file for more information', $warnings)); |
|
| 94 | + } |
|
| 95 | + if ($count > 0) { |
|
| 96 | + $output->info(sprintf('Updated %d events', $count)); |
|
| 97 | + } |
|
| 98 | + } |
|
| 99 | + |
|
| 100 | + protected function getInvalidObjects($pattern) { |
|
| 101 | + $query = $this->db->getQueryBuilder(); |
|
| 102 | + $query->select(['calendarid', 'uri']) |
|
| 103 | + ->from('calendarobjects') |
|
| 104 | + ->where($query->expr()->like( |
|
| 105 | + 'calendardata', |
|
| 106 | + $query->createNamedParameter( |
|
| 107 | + '%' . $this->db->escapeLikeParameter($pattern) . '%', |
|
| 108 | + IQueryBuilder::PARAM_STR |
|
| 109 | + ), |
|
| 110 | + IQueryBuilder::PARAM_STR |
|
| 111 | + )); |
|
| 112 | + |
|
| 113 | + $result = $query->execute(); |
|
| 114 | + $rows = $result->fetchAll(); |
|
| 115 | + $result->closeCursor(); |
|
| 116 | + |
|
| 117 | + return $rows; |
|
| 118 | + } |
|
| 119 | 119 | } |
@@ -24,56 +24,56 @@ |
||
| 24 | 24 | use OCP\Lockdown\ILockdownManager; |
| 25 | 25 | |
| 26 | 26 | class LockdownManager implements ILockdownManager { |
| 27 | - /** @var ISession */ |
|
| 28 | - private $sessionCallback; |
|
| 27 | + /** @var ISession */ |
|
| 28 | + private $sessionCallback; |
|
| 29 | 29 | |
| 30 | - private $enabled = false; |
|
| 30 | + private $enabled = false; |
|
| 31 | 31 | |
| 32 | - /** @var array|null */ |
|
| 33 | - private $scope; |
|
| 32 | + /** @var array|null */ |
|
| 33 | + private $scope; |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * LockdownManager constructor. |
|
| 37 | - * |
|
| 38 | - * @param callable $sessionCallback we need to inject the session lazily to avoid dependency loops |
|
| 39 | - */ |
|
| 40 | - public function __construct(callable $sessionCallback) { |
|
| 41 | - $this->sessionCallback = $sessionCallback; |
|
| 42 | - } |
|
| 35 | + /** |
|
| 36 | + * LockdownManager constructor. |
|
| 37 | + * |
|
| 38 | + * @param callable $sessionCallback we need to inject the session lazily to avoid dependency loops |
|
| 39 | + */ |
|
| 40 | + public function __construct(callable $sessionCallback) { |
|
| 41 | + $this->sessionCallback = $sessionCallback; |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | 44 | |
| 45 | - public function enable() { |
|
| 46 | - $this->enabled = true; |
|
| 47 | - } |
|
| 45 | + public function enable() { |
|
| 46 | + $this->enabled = true; |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * @return ISession |
|
| 51 | - */ |
|
| 52 | - private function getSession() { |
|
| 53 | - $callback = $this->sessionCallback; |
|
| 54 | - return $callback(); |
|
| 55 | - } |
|
| 49 | + /** |
|
| 50 | + * @return ISession |
|
| 51 | + */ |
|
| 52 | + private function getSession() { |
|
| 53 | + $callback = $this->sessionCallback; |
|
| 54 | + return $callback(); |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - private function getScopeAsArray() { |
|
| 58 | - if (!$this->scope) { |
|
| 59 | - $session = $this->getSession(); |
|
| 60 | - $sessionScope = $session->get('token_scope'); |
|
| 61 | - if ($sessionScope) { |
|
| 62 | - $this->scope = $sessionScope; |
|
| 63 | - } |
|
| 64 | - } |
|
| 65 | - return $this->scope; |
|
| 66 | - } |
|
| 57 | + private function getScopeAsArray() { |
|
| 58 | + if (!$this->scope) { |
|
| 59 | + $session = $this->getSession(); |
|
| 60 | + $sessionScope = $session->get('token_scope'); |
|
| 61 | + if ($sessionScope) { |
|
| 62 | + $this->scope = $sessionScope; |
|
| 63 | + } |
|
| 64 | + } |
|
| 65 | + return $this->scope; |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - public function setToken(IToken $token) { |
|
| 69 | - $this->scope = $token->getScopeAsArray(); |
|
| 70 | - $session = $this->getSession(); |
|
| 71 | - $session->set('token_scope', $this->scope); |
|
| 72 | - $this->enable(); |
|
| 73 | - } |
|
| 68 | + public function setToken(IToken $token) { |
|
| 69 | + $this->scope = $token->getScopeAsArray(); |
|
| 70 | + $session = $this->getSession(); |
|
| 71 | + $session->set('token_scope', $this->scope); |
|
| 72 | + $this->enable(); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - public function canAccessFilesystem() { |
|
| 76 | - $scope = $this->getScopeAsArray(); |
|
| 77 | - return !$scope || $scope['filesystem']; |
|
| 78 | - } |
|
| 75 | + public function canAccessFilesystem() { |
|
| 76 | + $scope = $this->getScopeAsArray(); |
|
| 77 | + return !$scope || $scope['filesystem']; |
|
| 78 | + } |
|
| 79 | 79 | } |
@@ -29,10 +29,10 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | interface IProvider { |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @since 12.0 |
|
| 34 | - * @param IEntry $entry |
|
| 35 | - * @return void |
|
| 36 | - */ |
|
| 37 | - public function process(IEntry $entry); |
|
| 32 | + /** |
|
| 33 | + * @since 12.0 |
|
| 34 | + * @param IEntry $entry |
|
| 35 | + * @return void |
|
| 36 | + */ |
|
| 37 | + public function process(IEntry $entry); |
|
| 38 | 38 | } |