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:
commit
2ac0e89b05
|
@ -47,7 +47,6 @@ trait BasicStructure {
|
||||||
use Avatar;
|
use Avatar;
|
||||||
use Download;
|
use Download;
|
||||||
use Mail;
|
use Mail;
|
||||||
use Trashbin;
|
|
||||||
|
|
||||||
/** @var string */
|
/** @var string */
|
||||||
private $currentUser = '';
|
private $currentUser = '';
|
||||||
|
|
|
@ -35,4 +35,5 @@ require __DIR__ . '/../../vendor/autoload.php';
|
||||||
class FeatureContext implements Context, SnippetAcceptingContext {
|
class FeatureContext implements Context, SnippetAcceptingContext {
|
||||||
use Search;
|
use Search;
|
||||||
use WebDav;
|
use WebDav;
|
||||||
|
use Trashbin;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,8 @@ require __DIR__ . '/../../vendor/autoload.php';
|
||||||
* Features context.
|
* Features context.
|
||||||
*/
|
*/
|
||||||
class SharingContext implements Context, SnippetAcceptingContext {
|
class SharingContext implements Context, SnippetAcceptingContext {
|
||||||
use Sharing;
|
use WebDav;
|
||||||
|
use Trashbin;
|
||||||
use AppConfiguration;
|
use AppConfiguration;
|
||||||
use CommandLine;
|
use CommandLine;
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,8 @@ require __DIR__ . '/../../vendor/autoload.php';
|
||||||
* Trashbin functions
|
* Trashbin functions
|
||||||
*/
|
*/
|
||||||
trait Trashbin {
|
trait Trashbin {
|
||||||
use WebDav;
|
|
||||||
|
// WebDav trait is expected to be used in the class that uses this trait.
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @When User :user empties trashbin
|
* @When User :user empties trashbin
|
||||||
|
|
Loading…
Reference in New Issue