@@ -21,62 +21,62 @@ |
||
21 | 21 | */ |
22 | 22 | |
23 | 23 | return [ |
24 | - 'routes' => [ |
|
25 | - [ |
|
26 | - 'name' => 'RateLimitTest#userAndAnonProtected', |
|
27 | - 'url' => '/userAndAnonProtected', |
|
28 | - 'verb' => 'GET', |
|
29 | - ], |
|
30 | - [ |
|
31 | - 'name' => 'RateLimitTest#onlyAnonProtected', |
|
32 | - 'url' => '/anonProtected', |
|
33 | - 'verb' => 'GET', |
|
34 | - ], |
|
35 | - ], |
|
24 | + 'routes' => [ |
|
25 | + [ |
|
26 | + 'name' => 'RateLimitTest#userAndAnonProtected', |
|
27 | + 'url' => '/userAndAnonProtected', |
|
28 | + 'verb' => 'GET', |
|
29 | + ], |
|
30 | + [ |
|
31 | + 'name' => 'RateLimitTest#onlyAnonProtected', |
|
32 | + 'url' => '/anonProtected', |
|
33 | + 'verb' => 'GET', |
|
34 | + ], |
|
35 | + ], |
|
36 | 36 | |
37 | - 'ocs' => [ |
|
38 | - [ |
|
39 | - 'name' => 'Config#setAppValue', |
|
40 | - 'url' => '/api/v1/app/{appid}/{configkey}', |
|
41 | - 'verb' => 'POST', |
|
42 | - ], |
|
43 | - [ |
|
44 | - 'name' => 'Config#deleteAppValue', |
|
45 | - 'url' => '/api/v1/app/{appid}/{configkey}', |
|
46 | - 'verb' => 'DELETE', |
|
47 | - ], |
|
48 | - [ |
|
49 | - 'name' => 'Locking#isLockingEnabled', |
|
50 | - 'url' => '/api/v1/lockprovisioning', |
|
51 | - 'verb' => 'GET', |
|
52 | - ], |
|
53 | - [ |
|
54 | - 'name' => 'Locking#isLocked', |
|
55 | - 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
56 | - 'verb' => 'GET', |
|
57 | - ], |
|
58 | - [ |
|
59 | - 'name' => 'Locking#acquireLock', |
|
60 | - 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
61 | - 'verb' => 'POST', |
|
62 | - ], |
|
63 | - [ |
|
64 | - 'name' => 'Locking#changeLock', |
|
65 | - 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
66 | - 'verb' => 'PUT', |
|
67 | - ], |
|
68 | - [ |
|
69 | - 'name' => 'Locking#releaseLock', |
|
70 | - 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
71 | - 'verb' => 'DELETE', |
|
72 | - ], |
|
73 | - [ |
|
74 | - 'name' => 'Locking#releaseAll', |
|
75 | - 'url' => '/api/v1/lockprovisioning/{type}', |
|
76 | - 'verb' => 'DELETE', |
|
77 | - 'defaults' => [ |
|
78 | - 'type' => null |
|
79 | - ] |
|
80 | - ], |
|
81 | - ], |
|
37 | + 'ocs' => [ |
|
38 | + [ |
|
39 | + 'name' => 'Config#setAppValue', |
|
40 | + 'url' => '/api/v1/app/{appid}/{configkey}', |
|
41 | + 'verb' => 'POST', |
|
42 | + ], |
|
43 | + [ |
|
44 | + 'name' => 'Config#deleteAppValue', |
|
45 | + 'url' => '/api/v1/app/{appid}/{configkey}', |
|
46 | + 'verb' => 'DELETE', |
|
47 | + ], |
|
48 | + [ |
|
49 | + 'name' => 'Locking#isLockingEnabled', |
|
50 | + 'url' => '/api/v1/lockprovisioning', |
|
51 | + 'verb' => 'GET', |
|
52 | + ], |
|
53 | + [ |
|
54 | + 'name' => 'Locking#isLocked', |
|
55 | + 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
56 | + 'verb' => 'GET', |
|
57 | + ], |
|
58 | + [ |
|
59 | + 'name' => 'Locking#acquireLock', |
|
60 | + 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
61 | + 'verb' => 'POST', |
|
62 | + ], |
|
63 | + [ |
|
64 | + 'name' => 'Locking#changeLock', |
|
65 | + 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
66 | + 'verb' => 'PUT', |
|
67 | + ], |
|
68 | + [ |
|
69 | + 'name' => 'Locking#releaseLock', |
|
70 | + 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
71 | + 'verb' => 'DELETE', |
|
72 | + ], |
|
73 | + [ |
|
74 | + 'name' => 'Locking#releaseAll', |
|
75 | + 'url' => '/api/v1/lockprovisioning/{type}', |
|
76 | + 'verb' => 'DELETE', |
|
77 | + 'defaults' => [ |
|
78 | + 'type' => null |
|
79 | + ] |
|
80 | + ], |
|
81 | + ], |
|
82 | 82 | ]; |
@@ -32,14 +32,14 @@ |
||
32 | 32 | * @since 9.1.0 |
33 | 33 | */ |
34 | 34 | class OCSNotFoundException extends OCSException { |
35 | - /** |
|
36 | - * OCSNotFoundException constructor. |
|
37 | - * |
|
38 | - * @param string $message |
|
39 | - * @param Exception|null $previous |
|
40 | - * @since 9.1.0 |
|
41 | - */ |
|
42 | - public function __construct($message = '', Exception $previous = null) { |
|
43 | - parent::__construct($message, Http::STATUS_NOT_FOUND, $previous); |
|
44 | - } |
|
35 | + /** |
|
36 | + * OCSNotFoundException constructor. |
|
37 | + * |
|
38 | + * @param string $message |
|
39 | + * @param Exception|null $previous |
|
40 | + * @since 9.1.0 |
|
41 | + */ |
|
42 | + public function __construct($message = '', Exception $previous = null) { |
|
43 | + parent::__construct($message, Http::STATUS_NOT_FOUND, $previous); |
|
44 | + } |
|
45 | 45 | } |
@@ -32,14 +32,14 @@ |
||
32 | 32 | * @since 9.1.0 |
33 | 33 | */ |
34 | 34 | class OCSForbiddenException extends OCSException { |
35 | - /** |
|
36 | - * OCSForbiddenException constructor. |
|
37 | - * |
|
38 | - * @param string $message |
|
39 | - * @param Exception|null $previous |
|
40 | - * @since 9.1.0 |
|
41 | - */ |
|
42 | - public function __construct($message = '', Exception $previous = null) { |
|
43 | - parent::__construct($message, Http::STATUS_FORBIDDEN, $previous); |
|
44 | - } |
|
35 | + /** |
|
36 | + * OCSForbiddenException constructor. |
|
37 | + * |
|
38 | + * @param string $message |
|
39 | + * @param Exception|null $previous |
|
40 | + * @since 9.1.0 |
|
41 | + */ |
|
42 | + public function __construct($message = '', Exception $previous = null) { |
|
43 | + parent::__construct($message, Http::STATUS_FORBIDDEN, $previous); |
|
44 | + } |
|
45 | 45 | } |
@@ -32,14 +32,14 @@ |
||
32 | 32 | * @since 9.1.0 |
33 | 33 | */ |
34 | 34 | class OCSBadRequestException extends OCSException { |
35 | - /** |
|
36 | - * OCSBadRequestException constructor. |
|
37 | - * |
|
38 | - * @param string $message |
|
39 | - * @param Exception|null $previous |
|
40 | - * @since 9.1.0 |
|
41 | - */ |
|
42 | - public function __construct($message = '', Exception $previous = null) { |
|
43 | - parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous); |
|
44 | - } |
|
35 | + /** |
|
36 | + * OCSBadRequestException constructor. |
|
37 | + * |
|
38 | + * @param string $message |
|
39 | + * @param Exception|null $previous |
|
40 | + * @since 9.1.0 |
|
41 | + */ |
|
42 | + public function __construct($message = '', Exception $previous = null) { |
|
43 | + parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous); |
|
44 | + } |
|
45 | 45 | } |
@@ -31,33 +31,33 @@ |
||
31 | 31 | |
32 | 32 | class EMailProvider implements IProvider { |
33 | 33 | |
34 | - /** @var IActionFactory */ |
|
35 | - private $actionFactory; |
|
36 | - |
|
37 | - /** @var IURLGenerator */ |
|
38 | - private $urlGenerator; |
|
39 | - |
|
40 | - /** |
|
41 | - * @param IActionFactory $actionFactory |
|
42 | - * @param IURLGenerator $urlGenerator |
|
43 | - */ |
|
44 | - public function __construct(IActionFactory $actionFactory, IURLGenerator $urlGenerator) { |
|
45 | - $this->actionFactory = $actionFactory; |
|
46 | - $this->urlGenerator = $urlGenerator; |
|
47 | - } |
|
48 | - |
|
49 | - /** |
|
50 | - * @param IEntry $entry |
|
51 | - */ |
|
52 | - public function process(IEntry $entry) { |
|
53 | - $iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/mail.svg')); |
|
54 | - foreach ($entry->getEMailAddresses() as $address) { |
|
55 | - if (empty($address)) { |
|
56 | - // Skip |
|
57 | - continue; |
|
58 | - } |
|
59 | - $action = $this->actionFactory->newEMailAction($iconUrl, $address, $address); |
|
60 | - $entry->addAction($action); |
|
61 | - } |
|
62 | - } |
|
34 | + /** @var IActionFactory */ |
|
35 | + private $actionFactory; |
|
36 | + |
|
37 | + /** @var IURLGenerator */ |
|
38 | + private $urlGenerator; |
|
39 | + |
|
40 | + /** |
|
41 | + * @param IActionFactory $actionFactory |
|
42 | + * @param IURLGenerator $urlGenerator |
|
43 | + */ |
|
44 | + public function __construct(IActionFactory $actionFactory, IURLGenerator $urlGenerator) { |
|
45 | + $this->actionFactory = $actionFactory; |
|
46 | + $this->urlGenerator = $urlGenerator; |
|
47 | + } |
|
48 | + |
|
49 | + /** |
|
50 | + * @param IEntry $entry |
|
51 | + */ |
|
52 | + public function process(IEntry $entry) { |
|
53 | + $iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/mail.svg')); |
|
54 | + foreach ($entry->getEMailAddresses() as $address) { |
|
55 | + if (empty($address)) { |
|
56 | + // Skip |
|
57 | + continue; |
|
58 | + } |
|
59 | + $action = $this->actionFactory->newEMailAction($iconUrl, $address, $address); |
|
60 | + $entry->addAction($action); |
|
61 | + } |
|
62 | + } |
|
63 | 63 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | * @package OC\AppFramework\Middleware\Security\Exceptions |
33 | 33 | */ |
34 | 34 | class StrictCookieMissingException extends SecurityException { |
35 | - public function __construct() { |
|
36 | - parent::__construct('Strict Cookie has not been found in request.', Http::STATUS_PRECONDITION_FAILED); |
|
37 | - } |
|
35 | + public function __construct() { |
|
36 | + parent::__construct('Strict Cookie has not been found in request.', Http::STATUS_PRECONDITION_FAILED); |
|
37 | + } |
|
38 | 38 | } |
@@ -29,40 +29,40 @@ |
||
29 | 29 | |
30 | 30 | class FedAuth extends AbstractBasic { |
31 | 31 | |
32 | - /** @var DbHandler */ |
|
33 | - private $db; |
|
32 | + /** @var DbHandler */ |
|
33 | + private $db; |
|
34 | 34 | |
35 | - /** |
|
36 | - * FedAuth constructor. |
|
37 | - * |
|
38 | - * @param DbHandler $db |
|
39 | - */ |
|
40 | - public function __construct(DbHandler $db) { |
|
41 | - $this->db = $db; |
|
42 | - $this->principalPrefix = 'principals/system/'; |
|
35 | + /** |
|
36 | + * FedAuth constructor. |
|
37 | + * |
|
38 | + * @param DbHandler $db |
|
39 | + */ |
|
40 | + public function __construct(DbHandler $db) { |
|
41 | + $this->db = $db; |
|
42 | + $this->principalPrefix = 'principals/system/'; |
|
43 | 43 | |
44 | - // setup realm |
|
45 | - $defaults = new \OCP\Defaults(); |
|
46 | - $this->realm = $defaults->getName(); |
|
47 | - } |
|
44 | + // setup realm |
|
45 | + $defaults = new \OCP\Defaults(); |
|
46 | + $this->realm = $defaults->getName(); |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * Validates a username and password |
|
51 | - * |
|
52 | - * This method should return true or false depending on if login |
|
53 | - * succeeded. |
|
54 | - * |
|
55 | - * @param string $username |
|
56 | - * @param string $password |
|
57 | - * @return bool |
|
58 | - */ |
|
59 | - protected function validateUserPass($username, $password) { |
|
60 | - return $this->db->auth($username, $password); |
|
61 | - } |
|
49 | + /** |
|
50 | + * Validates a username and password |
|
51 | + * |
|
52 | + * This method should return true or false depending on if login |
|
53 | + * succeeded. |
|
54 | + * |
|
55 | + * @param string $username |
|
56 | + * @param string $password |
|
57 | + * @return bool |
|
58 | + */ |
|
59 | + protected function validateUserPass($username, $password) { |
|
60 | + return $this->db->auth($username, $password); |
|
61 | + } |
|
62 | 62 | |
63 | - /** |
|
64 | - * @inheritdoc |
|
65 | - */ |
|
66 | - public function challenge(RequestInterface $request, ResponseInterface $response) { |
|
67 | - } |
|
63 | + /** |
|
64 | + * @inheritdoc |
|
65 | + */ |
|
66 | + public function challenge(RequestInterface $request, ResponseInterface $response) { |
|
67 | + } |
|
68 | 68 | } |
@@ -29,59 +29,59 @@ |
||
29 | 29 | namespace OC\L10N; |
30 | 30 | |
31 | 31 | class L10NString implements \JsonSerializable { |
32 | - /** @var \OC\L10N\L10N */ |
|
33 | - protected $l10n; |
|
32 | + /** @var \OC\L10N\L10N */ |
|
33 | + protected $l10n; |
|
34 | 34 | |
35 | - /** @var string */ |
|
36 | - protected $text; |
|
35 | + /** @var string */ |
|
36 | + protected $text; |
|
37 | 37 | |
38 | - /** @var array */ |
|
39 | - protected $parameters; |
|
38 | + /** @var array */ |
|
39 | + protected $parameters; |
|
40 | 40 | |
41 | - /** @var integer */ |
|
42 | - protected $count; |
|
41 | + /** @var integer */ |
|
42 | + protected $count; |
|
43 | 43 | |
44 | - /** |
|
45 | - * @param \OC\L10N\L10N $l10n |
|
46 | - * @param string|string[] $text |
|
47 | - * @param array $parameters |
|
48 | - * @param int $count |
|
49 | - */ |
|
50 | - public function __construct(\OC\L10N\L10N $l10n, $text, $parameters, $count = 1) { |
|
51 | - $this->l10n = $l10n; |
|
52 | - $this->text = $text; |
|
53 | - $this->parameters = $parameters; |
|
54 | - $this->count = $count; |
|
55 | - } |
|
44 | + /** |
|
45 | + * @param \OC\L10N\L10N $l10n |
|
46 | + * @param string|string[] $text |
|
47 | + * @param array $parameters |
|
48 | + * @param int $count |
|
49 | + */ |
|
50 | + public function __construct(\OC\L10N\L10N $l10n, $text, $parameters, $count = 1) { |
|
51 | + $this->l10n = $l10n; |
|
52 | + $this->text = $text; |
|
53 | + $this->parameters = $parameters; |
|
54 | + $this->count = $count; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * @return string |
|
59 | - */ |
|
60 | - public function __toString() { |
|
61 | - $translations = $this->l10n->getTranslations(); |
|
57 | + /** |
|
58 | + * @return string |
|
59 | + */ |
|
60 | + public function __toString() { |
|
61 | + $translations = $this->l10n->getTranslations(); |
|
62 | 62 | |
63 | - $text = $this->text; |
|
64 | - if(array_key_exists($this->text, $translations)) { |
|
65 | - if(is_array($translations[$this->text])) { |
|
66 | - $fn = $this->l10n->getPluralFormFunction(); |
|
67 | - $id = $fn($this->count); |
|
68 | - $text = $translations[$this->text][$id]; |
|
69 | - } |
|
70 | - else{ |
|
71 | - $text = $translations[$this->text]; |
|
72 | - } |
|
73 | - } |
|
63 | + $text = $this->text; |
|
64 | + if(array_key_exists($this->text, $translations)) { |
|
65 | + if(is_array($translations[$this->text])) { |
|
66 | + $fn = $this->l10n->getPluralFormFunction(); |
|
67 | + $id = $fn($this->count); |
|
68 | + $text = $translations[$this->text][$id]; |
|
69 | + } |
|
70 | + else{ |
|
71 | + $text = $translations[$this->text]; |
|
72 | + } |
|
73 | + } |
|
74 | 74 | |
75 | - // Replace %n first (won't interfere with vsprintf) |
|
76 | - $text = str_replace('%n', (string)$this->count, $text); |
|
77 | - return vsprintf($text, $this->parameters); |
|
78 | - } |
|
75 | + // Replace %n first (won't interfere with vsprintf) |
|
76 | + $text = str_replace('%n', (string)$this->count, $text); |
|
77 | + return vsprintf($text, $this->parameters); |
|
78 | + } |
|
79 | 79 | |
80 | 80 | |
81 | - /** |
|
82 | - * @return string |
|
83 | - */ |
|
84 | - public function jsonSerialize() { |
|
85 | - return $this->__toString(); |
|
86 | - } |
|
81 | + /** |
|
82 | + * @return string |
|
83 | + */ |
|
84 | + public function jsonSerialize() { |
|
85 | + return $this->__toString(); |
|
86 | + } |
|
87 | 87 | } |
@@ -24,58 +24,58 @@ |
||
24 | 24 | use OCP\IL10N; |
25 | 25 | |
26 | 26 | class BundleFetcher { |
27 | - /** @var IL10N */ |
|
28 | - private $l10n; |
|
27 | + /** @var IL10N */ |
|
28 | + private $l10n; |
|
29 | 29 | |
30 | - /** |
|
31 | - * @param IL10N $l10n |
|
32 | - */ |
|
33 | - public function __construct(IL10N $l10n) { |
|
34 | - $this->l10n = $l10n; |
|
35 | - } |
|
30 | + /** |
|
31 | + * @param IL10N $l10n |
|
32 | + */ |
|
33 | + public function __construct(IL10N $l10n) { |
|
34 | + $this->l10n = $l10n; |
|
35 | + } |
|
36 | 36 | |
37 | - /** |
|
38 | - * @return Bundle[] |
|
39 | - */ |
|
40 | - public function getBundles() { |
|
41 | - return [ |
|
42 | - new EnterpriseBundle($this->l10n), |
|
43 | - new GroupwareBundle($this->l10n), |
|
44 | - new SocialSharingBundle($this->l10n), |
|
45 | - new EducationBundle($this->l10n), |
|
46 | - ]; |
|
47 | - } |
|
37 | + /** |
|
38 | + * @return Bundle[] |
|
39 | + */ |
|
40 | + public function getBundles() { |
|
41 | + return [ |
|
42 | + new EnterpriseBundle($this->l10n), |
|
43 | + new GroupwareBundle($this->l10n), |
|
44 | + new SocialSharingBundle($this->l10n), |
|
45 | + new EducationBundle($this->l10n), |
|
46 | + ]; |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * Bundles that should be installed by default after installation |
|
51 | - * |
|
52 | - * @return Bundle[] |
|
53 | - */ |
|
54 | - public function getDefaultInstallationBundle() { |
|
55 | - return [ |
|
56 | - new CoreBundle($this->l10n), |
|
57 | - ]; |
|
58 | - } |
|
49 | + /** |
|
50 | + * Bundles that should be installed by default after installation |
|
51 | + * |
|
52 | + * @return Bundle[] |
|
53 | + */ |
|
54 | + public function getDefaultInstallationBundle() { |
|
55 | + return [ |
|
56 | + new CoreBundle($this->l10n), |
|
57 | + ]; |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * Get the bundle with the specified identifier |
|
62 | - * |
|
63 | - * @param string $identifier |
|
64 | - * @return Bundle |
|
65 | - * @throws \BadMethodCallException If the bundle does not exist |
|
66 | - */ |
|
67 | - public function getBundleByIdentifier($identifier) { |
|
68 | - /** @var Bundle[] $bundles */ |
|
69 | - $bundles = array_merge( |
|
70 | - $this->getBundles(), |
|
71 | - $this->getDefaultInstallationBundle() |
|
72 | - ); |
|
73 | - foreach($bundles as $bundle) { |
|
74 | - if($bundle->getIdentifier() === $identifier) { |
|
75 | - return $bundle; |
|
76 | - } |
|
77 | - } |
|
60 | + /** |
|
61 | + * Get the bundle with the specified identifier |
|
62 | + * |
|
63 | + * @param string $identifier |
|
64 | + * @return Bundle |
|
65 | + * @throws \BadMethodCallException If the bundle does not exist |
|
66 | + */ |
|
67 | + public function getBundleByIdentifier($identifier) { |
|
68 | + /** @var Bundle[] $bundles */ |
|
69 | + $bundles = array_merge( |
|
70 | + $this->getBundles(), |
|
71 | + $this->getDefaultInstallationBundle() |
|
72 | + ); |
|
73 | + foreach($bundles as $bundle) { |
|
74 | + if($bundle->getIdentifier() === $identifier) { |
|
75 | + return $bundle; |
|
76 | + } |
|
77 | + } |
|
78 | 78 | |
79 | - throw new \BadMethodCallException('Bundle with specified identifier does not exist'); |
|
80 | - } |
|
79 | + throw new \BadMethodCallException('Bundle with specified identifier does not exist'); |
|
80 | + } |
|
81 | 81 | } |