Skip to content
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

Fix indentation. #140

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix indentation. #140

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
8 changes: 4 additions & 4 deletions config/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@
'version' => $betaVersionInternal,
'versionstring' => $betaVersionString,
'downloadurl' => $beta_mac_url . 'Nextcloud-' . $betaVersion . '.pkg',
// 'fileProviderDownloadUrl' => $beta_mac_url . 'Nextcloud-macOS-vfs-' . $betaVersion . '.pkg', TODO: 3.13.0
// 'fileProviderDownloadUrl' => $beta_mac_url . 'Nextcloud-macOS-vfs-' . $betaVersion . '.pkg', TODO: 3.13.0
'web' => 'https://nextcloud.com/install',
"sparkleDownloadUrl" => $beta_mac_url . 'Nextcloud-' . $betaVersion . '.pkg.tbz',
// "fileProviderSparkleDownloadUrl" => $beta_mac_url . 'Nextcloud-macOS-vfs-' . $betaVersion . '.pkg', TODO: 3.13.0
// "fileProviderSparkleDownloadUrl" => $beta_mac_url . 'Nextcloud-macOS-vfs-' . $betaVersion . '.pkg', TODO: 3.13.0
"signature" => "5wXe1phH6syvreaT+2Lah40CBzdyVnjzCWlmAjdwoKe/uSDlR+Hk5er+Y7nu/W2FDkeLvAxzNr2nK4HIhJZ+Cw==",
// "fileProviderSignature" => "5wXe1phH6syvreaT+2Lah40CBzdyVnjzCWlmAjdwoKe/uSDlR+Hk5er+Y7nu/W2FDkeLvAxzNr2nK4HIhJZ+Cw==", TODO: 3.13.0
// "fileProviderSignature" => "5wXe1phH6syvreaT+2Lah40CBzdyVnjzCWlmAjdwoKe/uSDlR+Hk5er+Y7nu/W2FDkeLvAxzNr2nK4HIhJZ+Cw==", TODO: 3.13.0
"length" => 64530955 //,
// "fileProviderLength" => 64530955 TODO: 3.13.0
// "fileProviderLength" => 64530955 TODO: 3.13.0
],
]
]
Expand Down
2 changes: 1 addition & 1 deletion index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
$version,
$channel,
$isSparkle,
$isFileProvider,
$isFileProvider,
$config
);
echo $response->buildResponse();
6 changes: 3 additions & 3 deletions src/Response.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class Response {
private $channel;
/** @var bool */
private $isSparkle;
/** @var bool */
private $isFileProvider;
/** @var bool */
private $isFileProvider;
/** @var array */
private $config;

Expand All @@ -50,7 +50,7 @@ public function __construct(string $oem,
$this->version = $version;
$this->channel = $channel;
$this->isSparkle = $isSparkle;
$this->isFileProvider = $isFileProvider;
$this->isFileProvider = $isFileProvider;
$this->config = $config;
}

Expand Down
76 changes: 38 additions & 38 deletions tests/unit/ResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public function updateDataProvider(): array
'1.9.0',
'stable',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient><version>2.2.2</version><versionstring>Nextcloud Client 2.2.2</versionstring><downloadurl>https://download.nextcloud.com/desktop/stable/Nextcloud-2.2.2-x64.AppImage</downloadurl><web>https://nextcloud.com/install/#install-clients</web></owncloudclient>
Expand All @@ -140,7 +140,7 @@ public function updateDataProvider(): array
'1.9.0',
'stable',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient><version>2.2.2.3472</version><versionstring>Nextcloud Client 2.2.2 (build 3472)</versionstring><downloadurl>https://download.owncloud.com/desktop/stable/ownCloud-2.2.2.3472.pkg</downloadurl><sparkleDownloadUrl>https://download.owncloud.com/desktop/stable/ownCloud-2.2.2.3472.pkg.tbz</sparkleDownloadUrl><signature>MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=</signature><length>62738920</length></owncloudclient>
Expand All @@ -153,7 +153,7 @@ public function updateDataProvider(): array
'1.9.0',
'stable',
true,
false,
false,
$config,
'<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
Expand All @@ -175,7 +175,7 @@ public function updateDataProvider(): array
'1.9.0',
'beta',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient><version>2.2.3-rc3</version><versionstring>Nextcloud Client 2.2.3-rc3</versionstring><downloadurl>https://download.nextcloud.com/desktop/stable/Nextcloud-2.2.3-rc3-x86.msi</downloadurl><web>https://nextcloud.com/install/#install-clients</web></owncloudclient>
Expand All @@ -188,7 +188,7 @@ public function updateDataProvider(): array
'2.2.3-rc1',
'beta',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient><version>2.2.3-rc3</version><versionstring>Nextcloud Client 2.2.3-rc3</versionstring><downloadurl>https://download.nextcloud.com/desktop/stable/Nextcloud-2.2.3-rc3-x86.msi</downloadurl><web>https://nextcloud.com/install/#install-clients</web></owncloudclient>
Expand All @@ -201,7 +201,7 @@ public function updateDataProvider(): array
'2.2.2-rc1',
'beta',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient><version>2.2.2</version><versionstring>Nextcloud Client 2.2.2</versionstring><downloadurl>https://download.nextcloud.com/desktop/stable/Nextcloud-2.2.2-x64.AppImage</downloadurl><web>https://nextcloud.com/install/#install-clients</web></owncloudclient>
Expand All @@ -214,7 +214,7 @@ public function updateDataProvider(): array
'1.9.0',
'stable',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient/>
Expand All @@ -227,7 +227,7 @@ public function updateDataProvider(): array
'1.9.0',
'stable',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient/>
Expand All @@ -240,7 +240,7 @@ public function updateDataProvider(): array
'2.2.2.6192',
'stable',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient/>
Expand All @@ -253,7 +253,7 @@ public function updateDataProvider(): array
'2.2.6192',
'stable',
true,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient/>
Expand All @@ -266,7 +266,7 @@ public function updateDataProvider(): array
'2.2.2',
'stable',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient/>
Expand All @@ -279,7 +279,7 @@ public function updateDataProvider(): array
'2.2.2.3472',
'stable',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient/>
Expand All @@ -292,7 +292,7 @@ public function updateDataProvider(): array
'2.2.2.3472',
'stable',
true,
false,
false,
$config,
'<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
Expand All @@ -314,7 +314,7 @@ public function updateDataProvider(): array
'2.3',
'stable',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient/>
Expand All @@ -327,7 +327,7 @@ public function updateDataProvider(): array
'2.3',
'stable',
true,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient/>
Expand All @@ -340,7 +340,7 @@ public function updateDataProvider(): array
'2.3',
'stable',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient/>
Expand All @@ -353,7 +353,7 @@ public function updateDataProvider(): array
'2.3',
'stable',
false,
false,
false,
$config,
'<?xml version="1.0"?>
<owncloudclient/>
Expand All @@ -366,7 +366,7 @@ public function updateDataProvider(): array
'2.3',
'stable',
true,
false,
false,
$config,
'<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
Expand All @@ -383,14 +383,14 @@ public function updateDataProvider(): array
],
// #22 Sparkle on, always needs to know what the latest version is
[
'nextcloud',
'macos',
'2.2.2-rc2',
'beta',
true,
false,
$config,
'<?xml version="1.0" encoding="utf-8"?>
'nextcloud',
'macos',
'2.2.2-rc2',
'beta',
true,
false,
$config,
'<?xml version="1.0" encoding="utf-8"?>
Comment on lines +386 to +393
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am unsure this one is correct

<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel>
<title>Download Channel</title>
Expand All @@ -403,16 +403,16 @@ public function updateDataProvider(): array
</item></channel>
</rss>'
],
// #23 Sparkle on, always needs to know what the latest version is
[
'nextcloud',
'macos',
'2.2.2',
'beta',
true,
false,
$config,
'<?xml version="1.0" encoding="utf-8"?>
// #23 Sparkle on, always needs to know what the latest version is
[
'nextcloud',
'macos',
'2.2.2',
'beta',
true,
false,
$config,
'<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel>
<title>Download Channel</title>
Expand All @@ -424,8 +424,8 @@ public function updateDataProvider(): array
<sparkle:minimumSystemVersion>11.0</sparkle:minimumSystemVersion>
</item></channel>
</rss>'
]
];
]
];
}

/**
Expand Down
Loading