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

[DO NOT MERGE] Drop php 7.0 bump phpunit7 20190731 #35962

Closed
wants to merge 26 commits into from

Conversation

phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Jul 31, 2019

Description

Combination of
#35786 "drop PHP 7.0"
#34921 Bump phpunit7 (backport)
Extra commit: "Update method signatures for EncryptionTrait markTestSkipped and assertTrue" to fix a problem reported in the encryption unit test code (which is not in master), to fix:

PHP Fatal error:  Declaration of Test\Traits\EncryptionTrait::markTestSkipped(string $message = '') must be compatible with PHPUnit\Framework\Assert::markTestSkipped(string $message = ''): void in /home/phil/git/owncloud/core/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php on line 36
PHP Fatal error:  Declaration of Test\Traits\EncryptionTrait::assertTrue($condition, $message = '') must be compatible with PHPUnit\Framework\Assert::assertTrue($condition, string $message = ''): void in /home/phil/git/owncloud/core/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php on line 36

Related Issue

Motivation and Context

See if it passes all together.

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:

Vincent Petry and others added 26 commits August 1, 2019 08:30
Since the DBAL update, the schema wrapper is not needed any more.
Unit tests to verify implementation of mb4 detection without touching
the database.
@phil-davis phil-davis force-pushed the drop-php-7.0-bump-phpunit7-20190731 branch from 5c5c5f1 to f5d3953 Compare August 1, 2019 02:45
@codecov
Copy link

codecov bot commented Aug 1, 2019

Codecov Report

Merging #35962 into master will decrease coverage by 0.36%.
The diff coverage is 77.77%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #35962      +/-   ##
============================================
- Coverage      65.4%   65.03%   -0.37%     
+ Complexity    20197    19430     -767     
============================================
  Files          1299     1296       -3     
  Lines         76762    76377     -385     
  Branches       1301     1301              
============================================
- Hits          50203    49675     -528     
- Misses        26174    26317     +143     
  Partials        385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 66.23% <77.77%> (-0.4%) 19430 <18> (-767)
Impacted Files Coverage Δ Complexity Δ
lib/private/DB/ConnectionFactory.php 89.85% <ø> (+6.96%) 20 <0> (-1) ⬇️
index.php 0% <0%> (ø) 0 <0> (ø) ⬇️
console.php 0% <0%> (ø) 0 <0> (ø) ⬇️
...s/comments/tests/unit/Dav/EntityCollectionTest.php 100% <100%> (ø) 8 <7> (ø) ⬇️
lib/private/DB/MySqlTools.php 88.46% <82.35%> (+88.46%) 11 <11> (+7) ⬆️
...aring/appinfo/Migrations/Version20190410160725.php 75% <0%> (-25%) 4% <0%> (+2%)
core/Application.php 25.47% <0%> (-13.76%) 1% <0%> (-24%)
apps/files/lib/AppInfo/Application.php 30.55% <0%> (-9.93%) 1% <0%> (-6%)
settings/Application.php 51.44% <0%> (-8.75%) 2% <0%> (-39%)
...e/AppFramework/DependencyInjection/DIContainer.php 64.84% <0%> (-8.05%) 15% <0%> (-66%)
... and 201 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 4e2d11f...f5d3953. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Aug 1, 2019

Codecov Report

Merging #35962 into master will decrease coverage by 0.36%.
The diff coverage is 77.77%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #35962      +/-   ##
============================================
- Coverage      65.4%   65.03%   -0.37%     
+ Complexity    20197    19430     -767     
============================================
  Files          1299     1296       -3     
  Lines         76762    76377     -385     
  Branches       1301     1301              
============================================
- Hits          50203    49675     -528     
- Misses        26174    26317     +143     
  Partials        385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 66.23% <77.77%> (-0.4%) 19430 <18> (-767)
Impacted Files Coverage Δ Complexity Δ
lib/private/DB/ConnectionFactory.php 89.85% <ø> (+6.96%) 20 <0> (-1) ⬇️
index.php 0% <0%> (ø) 0 <0> (ø) ⬇️
console.php 0% <0%> (ø) 0 <0> (ø) ⬇️
...s/comments/tests/unit/Dav/EntityCollectionTest.php 100% <100%> (ø) 8 <7> (ø) ⬇️
lib/private/DB/MySqlTools.php 88.46% <82.35%> (+88.46%) 11 <11> (+7) ⬆️
...aring/appinfo/Migrations/Version20190410160725.php 75% <0%> (-25%) 4% <0%> (+2%)
core/Application.php 25.47% <0%> (-13.76%) 1% <0%> (-24%)
apps/files/lib/AppInfo/Application.php 30.55% <0%> (-9.93%) 1% <0%> (-6%)
settings/Application.php 51.44% <0%> (-8.75%) 2% <0%> (-39%)
...e/AppFramework/DependencyInjection/DIContainer.php 64.84% <0%> (-8.05%) 15% <0%> (-66%)
... and 201 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 4e2d11f...f5d3953. Read the comment docs.

@phil-davis
Copy link
Contributor Author

ToDo: rebase this and sort out the drone.yml changes

@phil-davis phil-davis mentioned this pull request Aug 27, 2019
3 tasks
@phil-davis
Copy link
Contributor Author

See PR #36290 for a rebased-updated version that works with the new drone starlark CI code.

@phil-davis phil-davis closed this Oct 18, 2019
@phil-davis phil-davis deleted the drop-php-7.0-bump-phpunit7-20190731 branch June 18, 2020 03:53
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