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.

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

adjust method signatures in Encryption.php #37376

Merged
merged 1 commit into from
May 12, 2020

Conversation

phil-davis
Copy link
Contributor

@phil-davis phil-davis commented May 12, 2020

Description

Update the wrapSource and loadContext methods so that the default parameters match the parent class in icewind/streams

This makes the encryption unit tests pass. See demonstration PR owncloud/encryption#199 and drone result https://drone.owncloud.com/owncloud/encryption/1264/4/4

phpdbg -qrr -d memory_limit=4096M -d zend.enable_gc=0 "../../lib/composer/bin/phpunit" --configuration ./phpunit.xml --testsuite unit
PHPUnit 8.5.4 by Sebastian Bergmann and contributors.

Runtime:       PHPDBG 7.2.27-6+ubuntu18.04.1+deb.sury.org+1
Configuration: /var/www/owncloud/server/apps/encryption/phpunit.xml

a test string for helloWelcome to your ownCloud account!

This is just an example file for developers and git users. 
The packaged and released versions will come with better examples.

a test string for world.a foo testLets modify again3Welcome to your ownCloud account!

This is just an example file for developers and git users. 
The packaged and released versions will come with better examples.

a test string for world.a foo testLets modify again3Welcome to your ownCloud account!

This is just an example file for developers and git users. 
The packaged and released versions will come with better examples.

a test string for world.............................................................  63 / 251 ( 25%)
............................................................... 126 / 251 ( 50%)
............................................................... 189 / 251 ( 75%)
..............................................................  251 / 251 (100%)

Time: 11.08 seconds, Memory: 504.00 MB

OK (251 tests, 725 assertions)

Note: these adjustments are part of implementing #37249 which already has a changelog entry.

Related Issue

How Has This Been Tested?

Local run of encryption unit tests

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:
  • Changelog item, see TEMPLATE

@codecov
Copy link

codecov bot commented May 12, 2020

Codecov Report

Merging #37376 into master will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #37376   +/-   ##
=========================================
  Coverage     64.57%   64.57%           
  Complexity    19220    19220           
=========================================
  Files          1268     1268           
  Lines         75105    75105           
  Branches       1331     1331           
=========================================
  Hits          48496    48496           
  Misses        26217    26217           
  Partials        392      392           
Flag Coverage Δ Complexity Δ
#javascript 54.14% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.72% <100.00%> (ø) 19220.00 <6.00> (ø)
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Stream/Encryption.php 93.98% <100.00%> (ø) 56.00 <6.00> (ø)

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 12d9bc3...c0f238c. Read the comment docs.

@codecov
Copy link

codecov bot commented May 12, 2020

Codecov Report

Merging #37376 into master will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #37376   +/-   ##
=========================================
  Coverage     64.57%   64.57%           
  Complexity    19220    19220           
=========================================
  Files          1268     1268           
  Lines         75105    75105           
  Branches       1331     1331           
=========================================
  Hits          48496    48496           
  Misses        26217    26217           
  Partials        392      392           
Flag Coverage Δ Complexity Δ
#javascript 54.14% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.72% <100.00%> (ø) 19220.00 <6.00> (ø)
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Stream/Encryption.php 93.98% <100.00%> (ø) 56.00 <6.00> (ø)

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 12d9bc3...c0f238c. Read the comment docs.

@phil-davis phil-davis merged commit a91573b into master May 12, 2020
@delete-merged-branch delete-merged-branch bot deleted the adjust-method-signatures-in-Encryption.php branch May 12, 2020 07:39
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.

2 participants