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] drop php 7.0 and add phpunit7 [DO NOT MERGE YET] #35804

Closed

Conversation

phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Jul 11, 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:

@codecov
Copy link

codecov bot commented Jul 11, 2019

Codecov Report

Merging #35804 into stable10 will decrease coverage by 0.36%.
The diff coverage is 70%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #35804      +/-   ##
==============================================
- Coverage       65.09%   64.73%   -0.37%     
+ Complexity      20239    19471     -768     
==============================================
  Files            1300     1297       -3     
  Lines           77238    76869     -369     
  Branches         1301     1301              
==============================================
- Hits            50279    49760     -519     
- Misses          26574    26724     +150     
  Partials          385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.88% <70%> (-0.4%) 19471 <11> (-768)
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> (ø) ⬇️
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%)
apps/files_trashbin/lib/AppInfo/Application.php 68.42% <0%> (-4.31%) 2% <0%> (-3%)
... and 197 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 2d2dbc1...3d7b7de. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 11, 2019

Codecov Report

Merging #35804 into stable10 will decrease coverage by 0.38%.
The diff coverage is 70%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #35804      +/-   ##
==============================================
- Coverage        65.1%   64.71%   -0.39%     
+ Complexity      20197    19412     -785     
==============================================
  Files            1302     1298       -4     
  Lines           77158    76725     -433     
  Branches         1301     1301              
==============================================
- Hits            50232    49655     -577     
- Misses          26541    26685     +144     
  Partials          385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.87% <70%> (-0.42%) 19412 <11> (-785)
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> (ø) ⬇️
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%)
lib/private/Http/Client/Client.php 82% <0%> (-4.67%) 17% <0%> (-3%)
... and 205 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 c688803...0827e08. Read the comment docs.

@phil-davis phil-davis marked this pull request as ready for review July 11, 2019 08:46
@phil-davis phil-davis requested a review from DeepDiver1975 July 11, 2019 08:46
@phil-davis phil-davis changed the title [stable10] drop php 7.0 and add phpunit7 [stable10] drop php 7.0 and add phpunit7 [DO NOT MERGE YET] Jul 11, 2019
@phil-davis
Copy link
Contributor Author

@DeepDiver1975 this works on top of "drop PHP 7.0" PR #35786
So as soon as we can drop PHP 7.0, it will be easy to also implement PHPunit 7 in stable10 with this code.
The master PR for PHPunit 7 is #34921 . So both can easily be merged at the same time when we are ready.

I suggest just give "comment" reviews. Do not click "Approve" yet. That will prevent any accidental merge of this PR.

@phil-davis phil-davis force-pushed the stable10-add-phpstan-drop-php-7.0-phpunit7-20190711 branch from 3d7b7de to 8d712fa Compare July 16, 2019 09:42
@phil-davis phil-davis force-pushed the stable10-add-phpstan-drop-php-7.0-phpunit7-20190711 branch from 8d712fa to 0827e08 Compare July 30, 2019 04:39
@phil-davis
Copy link
Contributor Author

See PR #35962 for the updated version of this after the stable10 -> master branch changes.

@phil-davis phil-davis closed this Jul 31, 2019
@phil-davis phil-davis deleted the stable10-add-phpstan-drop-php-7.0-phpunit7-20190711 branch June 18, 2020 03:55
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