Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
9317e0f0
Unverified
Commit
9317e0f0
authored
4 years ago
by
Roeland Jago Douma
Browse files
Options
Downloads
Patches
Plain Diff
Fix test traits for phpunit 9
Signed-off-by:
Roeland Jago Douma
<
roeland@famdouma.nl
>
parent
b611bc31
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/lib/Traits/ClientServiceTrait.php
+2
-2
2 additions, 2 deletions
tests/lib/Traits/ClientServiceTrait.php
tests/lib/Traits/EncryptionTrait.php
+2
-2
2 additions, 2 deletions
tests/lib/Traits/EncryptionTrait.php
with
4 additions
and
4 deletions
tests/lib/Traits/ClientServiceTrait.php
+
2
−
2
View file @
9317e0f0
...
...
@@ -39,7 +39,7 @@ trait ClientServiceTrait {
* @param string $originalClassName
* @return \PHPUnit\Framework\MockObject\MockObject
*/
abstract
protected
function
createMock
(
$originalClassName
);
abstract
protected
function
createMock
(
string
$originalClassName
);
/**
* Returns a matcher that matches when the method is executed
...
...
@@ -49,7 +49,7 @@ trait ClientServiceTrait {
*
* @since Method available since Release 3.0.0
*/
abstract
public
function
any
();
abstract
static
public
function
any
();
protected
function
setUpClientServiceTrait
()
{
$this
->
clientService
=
$this
->
createMock
(
IClientService
::
class
);
...
...
This diff is collapsed.
Click to expand it.
tests/lib/Traits/EncryptionTrait.php
+
2
−
2
View file @
9317e0f0
...
...
@@ -24,8 +24,8 @@ trait EncryptionTrait {
abstract
protected
function
registerStorageWrapper
(
$name
,
$wrapper
);
// from phpunit
abstract
protected
function
markTestSkipped
(
string
$message
=
''
):
void
;
abstract
protected
function
assertTrue
(
$condition
,
string
$message
=
''
):
void
;
abstract
static
protected
function
markTestSkipped
(
string
$message
=
''
):
void
;
abstract
static
protected
function
assertTrue
(
$condition
,
string
$message
=
''
):
void
;
private
$encryptionWasEnabled
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment