mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Roeland Jago Douma 2020-12-30 10:51:58 +01:00 committed by GitHub
parent b260ef954d 28f2d0ec7a
commit 2ac0e89b05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/integration/features/bootstrap/BasicStructure.php
View File

@ -47,7 +47,6 @@ trait BasicStructure {
use Avatar;
use Download;
use Mail;
use Trashbin;
/** @var string */
private $currentUser = '';

1
build/integration/features/bootstrap/FeatureContext.php
View File

@ -35,4 +35,5 @@ require __DIR__ . '/../../vendor/autoload.php';
class FeatureContext implements Context, SnippetAcceptingContext {
use Search;
use WebDav;
use Trashbin;
}

3
build/integration/features/bootstrap/SharingContext.php
View File

@ -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;

3
build/integration/features/bootstrap/Trashbin.php
View File

@ -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