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 #35789

Closed

Conversation

phil-davis
Copy link
Contributor

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

Description

Combination of
#35774 "Introduce phpstan" (note: has now been merged to stable10)
#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:

@phil-davis phil-davis self-assigned this Jul 9, 2019
@codecov
Copy link

codecov bot commented Jul 9, 2019

Codecov Report

Merging #35789 into stable10 will decrease coverage by 0.12%.
The diff coverage is 75.45%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #35789      +/-   ##
==============================================
- Coverage       64.84%   64.71%   -0.13%     
+ Complexity      20243    19487     -756     
==============================================
  Files            1299     1298       -1     
  Lines           77220    76901     -319     
  Branches         1301     1301              
==============================================
- Hits            50070    49770     -300     
+ Misses          26765    26746      -19     
  Partials          385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.87% <75.45%> (-0.13%) 19487 <23> (-756)
Impacted Files Coverage Δ Complexity Δ
core/Command/Upgrade.php 0% <ø> (ø) 29 <0> (-39) ⬇️
lib/private/Session/Session.php 100% <ø> (ø) 5 <0> (ø) ⬇️
lib/private/DB/MigrationService.php 90.37% <ø> (-0.08%) 51 <0> (-2)
lib/private/DB/ConnectionFactory.php 90.27% <ø> (+7.38%) 21 <0> (ø) ⬇️
lib/private/Session/CryptoWrapper.php 47.05% <ø> (ø) 6 <0> (ø) ⬇️
apps/files/lib/Command/TransferOwnership.php 0% <ø> (ø) 40 <0> (-6) ⬇️
apps/dav/lib/CardDAV/SyncService.php 45.45% <ø> (+0.4%) 25 <0> (-2) ⬇️
core/Command/Maintenance/DataFingerprint.php 100% <ø> (ø) 4 <0> (ø) ⬇️
lib/private/Files/Node/Folder.php 96.09% <ø> (-0.09%) 42 <0> (-3)
apps/files/lib/Command/VerifyChecksums.php 91.56% <ø> (-0.2%) 23 <0> (-9)
... and 292 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 305a8ec...8017155. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 9, 2019

Codecov Report

Merging #35789 into stable10 will decrease coverage by 0.37%.
The diff coverage is 70%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #35789      +/-   ##
==============================================
- Coverage       65.09%   64.71%   -0.38%     
+ Complexity      20239    19487     -752     
==============================================
  Files            1300     1298       -2     
  Lines           77238    76901     -337     
  Branches         1301     1301              
==============================================
- Hits            50279    49770     -509     
- Misses          26574    26746     +172     
  Partials          385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.87% <70%> (-0.42%) 19487 <11> (-752)
Impacted Files Coverage Δ Complexity Δ
lib/private/DB/ConnectionFactory.php 90.27% <ø> (+7.38%) 21 <0> (ø) ⬇️
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) ⬆️
lib/private/DB/OCPostgreSqlPlatform.php 24.13% <0%> (-72.42%) 15% <0%> (ø)
...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 198 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...bd9754f. Read the comment docs.

@phil-davis
Copy link
Contributor Author

CI green - great stuff.
This is a working example of phpstan, dropping PHP 7.0 and bumping PHPunit from 6 to 7 on stable10

@phil-davis phil-davis force-pushed the stable10-add-phpstan-drop-php-7.0-phpunit7-20190709 branch from 8017155 to bd9754f Compare July 10, 2019 14:29
@phil-davis phil-davis changed the title [stable10] add phpstan drop php 7.0 phpunit7 [stable10] drop php 7.0 phpunit7 Jul 10, 2019
@phil-davis phil-davis changed the title [stable10] drop php 7.0 phpunit7 [stable10] drop php 7.0 and add phpunit7 Jul 10, 2019
@phil-davis
Copy link
Contributor Author

Later version is #35804

@phil-davis phil-davis closed this Jul 11, 2019
@phil-davis phil-davis deleted the stable10-add-phpstan-drop-php-7.0-phpunit7-20190709 branch July 11, 2019 07:49
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