@@ -37,22 +37,22 @@ |
||
37 | 37 | |
38 | 38 | class Version1008Date20181030113700 extends SimpleMigrationStep { |
39 | 39 | |
40 | - /** |
|
41 | - * @param IOutput $output |
|
42 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
43 | - * @param array $options |
|
44 | - * @return null|ISchemaWrapper |
|
45 | - */ |
|
46 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
47 | - /** @var ISchemaWrapper $schema */ |
|
48 | - $schema = $schemaClosure(); |
|
49 | - |
|
50 | - $table = $schema->getTable('cards'); |
|
51 | - $table->addColumn('uid', Types::STRING, [ |
|
52 | - 'notnull' => false, |
|
53 | - 'length' => 255 |
|
54 | - ]); |
|
55 | - |
|
56 | - return $schema; |
|
57 | - } |
|
40 | + /** |
|
41 | + * @param IOutput $output |
|
42 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
43 | + * @param array $options |
|
44 | + * @return null|ISchemaWrapper |
|
45 | + */ |
|
46 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
47 | + /** @var ISchemaWrapper $schema */ |
|
48 | + $schema = $schemaClosure(); |
|
49 | + |
|
50 | + $table = $schema->getTable('cards'); |
|
51 | + $table->addColumn('uid', Types::STRING, [ |
|
52 | + 'notnull' => false, |
|
53 | + 'length' => 255 |
|
54 | + ]); |
|
55 | + |
|
56 | + return $schema; |
|
57 | + } |
|
58 | 58 | } |
@@ -30,29 +30,29 @@ |
||
30 | 30 | |
31 | 31 | class Version1004Date20170919104507 extends SimpleMigrationStep { |
32 | 32 | |
33 | - /** |
|
34 | - * @param IOutput $output |
|
35 | - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
36 | - * @param array $options |
|
37 | - * @return null|ISchemaWrapper |
|
38 | - * @since 13.0.0 |
|
39 | - */ |
|
40 | - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
41 | - /** @var ISchemaWrapper $schema */ |
|
42 | - $schema = $schemaClosure(); |
|
33 | + /** |
|
34 | + * @param IOutput $output |
|
35 | + * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
36 | + * @param array $options |
|
37 | + * @return null|ISchemaWrapper |
|
38 | + * @since 13.0.0 |
|
39 | + */ |
|
40 | + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
41 | + /** @var ISchemaWrapper $schema */ |
|
42 | + $schema = $schemaClosure(); |
|
43 | 43 | |
44 | - $table = $schema->getTable('addressbooks'); |
|
45 | - $column = $table->getColumn('id'); |
|
46 | - $column->setUnsigned(true); |
|
44 | + $table = $schema->getTable('addressbooks'); |
|
45 | + $column = $table->getColumn('id'); |
|
46 | + $column->setUnsigned(true); |
|
47 | 47 | |
48 | - $table = $schema->getTable('calendarobjects'); |
|
49 | - $column = $table->getColumn('id'); |
|
50 | - $column->setUnsigned(true); |
|
48 | + $table = $schema->getTable('calendarobjects'); |
|
49 | + $column = $table->getColumn('id'); |
|
50 | + $column->setUnsigned(true); |
|
51 | 51 | |
52 | - $table = $schema->getTable('calendarchanges'); |
|
53 | - $column = $table->getColumn('id'); |
|
54 | - $column->setUnsigned(true); |
|
52 | + $table = $schema->getTable('calendarchanges'); |
|
53 | + $column = $table->getColumn('id'); |
|
54 | + $column->setUnsigned(true); |
|
55 | 55 | |
56 | - return $schema; |
|
57 | - } |
|
56 | + return $schema; |
|
57 | + } |
|
58 | 58 | } |
@@ -33,20 +33,20 @@ |
||
33 | 33 | |
34 | 34 | class Version1002Date20180821043638 extends SimpleMigrationStep { |
35 | 35 | |
36 | - /** |
|
37 | - * @param IOutput $output |
|
38 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
39 | - * @param array $options |
|
40 | - * |
|
41 | - * @return ISchemaWrapper |
|
42 | - */ |
|
43 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
44 | - /** @var ISchemaWrapper $schema */ |
|
45 | - $schema = $schemaClosure(); |
|
46 | - $table = $schema->getTable('twofactor_backupcodes'); |
|
36 | + /** |
|
37 | + * @param IOutput $output |
|
38 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
39 | + * @param array $options |
|
40 | + * |
|
41 | + * @return ISchemaWrapper |
|
42 | + */ |
|
43 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
44 | + /** @var ISchemaWrapper $schema */ |
|
45 | + $schema = $schemaClosure(); |
|
46 | + $table = $schema->getTable('twofactor_backupcodes'); |
|
47 | 47 | |
48 | - $table->getColumn('code')->setLength(128); |
|
48 | + $table->getColumn('code')->setLength(128); |
|
49 | 49 | |
50 | - return $schema; |
|
51 | - } |
|
50 | + return $schema; |
|
51 | + } |
|
52 | 52 | } |
@@ -33,108 +33,108 @@ |
||
33 | 33 | use OCP\Files\Search\ISearchQuery; |
34 | 34 | |
35 | 35 | class NullCache implements ICache { |
36 | - public function getNumericStorageId() { |
|
37 | - return -1; |
|
38 | - } |
|
39 | - |
|
40 | - public function get($file) { |
|
41 | - return $file !== '' ? null : |
|
42 | - new CacheEntry([ |
|
43 | - 'fileid' => -1, |
|
44 | - 'parent' => -1, |
|
45 | - 'name' => '', |
|
46 | - 'path' => '', |
|
47 | - 'size' => '0', |
|
48 | - 'mtime' => time(), |
|
49 | - 'storage_mtime' => time(), |
|
50 | - 'etag' => '', |
|
51 | - 'mimetype' => FileInfo::MIMETYPE_FOLDER, |
|
52 | - 'mimepart' => 'httpd', |
|
53 | - 'permissions' => Constants::PERMISSION_READ |
|
54 | - ]); |
|
55 | - } |
|
56 | - |
|
57 | - public function getFolderContents($folder) { |
|
58 | - return []; |
|
59 | - } |
|
60 | - |
|
61 | - public function getFolderContentsById($fileId) { |
|
62 | - return []; |
|
63 | - } |
|
64 | - |
|
65 | - public function put($file, array $data) { |
|
66 | - throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
67 | - } |
|
68 | - |
|
69 | - public function insert($file, array $data) { |
|
70 | - throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
71 | - } |
|
72 | - |
|
73 | - public function update($id, array $data) { |
|
74 | - throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
75 | - } |
|
76 | - |
|
77 | - public function getId($file) { |
|
78 | - return -1; |
|
79 | - } |
|
80 | - |
|
81 | - public function getParentId($file) { |
|
82 | - return -1; |
|
83 | - } |
|
84 | - |
|
85 | - public function inCache($file) { |
|
86 | - return $file === ''; |
|
87 | - } |
|
88 | - |
|
89 | - public function remove($file) { |
|
90 | - throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
91 | - } |
|
92 | - |
|
93 | - public function move($source, $target) { |
|
94 | - throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
95 | - } |
|
96 | - |
|
97 | - public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) { |
|
98 | - throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
99 | - } |
|
100 | - |
|
101 | - public function getStatus($file) { |
|
102 | - return ICache::COMPLETE; |
|
103 | - } |
|
104 | - |
|
105 | - public function search($pattern) { |
|
106 | - return []; |
|
107 | - } |
|
108 | - |
|
109 | - public function searchByMime($mimetype) { |
|
110 | - return []; |
|
111 | - } |
|
112 | - |
|
113 | - public function searchQuery(ISearchQuery $query) { |
|
114 | - return []; |
|
115 | - } |
|
116 | - |
|
117 | - public function getIncomplete() { |
|
118 | - return []; |
|
119 | - } |
|
120 | - |
|
121 | - public function getPathById($id) { |
|
122 | - return ''; |
|
123 | - } |
|
124 | - |
|
125 | - public function normalize($path) { |
|
126 | - return $path; |
|
127 | - } |
|
128 | - |
|
129 | - public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, string $targetPath): int { |
|
130 | - throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
131 | - } |
|
132 | - |
|
133 | - public function getQueryFilterForStorage(): ISearchOperator { |
|
134 | - return new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'storage', -1); |
|
135 | - } |
|
136 | - |
|
137 | - public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry { |
|
138 | - return null; |
|
139 | - } |
|
36 | + public function getNumericStorageId() { |
|
37 | + return -1; |
|
38 | + } |
|
39 | + |
|
40 | + public function get($file) { |
|
41 | + return $file !== '' ? null : |
|
42 | + new CacheEntry([ |
|
43 | + 'fileid' => -1, |
|
44 | + 'parent' => -1, |
|
45 | + 'name' => '', |
|
46 | + 'path' => '', |
|
47 | + 'size' => '0', |
|
48 | + 'mtime' => time(), |
|
49 | + 'storage_mtime' => time(), |
|
50 | + 'etag' => '', |
|
51 | + 'mimetype' => FileInfo::MIMETYPE_FOLDER, |
|
52 | + 'mimepart' => 'httpd', |
|
53 | + 'permissions' => Constants::PERMISSION_READ |
|
54 | + ]); |
|
55 | + } |
|
56 | + |
|
57 | + public function getFolderContents($folder) { |
|
58 | + return []; |
|
59 | + } |
|
60 | + |
|
61 | + public function getFolderContentsById($fileId) { |
|
62 | + return []; |
|
63 | + } |
|
64 | + |
|
65 | + public function put($file, array $data) { |
|
66 | + throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
67 | + } |
|
68 | + |
|
69 | + public function insert($file, array $data) { |
|
70 | + throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
71 | + } |
|
72 | + |
|
73 | + public function update($id, array $data) { |
|
74 | + throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
75 | + } |
|
76 | + |
|
77 | + public function getId($file) { |
|
78 | + return -1; |
|
79 | + } |
|
80 | + |
|
81 | + public function getParentId($file) { |
|
82 | + return -1; |
|
83 | + } |
|
84 | + |
|
85 | + public function inCache($file) { |
|
86 | + return $file === ''; |
|
87 | + } |
|
88 | + |
|
89 | + public function remove($file) { |
|
90 | + throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
91 | + } |
|
92 | + |
|
93 | + public function move($source, $target) { |
|
94 | + throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
95 | + } |
|
96 | + |
|
97 | + public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) { |
|
98 | + throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
99 | + } |
|
100 | + |
|
101 | + public function getStatus($file) { |
|
102 | + return ICache::COMPLETE; |
|
103 | + } |
|
104 | + |
|
105 | + public function search($pattern) { |
|
106 | + return []; |
|
107 | + } |
|
108 | + |
|
109 | + public function searchByMime($mimetype) { |
|
110 | + return []; |
|
111 | + } |
|
112 | + |
|
113 | + public function searchQuery(ISearchQuery $query) { |
|
114 | + return []; |
|
115 | + } |
|
116 | + |
|
117 | + public function getIncomplete() { |
|
118 | + return []; |
|
119 | + } |
|
120 | + |
|
121 | + public function getPathById($id) { |
|
122 | + return ''; |
|
123 | + } |
|
124 | + |
|
125 | + public function normalize($path) { |
|
126 | + return $path; |
|
127 | + } |
|
128 | + |
|
129 | + public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, string $targetPath): int { |
|
130 | + throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); |
|
131 | + } |
|
132 | + |
|
133 | + public function getQueryFilterForStorage(): ISearchOperator { |
|
134 | + return new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'storage', -1); |
|
135 | + } |
|
136 | + |
|
137 | + public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry { |
|
138 | + return null; |
|
139 | + } |
|
140 | 140 | } |
@@ -29,38 +29,38 @@ |
||
29 | 29 | |
30 | 30 | |
31 | 31 | $this->create('files_external_oauth1', 'apps/files_external/ajax/oauth1.php') |
32 | - ->actionInclude('files_external/ajax/oauth1.php'); |
|
32 | + ->actionInclude('files_external/ajax/oauth1.php'); |
|
33 | 33 | $this->create('files_external_oauth2', 'apps/files_external/ajax/oauth2.php') |
34 | - ->actionInclude('files_external/ajax/oauth2.php'); |
|
34 | + ->actionInclude('files_external/ajax/oauth2.php'); |
|
35 | 35 | |
36 | 36 | |
37 | 37 | $this->create('files_external_list_applicable', '/apps/files_external/applicable') |
38 | - ->actionInclude('files_external/ajax/applicable.php'); |
|
38 | + ->actionInclude('files_external/ajax/applicable.php'); |
|
39 | 39 | |
40 | 40 | return [ |
41 | - 'resources' => [ |
|
42 | - 'global_storages' => ['url' => '/globalstorages'], |
|
43 | - 'user_storages' => ['url' => '/userstorages'], |
|
44 | - 'user_global_storages' => ['url' => '/userglobalstorages'], |
|
45 | - ], |
|
46 | - 'routes' => [ |
|
47 | - [ |
|
48 | - 'name' => 'Ajax#getSshKeys', |
|
49 | - 'url' => '/ajax/public_key.php', |
|
50 | - 'verb' => 'POST', |
|
51 | - 'requirements' => [], |
|
52 | - ], |
|
53 | - [ |
|
54 | - 'name' => 'Ajax#saveGlobalCredentials', |
|
55 | - 'url' => '/globalcredentials', |
|
56 | - 'verb' => 'POST', |
|
57 | - ], |
|
58 | - ], |
|
59 | - 'ocs' => [ |
|
60 | - [ |
|
61 | - 'name' => 'Api#getUserMounts', |
|
62 | - 'url' => '/api/v1/mounts', |
|
63 | - 'verb' => 'GET', |
|
64 | - ], |
|
65 | - ], |
|
41 | + 'resources' => [ |
|
42 | + 'global_storages' => ['url' => '/globalstorages'], |
|
43 | + 'user_storages' => ['url' => '/userstorages'], |
|
44 | + 'user_global_storages' => ['url' => '/userglobalstorages'], |
|
45 | + ], |
|
46 | + 'routes' => [ |
|
47 | + [ |
|
48 | + 'name' => 'Ajax#getSshKeys', |
|
49 | + 'url' => '/ajax/public_key.php', |
|
50 | + 'verb' => 'POST', |
|
51 | + 'requirements' => [], |
|
52 | + ], |
|
53 | + [ |
|
54 | + 'name' => 'Ajax#saveGlobalCredentials', |
|
55 | + 'url' => '/globalcredentials', |
|
56 | + 'verb' => 'POST', |
|
57 | + ], |
|
58 | + ], |
|
59 | + 'ocs' => [ |
|
60 | + [ |
|
61 | + 'name' => 'Api#getUserMounts', |
|
62 | + 'url' => '/api/v1/mounts', |
|
63 | + 'verb' => 'GET', |
|
64 | + ], |
|
65 | + ], |
|
66 | 66 | ]; |
@@ -34,67 +34,67 @@ |
||
34 | 34 | * @template-extends QBMapper<PublicKeyCredentialEntity> |
35 | 35 | */ |
36 | 36 | class PublicKeyCredentialMapper extends QBMapper { |
37 | - public function __construct(IDBConnection $db) { |
|
38 | - parent::__construct($db, 'webauthn', PublicKeyCredentialEntity::class); |
|
39 | - } |
|
37 | + public function __construct(IDBConnection $db) { |
|
38 | + parent::__construct($db, 'webauthn', PublicKeyCredentialEntity::class); |
|
39 | + } |
|
40 | 40 | |
41 | - public function findOneByCredentialId(string $publicKeyCredentialId): PublicKeyCredentialEntity { |
|
42 | - $qb = $this->db->getQueryBuilder(); |
|
41 | + public function findOneByCredentialId(string $publicKeyCredentialId): PublicKeyCredentialEntity { |
|
42 | + $qb = $this->db->getQueryBuilder(); |
|
43 | 43 | |
44 | - $qb->select('*') |
|
45 | - ->from($this->getTableName()) |
|
46 | - ->where( |
|
47 | - $qb->expr()->eq('public_key_credential_id', $qb->createNamedParameter(base64_encode($publicKeyCredentialId))) |
|
48 | - ); |
|
44 | + $qb->select('*') |
|
45 | + ->from($this->getTableName()) |
|
46 | + ->where( |
|
47 | + $qb->expr()->eq('public_key_credential_id', $qb->createNamedParameter(base64_encode($publicKeyCredentialId))) |
|
48 | + ); |
|
49 | 49 | |
50 | - return $this->findEntity($qb); |
|
51 | - } |
|
50 | + return $this->findEntity($qb); |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * @return PublicKeyCredentialEntity[] |
|
55 | - */ |
|
56 | - public function findAllForUid(string $uid): array { |
|
57 | - $qb = $this->db->getQueryBuilder(); |
|
53 | + /** |
|
54 | + * @return PublicKeyCredentialEntity[] |
|
55 | + */ |
|
56 | + public function findAllForUid(string $uid): array { |
|
57 | + $qb = $this->db->getQueryBuilder(); |
|
58 | 58 | |
59 | - $qb->select('*') |
|
60 | - ->from($this->getTableName()) |
|
61 | - ->where( |
|
62 | - $qb->expr()->eq('uid', $qb->createNamedParameter($uid)) |
|
63 | - ); |
|
59 | + $qb->select('*') |
|
60 | + ->from($this->getTableName()) |
|
61 | + ->where( |
|
62 | + $qb->expr()->eq('uid', $qb->createNamedParameter($uid)) |
|
63 | + ); |
|
64 | 64 | |
65 | - return $this->findEntities($qb); |
|
66 | - } |
|
65 | + return $this->findEntities($qb); |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * @param string $uid |
|
70 | - * @param int $id |
|
71 | - * |
|
72 | - * @return PublicKeyCredentialEntity |
|
73 | - * @throws DoesNotExistException |
|
74 | - */ |
|
75 | - public function findById(string $uid, int $id): PublicKeyCredentialEntity { |
|
76 | - $qb = $this->db->getQueryBuilder(); |
|
68 | + /** |
|
69 | + * @param string $uid |
|
70 | + * @param int $id |
|
71 | + * |
|
72 | + * @return PublicKeyCredentialEntity |
|
73 | + * @throws DoesNotExistException |
|
74 | + */ |
|
75 | + public function findById(string $uid, int $id): PublicKeyCredentialEntity { |
|
76 | + $qb = $this->db->getQueryBuilder(); |
|
77 | 77 | |
78 | - $qb->select('*') |
|
79 | - ->from($this->getTableName()) |
|
80 | - ->where($qb->expr()->andX( |
|
81 | - $qb->expr()->eq('id', $qb->createNamedParameter($id)), |
|
82 | - $qb->expr()->eq('uid', $qb->createNamedParameter($uid)) |
|
83 | - )); |
|
78 | + $qb->select('*') |
|
79 | + ->from($this->getTableName()) |
|
80 | + ->where($qb->expr()->andX( |
|
81 | + $qb->expr()->eq('id', $qb->createNamedParameter($id)), |
|
82 | + $qb->expr()->eq('uid', $qb->createNamedParameter($uid)) |
|
83 | + )); |
|
84 | 84 | |
85 | - return $this->findEntity($qb); |
|
86 | - } |
|
85 | + return $this->findEntity($qb); |
|
86 | + } |
|
87 | 87 | |
88 | - /** |
|
89 | - * @throws \OCP\DB\Exception |
|
90 | - */ |
|
91 | - public function deleteByUid(string $uid) { |
|
92 | - $qb = $this->db->getQueryBuilder(); |
|
88 | + /** |
|
89 | + * @throws \OCP\DB\Exception |
|
90 | + */ |
|
91 | + public function deleteByUid(string $uid) { |
|
92 | + $qb = $this->db->getQueryBuilder(); |
|
93 | 93 | |
94 | - $qb->delete($this->getTableName()) |
|
95 | - ->where( |
|
96 | - $qb->expr()->eq('uid', $qb->createNamedParameter($uid)) |
|
97 | - ); |
|
98 | - $qb->executeStatement(); |
|
99 | - } |
|
94 | + $qb->delete($this->getTableName()) |
|
95 | + ->where( |
|
96 | + $qb->expr()->eq('uid', $qb->createNamedParameter($uid)) |
|
97 | + ); |
|
98 | + $qb->executeStatement(); |
|
99 | + } |
|
100 | 100 | } |
@@ -31,26 +31,26 @@ |
||
31 | 31 | use OCP\IRequest; |
32 | 32 | |
33 | 33 | class NotModifiedMiddleware extends Middleware { |
34 | - /** @var IRequest */ |
|
35 | - private $request; |
|
36 | - |
|
37 | - public function __construct(IRequest $request) { |
|
38 | - $this->request = $request; |
|
39 | - } |
|
40 | - |
|
41 | - public function afterController($controller, $methodName, Response $response) { |
|
42 | - $etagHeader = $this->request->getHeader('IF_NONE_MATCH'); |
|
43 | - if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') { |
|
44 | - $response->setStatus(Http::STATUS_NOT_MODIFIED); |
|
45 | - return $response; |
|
46 | - } |
|
47 | - |
|
48 | - $modifiedSinceHeader = $this->request->getHeader('IF_MODIFIED_SINCE'); |
|
49 | - if ($modifiedSinceHeader !== '' && $response->getLastModified() !== null && trim($modifiedSinceHeader) === $response->getLastModified()->format(\DateTimeInterface::RFC2822)) { |
|
50 | - $response->setStatus(Http::STATUS_NOT_MODIFIED); |
|
51 | - return $response; |
|
52 | - } |
|
53 | - |
|
54 | - return $response; |
|
55 | - } |
|
34 | + /** @var IRequest */ |
|
35 | + private $request; |
|
36 | + |
|
37 | + public function __construct(IRequest $request) { |
|
38 | + $this->request = $request; |
|
39 | + } |
|
40 | + |
|
41 | + public function afterController($controller, $methodName, Response $response) { |
|
42 | + $etagHeader = $this->request->getHeader('IF_NONE_MATCH'); |
|
43 | + if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') { |
|
44 | + $response->setStatus(Http::STATUS_NOT_MODIFIED); |
|
45 | + return $response; |
|
46 | + } |
|
47 | + |
|
48 | + $modifiedSinceHeader = $this->request->getHeader('IF_MODIFIED_SINCE'); |
|
49 | + if ($modifiedSinceHeader !== '' && $response->getLastModified() !== null && trim($modifiedSinceHeader) === $response->getLastModified()->format(\DateTimeInterface::RFC2822)) { |
|
50 | + $response->setStatus(Http::STATUS_NOT_MODIFIED); |
|
51 | + return $response; |
|
52 | + } |
|
53 | + |
|
54 | + return $response; |
|
55 | + } |
|
56 | 56 | } |
@@ -29,107 +29,107 @@ |
||
29 | 29 | * @deprecated 23.0.0 |
30 | 30 | */ |
31 | 31 | interface IUser { |
32 | - /** |
|
33 | - * @return string |
|
34 | - * |
|
35 | - * @since 13.0.0 |
|
36 | - * @deprecated 23.0.0 |
|
37 | - */ |
|
38 | - public function getUserId(); |
|
32 | + /** |
|
33 | + * @return string |
|
34 | + * |
|
35 | + * @since 13.0.0 |
|
36 | + * @deprecated 23.0.0 |
|
37 | + */ |
|
38 | + public function getUserId(); |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string |
|
42 | - * |
|
43 | - * @since 13.0.0 |
|
44 | - * @deprecated 23.0.0 |
|
45 | - */ |
|
46 | - public function getEmail(); |
|
40 | + /** |
|
41 | + * @return string |
|
42 | + * |
|
43 | + * @since 13.0.0 |
|
44 | + * @deprecated 23.0.0 |
|
45 | + */ |
|
46 | + public function getEmail(); |
|
47 | 47 | |
48 | - /** |
|
49 | - * @return string |
|
50 | - * |
|
51 | - * @since 13.0.0 |
|
52 | - * @deprecated 23.0.0 |
|
53 | - */ |
|
54 | - public function getDisplayName(); |
|
48 | + /** |
|
49 | + * @return string |
|
50 | + * |
|
51 | + * @since 13.0.0 |
|
52 | + * @deprecated 23.0.0 |
|
53 | + */ |
|
54 | + public function getDisplayName(); |
|
55 | 55 | |
56 | - /** |
|
57 | - * @return string |
|
58 | - * |
|
59 | - * @since 13.0.0 |
|
60 | - * @deprecated 23.0.0 |
|
61 | - */ |
|
62 | - public function getPhone(); |
|
56 | + /** |
|
57 | + * @return string |
|
58 | + * |
|
59 | + * @since 13.0.0 |
|
60 | + * @deprecated 23.0.0 |
|
61 | + */ |
|
62 | + public function getPhone(); |
|
63 | 63 | |
64 | - /** |
|
65 | - * @return string |
|
66 | - * |
|
67 | - * @since 13.0.0 |
|
68 | - * @deprecated 23.0.0 |
|
69 | - */ |
|
70 | - public function getAddress(); |
|
64 | + /** |
|
65 | + * @return string |
|
66 | + * |
|
67 | + * @since 13.0.0 |
|
68 | + * @deprecated 23.0.0 |
|
69 | + */ |
|
70 | + public function getAddress(); |
|
71 | 71 | |
72 | - /** |
|
73 | - * @return string |
|
74 | - * |
|
75 | - * @since 13.0.0 |
|
76 | - * @deprecated 23.0.0 |
|
77 | - */ |
|
78 | - public function getWebsite(); |
|
72 | + /** |
|
73 | + * @return string |
|
74 | + * |
|
75 | + * @since 13.0.0 |
|
76 | + * @deprecated 23.0.0 |
|
77 | + */ |
|
78 | + public function getWebsite(); |
|
79 | 79 | |
80 | - /** |
|
81 | - * @return string |
|
82 | - * |
|
83 | - * @since 13.0.0 |
|
84 | - * @deprecated 23.0.0 |
|
85 | - */ |
|
86 | - public function getTwitter(); |
|
80 | + /** |
|
81 | + * @return string |
|
82 | + * |
|
83 | + * @since 13.0.0 |
|
84 | + * @deprecated 23.0.0 |
|
85 | + */ |
|
86 | + public function getTwitter(); |
|
87 | 87 | |
88 | - /** |
|
89 | - * @return string[] |
|
90 | - * |
|
91 | - * @since 13.0.0 |
|
92 | - * @deprecated 23.0.0 |
|
93 | - */ |
|
94 | - public function getGroups(); |
|
88 | + /** |
|
89 | + * @return string[] |
|
90 | + * |
|
91 | + * @since 13.0.0 |
|
92 | + * @deprecated 23.0.0 |
|
93 | + */ |
|
94 | + public function getGroups(); |
|
95 | 95 | |
96 | - /** |
|
97 | - * @return string |
|
98 | - * |
|
99 | - * @since 13.0.0 |
|
100 | - * @deprecated 23.0.0 |
|
101 | - */ |
|
102 | - public function getLanguage(); |
|
96 | + /** |
|
97 | + * @return string |
|
98 | + * |
|
99 | + * @since 13.0.0 |
|
100 | + * @deprecated 23.0.0 |
|
101 | + */ |
|
102 | + public function getLanguage(); |
|
103 | 103 | |
104 | - /** |
|
105 | - * @return int |
|
106 | - * |
|
107 | - * @since 13.0.0 |
|
108 | - * @deprecated 23.0.0 |
|
109 | - */ |
|
110 | - public function getUsedSpace(); |
|
104 | + /** |
|
105 | + * @return int |
|
106 | + * |
|
107 | + * @since 13.0.0 |
|
108 | + * @deprecated 23.0.0 |
|
109 | + */ |
|
110 | + public function getUsedSpace(); |
|
111 | 111 | |
112 | - /** |
|
113 | - * @return int |
|
114 | - * |
|
115 | - * @since 13.0.0 |
|
116 | - * @deprecated 23.0.0 |
|
117 | - */ |
|
118 | - public function getFreeSpace(); |
|
112 | + /** |
|
113 | + * @return int |
|
114 | + * |
|
115 | + * @since 13.0.0 |
|
116 | + * @deprecated 23.0.0 |
|
117 | + */ |
|
118 | + public function getFreeSpace(); |
|
119 | 119 | |
120 | - /** |
|
121 | - * @return int |
|
122 | - * |
|
123 | - * @since 13.0.0 |
|
124 | - * @deprecated 23.0.0 |
|
125 | - */ |
|
126 | - public function getTotalSpace(); |
|
120 | + /** |
|
121 | + * @return int |
|
122 | + * |
|
123 | + * @since 13.0.0 |
|
124 | + * @deprecated 23.0.0 |
|
125 | + */ |
|
126 | + public function getTotalSpace(); |
|
127 | 127 | |
128 | - /** |
|
129 | - * @return int |
|
130 | - * |
|
131 | - * @since 13.0.0 |
|
132 | - * @deprecated 23.0.0 |
|
133 | - */ |
|
134 | - public function getQuota(); |
|
128 | + /** |
|
129 | + * @return int |
|
130 | + * |
|
131 | + * @since 13.0.0 |
|
132 | + * @deprecated 23.0.0 |
|
133 | + */ |
|
134 | + public function getQuota(); |
|
135 | 135 | } |
@@ -29,19 +29,19 @@ |
||
29 | 29 | * @deprecated 23.0.0 |
30 | 30 | */ |
31 | 31 | interface ICredentials { |
32 | - /** |
|
33 | - * @return string |
|
34 | - * |
|
35 | - * @since 13.0.0 |
|
36 | - * @deprecated 23.0.0 |
|
37 | - */ |
|
38 | - public function getUsername(); |
|
32 | + /** |
|
33 | + * @return string |
|
34 | + * |
|
35 | + * @since 13.0.0 |
|
36 | + * @deprecated 23.0.0 |
|
37 | + */ |
|
38 | + public function getUsername(); |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string |
|
42 | - * |
|
43 | - * @since 13.0.0 |
|
44 | - * @deprecated 23.0.0 |
|
45 | - */ |
|
46 | - public function getPassword(); |
|
40 | + /** |
|
41 | + * @return string |
|
42 | + * |
|
43 | + * @since 13.0.0 |
|
44 | + * @deprecated 23.0.0 |
|
45 | + */ |
|
46 | + public function getPassword(); |
|
47 | 47 | } |