[DO NOT MERGE] Drop php 7.0 bump phpunit7 20190731 by phil-davis · Pull Request #35962 · owncloud/core

phil-davis · 2019-07-31T11:13:30Z

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:

… merged and released

Since the DBAL update, the schema wrapper is not needed any more.

Unit tests to verify implementation of mb4 detection without touching the database.

…trine/dbal since 2.6.4

…P 7.0" This reverts commit 2a7d8ea.

…rtTrue

codecov · 2019-08-01T02:46:07Z

Codecov Report

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

@@             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.

codecov · 2019-08-01T02:46:10Z

Codecov Report

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

@@             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 · 2019-08-09T10:59:35Z

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

phil-davis · 2019-10-18T04:35:19Z

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

phil-davis added the 2 - Developing label Jul 31, 2019

phil-davis self-assigned this Jul 31, 2019

phil-davis mentioned this pull request Jul 31, 2019

[stable10] drop php 7.0 and add phpunit7 [DO NOT MERGE YET] #35804

Closed

10 tasks

Vincent Petry and others added 26 commits August 1, 2019 08:30

Set min PHP version to 7.1

128ebce

PHP 7.1+ is required

89b1d7d

[Workaround] .... until sebastianbergmann/phpunit-mock-objects#402 is…

fa85fd0

… merged and released

Remove our own sqlite autoincrement hack

71fab38

Add mariadb 10.3 to Drone

6d41340

Detect MariaDB > 10.3.1 and assume mb4 support

f7c7313

Remove obsolete MariaDB 10.2 workaround

1ac4817

Since the DBAL update, the schema wrapper is not needed any more.

Add MySQL 8 which defaults to mb4 mode

08e8fa7

Unit tests for mysql mb4 detection

d034da7

Unit tests to verify implementation of mb4 detection without touching the database.

Dismiss OCPostgreSqlPlatform as issues it addresses were fixed in doc…

bc5afb3

…trine/dbal since 2.6.4

Adjust drone for PHP7.1 like master

90f5414

Use is_iterable for PHP7.1

09bd310

Update to PHP 7.1 in travis - in case we use it

bf08eb1

Put back empty line in db_structure.xml that was removed by PR 34783

1d51f8f

Remove special PHP7.0 checks from Makefile

2630dad

Make sure to have at least doctrine/dbal 2.8

b9a214f

Revert "Revert void return type declarations that are not valid in PH…

54f4982

…P 7.0" This reverts commit 2a7d8ea.

Updating phpunit/phpunit (6.5.14 => 7.5.13)

1af22ba

Adjust startsessionlistener.php for PHPUnit7 method signatures

2e50935

cleaner-ignore phpunit/phpunit phpunit.xsd

c015e24

ApiTest testUpdateShare ensure message is a string before passing

8a5ca16

Do not try to mock private method themeExist

4791ad9

Adjust LegacyDBTest testDecimal to pass on sqlite

384ad7a

Update method signatures for EncryptionTrait markTestSkipped and asse…

de56366

…rtTrue

Updating phpunit/phpunit (7.5.13 => 7.5.14)

b7a8697

Remove PHP 7.0 unit test jobs from drone

f5d3953

phil-davis force-pushed the drop-php-7.0-bump-phpunit7-20190731 branch from 5c5c5f1 to f5d3953 Compare August 1, 2019 02:45

phil-davis mentioned this pull request Aug 27, 2019

Postgres 10 support #33187

Closed

3 tasks

phil-davis mentioned this pull request Oct 18, 2019

[For 10.4] Drop php 7.0 bump phpunit7 #36290

Merged

phil-davis closed this Oct 18, 2019

phil-davis deleted the drop-php-7.0-bump-phpunit7-20190731 branch June 18, 2020 03:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

[DO NOT MERGE] Drop php 7.0 bump phpunit7 20190731#35962
phil-davis wants to merge 26 commits intomasterfrom
drop-php-7.0-bump-phpunit7-20190731

phil-davis commented Jul 31, 2019 •

edited

Loading

Uh oh!

codecov bot commented Aug 1, 2019

Uh oh!

codecov bot commented Aug 1, 2019 •

edited

Loading

Uh oh!

phil-davis commented Aug 9, 2019

Uh oh!

phil-davis commented Oct 18, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

phil-davis commented Jul 31, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Types of changes

Checklist:

Uh oh!

codecov bot commented Aug 1, 2019

Codecov Report

Uh oh!

codecov bot commented Aug 1, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

phil-davis commented Aug 9, 2019

Uh oh!

phil-davis commented Oct 18, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

phil-davis commented Jul 31, 2019 •

edited

Loading

codecov bot commented Aug 1, 2019 •

edited

Loading