X Tutup
Skip to content

Fix minor wording corrections in command#117

Merged
phil-davis merged 4 commits intomasterfrom
fix-enc-version-wording
Apr 13, 2019
Merged

Fix minor wording corrections in command#117
phil-davis merged 4 commits intomasterfrom
fix-enc-version-wording

Conversation

@sharidas
Copy link
Contributor

@sharidas sharidas commented Apr 12, 2019 •
edited by phil-davis
Loading

Fix minor wording corrections in the command.

Signed-off-by: Sujith H sharidasan@owncloud.com

Also added here to help with #118 code alignment: (by phil-davis)

  • Bump all ownCloud copyright consistently to 2019
  • Fix GmbH typo in copyright
  • Adjust encryption code format to match what is in core stable10

That gets the code here closer to core stable10. See core stable10 PR owncloud/core#35015 for changes in the opposite direction, that get core stable10 closer to the encryption app repo.

@sharidas sharidas added this to the development milestone Apr 12, 2019
@sharidas sharidas self-assigned this Apr 12, 2019
@sharidas sharidas requested review from PVince81 and phil-davis April 12, 2019 13:44
@sharidas sharidas mentioned this pull request Apr 12, 2019
Merged
11 tasks
@sharidas
Copy link
Contributor Author

sharidas commented Apr 12, 2019

The backport of this commit is owncloud/core#35000. To be precise the commit owncloud/core@c530242

phil-davis
phil-davis approved these changes Apr 12, 2019
View reviewed changes
Copy link
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

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

LGTM
Note:

use OC\Files\Cache\Cache;

already exists in tests/unit/Command/FixEncryptedVersionTest.php
here in the encryption repo. So that line from the core stable10 commit did not need to be added.

@sharidas sharidas force-pushed the fix-enc-version-wording branch from c40f753 to e3f1f4f Compare April 12, 2019 14:11
@codecov
Copy link

codecov bot commented Apr 12, 2019 •
edited
Loading

Codecov Report

Merging #117 into master will increase coverage by 0.02%.
The diff coverage is 75%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #117      +/-   ##
============================================
+ Coverage     69.76%   69.79%   +0.02%     
- Complexity      619      620       +1     
============================================
  Files            34       34              
  Lines          2289     2291       +2     
============================================
+ Hits           1597     1599       +2     
  Misses          692      692
Impacted Files Coverage Δ Complexity Δ
lib/AppInfo/Application.php 6.5% <ø> (ø) 25 <0> (ø) ⬇️
lib/Hooks/UserHooks.php 75% <ø> (ø) 36 <0> (ø) ⬇️
lib/Controller/RecoveryController.php 88.33% <ø> (ø) 22 <0> (ø) ⬇️
lib/KeyManager.php 77.14% <ø> (ø) 83 <0> (ø) ⬇️
lib/Command/SelectEncryptionType.php 0% <ø> (ø) 13 <0> (ø) ⬇️
appinfo/Migrations/Version20170913113840.php 0% <ø> (ø) 6 <0> (ø) ⬇️
lib/Recovery.php 78.44% <ø> (ø) 41 <0> (ø) ⬇️
lib/Crypto/DecryptAll.php 87.05% <ø> (ø) 32 <0> (ø) ⬇️
lib/Exceptions/PrivateKeyMissingException.php 75% <ø> (ø) 2 <0> (ø) ⬇️
lib/JWT.php 100% <ø> (ø) 5 <0> (ø) ⬇️
... and 20 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0b900b4...dff6920. Read the comment docs.

@sharidas
Copy link
Contributor Author

sharidas commented Apr 12, 2019

@phil-davis Updated the PR by removing

use OC\Files\Cache\Cache;

@phil-davis
Copy link
Contributor

phil-davis commented Apr 12, 2019

@phil-davis Updated the PR by removing

use OC\Files\Cache\Cache;

If that is an unused use statement, then great, delete it. Now that same delete needs to be done in cire stable10 also, to keep the code as much the same as possible.

@sharidas @phil-davis
Fix minor wording corrections in command
d5d79bb 
Fix minor wording corrections in the command.

Signed-off-by: Sujith H <sharidasan@owncloud.com>
@phil-davis phil-davis force-pushed the fix-enc-version-wording branch from e3f1f4f to d5d79bb Compare April 12, 2019 23:16
@phil-davis
Copy link
Contributor

phil-davis commented Apr 12, 2019

Rebased, let's see what CI says now.

@phil-davis phil-davis merged commit bd46d07 into master Apr 13, 2019
@delete-merged-branch delete-merged-branch bot deleted the fix-enc-version-wording branch April 13, 2019 09:19
@phil-davis phil-davis mentioned this pull request Apr 13, 2019
Closed
@patrickjahns patrickjahns mentioned this pull request Aug 9, 2019
Merged
@patrickjahns patrickjahns modified the milestones: development, QA Aug 13, 2019
@davitol davitol mentioned this pull request Sep 12, 2019
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@phil-davis phil-davis phil-davis approved these changes

@PVince81 PVince81 Awaiting requested review from PVince81

Assignees

@sharidas sharidas

Labels

4 - To release

Projects

None yet

Milestone

1.4.0

Development

Successfully merging this pull request may close these issues.

3 participants

@sharidas @phil-davis @patrickjahns
X Tutup