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
601362e1
Unverified
Commit
601362e1
authored
7 years ago
by
Robin Appelman
Browse files
Options
Downloads
Patches
Plain Diff
adjust to moved repair step
Signed-off-by:
Robin Appelman
<
robin@icewind.nl
>
parent
846e62c2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/private/Repair.php
+1
-1
1 addition, 1 deletion
lib/private/Repair.php
lib/private/Repair/NC13/RepairInvalidPaths.php
+5
-1
5 additions, 1 deletion
lib/private/Repair/NC13/RepairInvalidPaths.php
tests/lib/Repair/RepairInvalidPathsTest.php
+8
-2
8 additions, 2 deletions
tests/lib/Repair/RepairInvalidPathsTest.php
with
14 additions
and
4 deletions
lib/private/Repair.php
+
1
−
1
View file @
601362e1
...
@@ -145,7 +145,7 @@ class Repair implements IOutput{
...
@@ -145,7 +145,7 @@ class Repair implements IOutput{
\OC
::
$server
->
getConfig
(),
\OC
::
$server
->
getConfig
(),
\OC
::
$server
->
query
(
Installer
::
class
)
\OC
::
$server
->
query
(
Installer
::
class
)
),
),
new
RepairInvalidPaths
(
\OC
::
$server
->
getDatabaseConnection
())
new
RepairInvalidPaths
(
\OC
::
$server
->
getDatabaseConnection
()
,
\OC
::
$server
->
getConfig
()
)
];
];
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/private/Repair/NC13/RepairInvalidPaths.php
+
5
−
1
View file @
601362e1
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
namespace
OC\Repair\NC13
;
namespace
OC\Repair\NC13
;
use
OCP\IConfig
;
use
OCP\IDBConnection
;
use
OCP\IDBConnection
;
use
OCP\Migration\IOutput
;
use
OCP\Migration\IOutput
;
use
OCP\Migration\IRepairStep
;
use
OCP\Migration\IRepairStep
;
...
@@ -29,9 +30,12 @@ use OCP\Migration\IRepairStep;
...
@@ -29,9 +30,12 @@ use OCP\Migration\IRepairStep;
class
RepairInvalidPaths
implements
IRepairStep
{
class
RepairInvalidPaths
implements
IRepairStep
{
/** @var IDBConnection */
/** @var IDBConnection */
private
$connection
;
private
$connection
;
/** @var IConfig */
private
$config
;
public
function
__construct
(
IDBConnection
$connection
)
{
public
function
__construct
(
IDBConnection
$connection
,
IConfig
$config
)
{
$this
->
connection
=
$connection
;
$this
->
connection
=
$connection
;
$this
->
config
=
$config
;
}
}
...
...
This diff is collapsed.
Click to expand it.
tests/lib/Repair/RepairInvalidPathsTest.php
+
8
−
2
View file @
601362e1
...
@@ -23,7 +23,8 @@ namespace Test\Repair;
...
@@ -23,7 +23,8 @@ namespace Test\Repair;
use
OC\Files\Cache\Cache
;
use
OC\Files\Cache\Cache
;
use
OC\Files\Storage\Temporary
;
use
OC\Files\Storage\Temporary
;
use
OC\Repair\RepairInvalidPaths
;
use
OC\Repair\NC13\RepairInvalidPaths
;
use
OCP\IConfig
;
use
OCP\Migration\IOutput
;
use
OCP\Migration\IOutput
;
use
Test\TestCase
;
use
Test\TestCase
;
...
@@ -43,7 +44,12 @@ class RepairInvalidPathsTest extends TestCase {
...
@@ -43,7 +44,12 @@ class RepairInvalidPathsTest extends TestCase {
$this
->
storage
=
new
Temporary
();
$this
->
storage
=
new
Temporary
();
$this
->
cache
=
$this
->
storage
->
getCache
();
$this
->
cache
=
$this
->
storage
->
getCache
();
$this
->
repair
=
new
RepairInvalidPaths
(
\OC
::
$server
->
getDatabaseConnection
());
$config
=
$this
->
createMock
(
IConfig
::
class
);
$config
->
expects
(
$this
->
any
())
->
method
(
'getSystemValue'
)
->
with
(
'version'
,
'0.0.0'
)
->
willReturn
(
'12.0.0.0'
);
$this
->
repair
=
new
RepairInvalidPaths
(
\OC
::
$server
->
getDatabaseConnection
(),
$config
);
}
}
protected
function
tearDown
()
{
protected
function
tearDown
()
{
...
...
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