Skip to content

[stable10] consistent code with the separated encryption app repo#35015

Merged
phil-davis merged 3 commits into
stable10from
stable10-consistent-encryption-copyright-2019
Apr 13, 2019
Merged

[stable10] consistent code with the separated encryption app repo#35015
phil-davis merged 3 commits into
stable10from
stable10-consistent-encryption-copyright-2019

Conversation

@phil-davis

Copy link
Copy Markdown
Contributor

Description

  1. bump all the copyright lines to be consistently 2019
  2. adjust minor code format to be like what is in the encryption app repo
  3. adjust unit test asserts to be like what is in the encryption app repo

Related Issue

owncloud/encryption#118

Motivation and Context

Get code aligned

How Has This Been Tested?

CI

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

@codecov

codecov Bot commented Apr 13, 2019

Copy link
Copy Markdown

Codecov Report

Merging #35015 into stable10 will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##             stable10   #35015   +/-   ##
===========================================
  Coverage       64.46%   64.46%           
  Complexity      20064    20064           
===========================================
  Files            1286     1286           
  Lines           76928    76928           
  Branches         1307     1307           
===========================================
  Hits            49594    49594           
  Misses          26953    26953           
  Partials          381      381
Flag Coverage Δ Complexity Δ
#javascript 53.01% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.68% <100%> (ø) 20064 <0> (ø) ⬇️
Impacted Files Coverage Δ Complexity Δ
...ption/lib/Exceptions/PublicKeyMissingException.php 75% <ø> (ø) 2 <0> (ø) ⬇️
apps/encryption/lib/Crypto/DecryptAll.php 87.05% <ø> (ø) 32 <0> (ø) ⬇️
...tion/lib/Exceptions/PrivateKeyMissingException.php 75% <ø> (ø) 2 <0> (ø) ⬇️
apps/encryption/lib/Crypto/Encryption.php 80.6% <ø> (ø) 55 <0> (ø) ⬇️
...pps/encryption/lib/Command/FixEncryptedVersion.php 92.2% <ø> (ø) 21 <0> (ø) ⬇️
apps/encryption/lib/Crypto/CryptHSM.php 92.85% <ø> (ø) 10 <0> (ø) ⬇️
apps/encryption/appinfo/app.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/encryption/templates/mail.php 100% <ø> (ø) 0 <0> (ø) ⬇️
...s/encryption/lib/Controller/SettingsController.php 100% <ø> (ø) 8 <0> (ø) ⬇️
apps/encryption/lib/Command/MigrateKeys.php 0% <ø> (ø) 10 <0> (ø) ⬇️
... and 24 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 eecd7e1...d3b6750. Read the comment docs.

1 similar comment
@codecov

codecov Bot commented Apr 13, 2019

Copy link
Copy Markdown

Codecov Report

Merging #35015 into stable10 will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##             stable10   #35015   +/-   ##
===========================================
  Coverage       64.46%   64.46%           
  Complexity      20064    20064           
===========================================
  Files            1286     1286           
  Lines           76928    76928           
  Branches         1307     1307           
===========================================
  Hits            49594    49594           
  Misses          26953    26953           
  Partials          381      381
Flag Coverage Δ Complexity Δ
#javascript 53.01% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.68% <100%> (ø) 20064 <0> (ø) ⬇️
Impacted Files Coverage Δ Complexity Δ
...ption/lib/Exceptions/PublicKeyMissingException.php 75% <ø> (ø) 2 <0> (ø) ⬇️
apps/encryption/lib/Crypto/DecryptAll.php 87.05% <ø> (ø) 32 <0> (ø) ⬇️
...tion/lib/Exceptions/PrivateKeyMissingException.php 75% <ø> (ø) 2 <0> (ø) ⬇️
apps/encryption/lib/Crypto/Encryption.php 80.6% <ø> (ø) 55 <0> (ø) ⬇️
...pps/encryption/lib/Command/FixEncryptedVersion.php 92.2% <ø> (ø) 21 <0> (ø) ⬇️
apps/encryption/lib/Crypto/CryptHSM.php 92.85% <ø> (ø) 10 <0> (ø) ⬇️
apps/encryption/appinfo/app.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/encryption/templates/mail.php 100% <ø> (ø) 0 <0> (ø) ⬇️
...s/encryption/lib/Controller/SettingsController.php 100% <ø> (ø) 8 <0> (ø) ⬇️
apps/encryption/lib/Command/MigrateKeys.php 0% <ø> (ø) 10 <0> (ø) ⬇️
... and 24 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 eecd7e1...d3b6750. Read the comment docs.

@phil-davis
phil-davis merged commit f4c867c into stable10 Apr 13, 2019
@delete-merged-branch
delete-merged-branch Bot deleted the stable10-consistent-encryption-copyright-2019 branch April 13, 2019 09:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants