Merge pull request #40833 from owncloud/dependencies-tests-20230612

phil-davis · web-flow · commit f70604bdef0f · 2023-06-12T10:37:32.000+05:45
Dependencies and tests 20230612
diff --git a/changelog/unreleased/PHPdependencies20230404onward b/changelog/unreleased/PHPdependencies20230404onward
@@ -6,6 +6,7 @@ The following have been updated:
 - guzzlehttp/guzzle (7.5.0 to 7.7.0)
 - pear/pear-core-minimal (1.10.11 to 1.10.13)
 - punic/punic (3.8.0 to 3.8.1)
+- sabre/url (2.3.2 to 2.3.3)
 
 The following have been updated in apps/files_external/3rdparty:
 - google/apiclient (2.13.1 to 2.13.2)
@@ -18,3 +19,4 @@ https://github.com/owncloud/core/pull/40789
 https://github.com/owncloud/core/pull/40806
 https://github.com/owncloud/core/pull/40819
 https://github.com/owncloud/core/pull/40825
+https://github.com/owncloud/core/pull/40833
diff --git a/composer.lock b/composer.lock
diff --git a/tests/acceptance/features/cliTrashbin/previewsCleanup.feature b/tests/acceptance/features/cliTrashbin/previewsCleanup.feature
@@ -1,4 +1,4 @@
-@cli @files_trashbin-app-required @preview-extension-required
+@cli @files_trashbin-app-required @preview-extension-required @skipOnOcV10.11 @skipOnOcV10.12
 Feature: orphaned previews can be deleted
   As an admin
   I want to delete previews whose original file no longer exists

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@cli @files_trashbin-app-required @preview-extension-required`
	`1`	`+@cli @files_trashbin-app-required @preview-extension-required @skipOnOcV10.11 @skipOnOcV10.12`
`2`	`2`	`Feature: orphaned previews can be deleted`
`3`	`3`	`As an admin`
`4`	`4`	`I want to delete previews whose original file no longer exists`