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

[stable10] Updating phpunit/phpunit (5.7.27 => 6.5.14) #34866

Merged
merged 5 commits into from
Apr 1, 2019

Conversation

phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Mar 22, 2019

Backport #34860

  1. Bump phpunit 5.7 to 6.5 in composer.json
  2. Adjust setExpectedException becomes expectException
  3. Adjust PHP unit framework namespace - e.g. PHPUnit_Framework_Assert becomes PHPUnit\Framework\Assert
  4. Adjust PHPunit framework references in encryption unit tests
  5. Adjust PHPunit framework references in encryption acceptance tests
  6. Adjust PHPunit framework references in user management acceptance tests

Note: encryption and user_management are still part of stable10. So these have to be adjusted in the backport, but were not in master.

https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-6.0.0

Note: app repo unit tests use the phpunit from core. When this (and master #34860 ) are merged, then app repo tests also have to be adjusted for PHPUnit6. The changes are not difficult - see points (2) and (3) above. But still it will have to be done.

@codecov
Copy link

codecov bot commented Mar 22, 2019

Codecov Report

Merging #34866 into stable10 will decrease coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34866      +/-   ##
==============================================
- Coverage       64.23%   64.19%   -0.04%     
+ Complexity      19905    19902       -3     
==============================================
  Files            1277     1277              
  Lines           76277    76343      +66     
  Branches         1292     1292              
==============================================
+ Hits            48993    49009      +16     
- Misses          26905    26955      +50     
  Partials          379      379
Flag Coverage Δ Complexity Δ
#javascript 53.2% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.35% <ø> (-0.04%) 19902 <ø> (-3)
Impacted Files Coverage Δ Complexity Δ
...s/comments/tests/unit/Dav/EntityCollectionTest.php 100% <ø> (ø) 8 <0> (ø) ⬇️
...pps/comments/tests/unit/Dav/RootCollectionTest.php 98.38% <ø> (ø) 18 <0> (ø) ⬇️
...mments/tests/unit/Dav/EntityTypeCollectionTest.php 100% <ø> (ø) 7 <0> (ø) ⬇️
tests/bootstrap.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/encryption/lib/Crypto/EncryptAll.php 83.41% <0%> (-9.96%) 46% <0%> (ø)
apps/dav/lib/CardDAV/SyncService.php 45.04% <0%> (-2.58%) 27% <0%> (ø)
lib/private/Repair/MoveAvatarOutsideHome.php 35.55% <0%> (-1.95%) 12% <0%> (ø)
apps/files_trashbin/lib/Expiration.php 96.55% <0%> (-1.73%) 29% <0%> (ø)
apps/dav/lib/DAV/PublicAuth.php 16.66% <0%> (-1.52%) 5% <0%> (ø)
lib/private/Security/CertificateManager.php 87.91% <0%> (-0.98%) 36% <0%> (ø)
... and 29 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 327da18...ac68a50. Read the comment docs.

@phil-davis phil-davis force-pushed the stable10-bump-phpunit-6 branch 2 times, most recently from 7106f0d to 3c69f57 Compare March 24, 2019 04:39
@phil-davis phil-davis force-pushed the stable10-bump-phpunit-6 branch 4 times, most recently from a76210f to 68bb911 Compare March 28, 2019 17:05
Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@PVince81 PVince81 merged commit 0a18854 into stable10 Apr 1, 2019
@delete-merged-branch delete-merged-branch bot deleted the stable10-bump-phpunit-6 branch April 1, 2019 11:15
@PVince81 PVince81 added this to the QA milestone Apr 12, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Apr 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants