Skip to content

[stable23] Ext storage configs default value support + enable SSL by default #36177

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

Jump to bottom
Merged
blizzz merged 2 commits into from
Jan 17, 2023
Merged

[stable23] Ext storage configs default value support + enable SSL by default #36177

blizzz merged 2 commits into from
Jan 17, 2023

Conversation

@PVince81
Copy link
Member

@PVince81 PVince81 commented Jan 16, 2023 •
edited by nickvergessen
Loading

Backport of #36089 to stable23

  • conflicts resolved
  • ⚠️ needs testing, please help! especially that there were conflicts.

stable23 only runs on php < 8.1 and I don't have this available, please help testing as follows:

  1. enable ext storage
  2. select "FTP"
  3. see that "secure" is ticked by default
  4. that's it

@PVince81
Extend ext storage params to contain default value
6fc54ba 
Extend the external storage configuration parameters definition to allow
to specify a default value

Signed-off-by: Vincent Petry <[email protected]>
@PVince81
Enable SSL by default in ext storage configs
f8265d8 
Signed-off-by: Vincent Petry <[email protected]>
@PVince81 PVince81 added the 3. to review Waiting for reviews label Jan 16, 2023
@PVince81 PVince81 self-assigned this Jan 16, 2023
@PVince81 PVince81 mentioned this pull request Jan 16, 2023
Merged
4 tasks
github-advanced-security[bot]
github-advanced-security bot found potential problems Jan 16, 2023
View reviewed changes
apps/files_external/lib/Lib/DefinitionParameter.php
return $result;
}

public function isOptional() {

Check notice

Code scanning / Psalm

InvalidReturnStatement

The inferred type 'array{defaultValue?: non-empty-mixed, flags: int, tooltip: string, type: int, value: string}' does not match the declared return type 'string' for OCA\Files_External\Lib\DefinitionParameter::jsonSerialize
@nickvergessen
Copy link
Member

nickvergessen commented Jan 17, 2023

stable23 only runs on php < 8.1 and I don't have this available, please help testing as follows:

Works

@blizzz blizzz merged commit ae65d9d into stable23 Jan 17, 2023
@blizzz blizzz deleted the enh/noid/ext-storage-default-values/stable23 branch January 17, 2023 09:10
This was referenced Jan 17, 2023
Merged
Merged
@skjnldsv skjnldsv mentioned this pull request Feb 23, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickvergessen nickvergessen nickvergessen approved these changes

@blizzz blizzz blizzz approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@artonge artonge Awaiting requested review from artonge

@come-nc come-nc Awaiting requested review from come-nc

Assignees

@PVince81 PVince81

Labels

3. to review Waiting for reviews

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@PVince81 @nickvergessen @blizzz