diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-12-30 10:51:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 10:51:58 +0100 |
| commit | 2ac0e89b059bbad553688d4bcb66531eab979505 (patch) | |
| tree | 20f923c5e0f4f480a5a012ccfdb2ac58eb0b0a7e | |
| parent | b260ef954d66de61a7d063295ca43a9a00cf7039 (diff) | |
| parent | 28f2d0ec7a51fdeab1d7294346ad8c3bc92cb6c6 (diff) | |
| download | nextcloud-server-2ac0e89b059bbad553688d4bcb66531eab979505.tar.gz nextcloud-server-2ac0e89b059bbad553688d4bcb66531eab979505.zip | |
Merge pull request #24895 from nextcloud/make-integration-tests-work-with-both-php-7.3-and-7.4
Make integration tests work with both PHP 7.3 and 7.4
4 files changed, 5 insertions, 3 deletions
diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php index c8c40d2a98b..fcccddc318f 100644 --- a/build/integration/features/bootstrap/BasicStructure.php +++ b/build/integration/features/bootstrap/BasicStructure.php @@ -47,7 +47,6 @@ trait BasicStructure { use Avatar; use Download; use Mail; - use Trashbin; /** @var string */ private $currentUser = ''; diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php index 66e2282608e..e9c486daa4d 100644 --- a/build/integration/features/bootstrap/FeatureContext.php +++ b/build/integration/features/bootstrap/FeatureContext.php @@ -35,4 +35,5 @@ require __DIR__ . '/../../vendor/autoload.php'; class FeatureContext implements Context, SnippetAcceptingContext { use Search; use WebDav; + use Trashbin; } diff --git a/build/integration/features/bootstrap/SharingContext.php b/build/integration/features/bootstrap/SharingContext.php index b1a4c1aa48b..be719cbf379 100644 --- a/build/integration/features/bootstrap/SharingContext.php +++ b/build/integration/features/bootstrap/SharingContext.php @@ -32,7 +32,8 @@ require __DIR__ . '/../../vendor/autoload.php'; * Features context. */ class SharingContext implements Context, SnippetAcceptingContext { - use Sharing; + use WebDav; + use Trashbin; use AppConfiguration; use CommandLine; diff --git a/build/integration/features/bootstrap/Trashbin.php b/build/integration/features/bootstrap/Trashbin.php index 3eb6ce812ec..536ed6a9015 100644 --- a/build/integration/features/bootstrap/Trashbin.php +++ b/build/integration/features/bootstrap/Trashbin.php @@ -30,7 +30,8 @@ require __DIR__ . '/../../vendor/autoload.php'; * Trashbin functions */ trait Trashbin { - use WebDav; + + // WebDav trait is expected to be used in the class that uses this trait. /** * @When User :user empties trashbin |