Skip to content

Make integration tests work with both PHP 7.3 and 7.4 #24895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Dec 30, 2020
Merged

Make integration tests work with both PHP 7.3 and 7.4 #24895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build/integration/features/bootstrap/BasicStructure.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ trait BasicStructure {
use Avatar;
use Download;
use Mail;
use Trashbin;

/** @var string */
private $currentUser = '';
Expand Down
1 change: 1 addition & 0 deletions build/integration/features/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@
class FeatureContext implements Context, SnippetAcceptingContext {
use Search;
use WebDav;
use Trashbin;
}
3 changes: 2 additions & 1 deletion build/integration/features/bootstrap/SharingContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
* Features context.
*/
class SharingContext implements Context, SnippetAcceptingContext {
use Sharing;
use WebDav;
use Trashbin;
use AppConfiguration;
use CommandLine;

Expand Down
3 changes: 2 additions & 1 deletion build/integration/features/bootstrap/Trashbin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
* 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
Expand Down