Skip to content

Backport minimum desktop version to 2.2.4 change to stable10 #28540

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
PVince81 merged 1 commit into from
Aug 16, 2017
Merged

Backport minimum desktop version to 2.2.4 change to stable10 #28540

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
Update the minimum desktop version to 2.2.4 
This commit sets the minimum ownCloud client version to
2.2.4. This fixes #27978.
  • Loading branch information
@settermjd
settermjd committed Jul 31, 2017
commit 5f09cbb48bdc12061662180451e2995ca64fa6bb
2 changes: 1 addition & 1 deletion apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function beforeHandler(RequestInterface $request) {
return;
}

$minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.0.0');
$minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.2.4');

// Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
// "mirall/%1" for older releases
Expand Down
18 changes: 9 additions & 9 deletions apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ public function testBeforeHandlerException($userAgent) {
$this->config
->expects($this->once())
->method('getSystemValue')
->with('minimum.supported.desktop.version', '2.0.0')
->will($this->returnValue('1.7.0'));
->with('minimum.supported.desktop.version', '2.2.4')
->will($this->returnValue('2.2.4'));

$this->blockLegacyClientVersionPlugin->beforeHandler($request);
}
Expand All @@ -88,11 +88,11 @@ public function testBeforeHandlerException($userAgent) {
*/
public function newAndAlternateDesktopClientProvider() {
return [
['Mozilla/5.0 (1.7.0) mirall/1.7.0'],
['mirall/1.8.3'],
['mirall/1.7.2'],
['mirall/1.7.0'],
['Mozilla/5.0 (Bogus Text) mirall/1.9.3'],
['Mozilla/5.0 (2.2.4) mirall/2.2.4'],
['mirall/2.8.3'],
['mirall/2.7.2'],
['mirall/2.7.0'],
['Mozilla/5.0 (Bogus Text) mirall/3.0.1'],
];
}

Expand All @@ -112,8 +112,8 @@ public function testBeforeHandlerSuccess($userAgent) {
$this->config
->expects($this->once())
->method('getSystemValue')
->with('minimum.supported.desktop.version', '2.0.0')
->will($this->returnValue('1.7.0'));
->with('minimum.supported.desktop.version', '2.2.4')
->will($this->returnValue('2.2.4'));

$this->blockLegacyClientVersionPlugin->beforeHandler($request);
}
Expand Down
2 changes: 1 addition & 1 deletion config/config.sample.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@
* client may not function as expected, and could lead to permanent data loss for
* clients or other unexpected results.
*/
'minimum.supported.desktop.version' => '2.0.0',
'minimum.supported.desktop.version' => '2.2.4',

/**
* EXPERIMENTAL: option whether to include external storage in quota
Expand Down