diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/files-checker.php | 3 | ||||
| -rw-r--r-- | build/integration/features/bootstrap/SharingContext.php | 2 | ||||
| -rw-r--r-- | build/integration/features/provisioning-v1.feature | 3 | ||||
| -rw-r--r-- | build/integration/sharing_features/sharing-v1-part3.feature | 14 | ||||
| -rw-r--r-- | build/psalm-baseline.xml | 34 |
5 files changed, 24 insertions, 32 deletions
diff --git a/build/files-checker.php b/build/files-checker.php index 3fbc0b0423b..2929d5a3cbf 100644 --- a/build/files-checker.php +++ b/build/files-checker.php @@ -64,6 +64,8 @@ $expectedFiles = [ 'COPYING', 'core', 'cron.php', + 'cypress.config.ts', + 'cypress', 'dist', 'index.html', 'index.php', @@ -87,6 +89,7 @@ $expectedFiles = [ 'status.php', 'tests', 'themes', + 'tsconfig.json', 'vendor-bin', 'version.php', 'webpack.common.js', diff --git a/build/integration/features/bootstrap/SharingContext.php b/build/integration/features/bootstrap/SharingContext.php index 7080fd0a1a0..f187e89f08f 100644 --- a/build/integration/features/bootstrap/SharingContext.php +++ b/build/integration/features/bootstrap/SharingContext.php @@ -46,5 +46,7 @@ class SharingContext implements Context, SnippetAcceptingContext { $this->deleteServerConfig('core', 'shareapi_default_expire_date'); $this->deleteServerConfig('core', 'shareapi_expire_after_n_days'); $this->deleteServerConfig('core', 'link_defaultExpDays'); + + $this->runOcc(['config:system:delete', 'share_folder']); } } diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index e891c274943..d34e1bceb6a 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -67,6 +67,7 @@ Feature: provisioning | address | | website | | twitter | + | fediverse | | organisation | | role | | headline | @@ -81,6 +82,7 @@ Feature: provisioning | address | | website | | twitter | + | fediverse | | organisation | | role | | headline | @@ -94,6 +96,7 @@ Feature: provisioning | address | | website | | twitter | + | fediverse | | organisation | | role | | headline | diff --git a/build/integration/sharing_features/sharing-v1-part3.feature b/build/integration/sharing_features/sharing-v1-part3.feature index 621aa95b364..1331d5b2ba6 100644 --- a/build/integration/sharing_features/sharing-v1-part3.feature +++ b/build/integration/sharing_features/sharing-v1-part3.feature @@ -514,6 +514,20 @@ Feature: sharing Then as "user1" the file "/shared/shared_file.txt" exists And as "user0" the file "/shared/shared_file.txt" exists + Scenario: receiving shares into a configured share_folder + Given As an "admin" + And invoking occ with "config:system:set share_folder --value received_shares" + And user "user0" exists + And user "user1" exists + And user "user0" created a folder "/shared_folder" + And User "user0" moved file "/textfile0.txt" to "/shared_file.txt" + When folder "/shared_folder" of user "user0" is shared with user "user1" + And user "user1" accepts last share + Then as "user1" the file "/received_shares/shared_folder" exists + When file "/shared_file.txt" of user "user0" is shared with user "user1" + And user "user1" accepts last share + Then as "user1" the file "/received_shares/shared_file.txt" exists + Scenario: Owner of subshares is adjusted after moving into received share Given As an "admin" And user "user0" exists diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index df363b47270..d1909a62264 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -699,11 +699,6 @@ <code>$arguments</code> </ParamNameMismatch> </file> - <file src="apps/dav/lib/RootCollection.php"> - <UndefinedPropertyAssignment occurrences="1"> - <code>$publicCalendarRoot->disableListing</code> - </UndefinedPropertyAssignment> - </file> <file src="apps/dav/lib/Search/EventsSearchProvider.php"> <FalsableReturnStatement occurrences="1"> <code>$this->l10n->l('date', $startDateTime, ['width' => 'medium'])</code> @@ -1304,11 +1299,6 @@ <code>\Sabre\Uri\split($this->principalInfo['uri'])</code> </UndefinedFunction> </file> - <file src="apps/files_versions/lib/Storage.php"> - <InvalidScalarArgument occurrences="1"> - <code>$timestamp</code> - </InvalidScalarArgument> - </file> <file src="apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php"> <InvalidScalarArgument occurrences="1"> <code>$this->retries + 1</code> @@ -2219,12 +2209,10 @@ <InternalMethod occurrences="1"> <code>getParams</code> </InternalMethod> - <InvalidReturnStatement occurrences="2"> - <code>$insertQb->execute()</code> + <InvalidReturnStatement occurrences="1"> <code>$this->adapter->lastInsertId($seqName)</code> </InvalidReturnStatement> - <InvalidReturnType occurrences="2"> - <code>int</code> + <InvalidReturnType occurrences="1"> <code>string</code> </InvalidReturnType> <InvalidScalarArgument occurrences="1"> @@ -3691,24 +3679,6 @@ <code>count($obd_values) > 0</code> </RedundantCondition> </file> - <file src="lib/private/legacy/OC_Image.php"> - <ImplementedReturnTypeMismatch occurrences="1"> - <code>null|string</code> - </ImplementedReturnTypeMismatch> - <InvalidArrayOffset occurrences="2"> - <code>$data[floor($p)]</code> - <code>$data[floor($p)]</code> - </InvalidArrayOffset> - <InvalidScalarArgument occurrences="4"> - <code>$this->bitDepth</code> - <code>$x</code> - <code>$y</code> - <code>90</code> - </InvalidScalarArgument> - <RedundantCondition occurrences="1"> - <code>$isWritable</code> - </RedundantCondition> - </file> <file src="lib/private/legacy/OC_User.php"> <UndefinedClass occurrences="1"> <code>\Test\Util\User\Dummy</code> |