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] future drop php 7.0 #34936

Closed
wants to merge 8 commits into from
Closed

Conversation

phil-davis
Copy link
Contributor

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

Description

This draft PR is a place to put things that are waiting to go into stable10 but that require PHP7.1+ and so cannot be merged until PHP7.0 support can be dropped.

  • Increase version to 10.1 prealpha #28043 Increase version to PHP7.1 (the remaining commits from that PR that relate to PHP7.1 and thus have never been backported yet)
  • Set min PHP version to 7.1 (1)
  • PHP 7.1+ is required (2)
  • "[Workaround] .... until Fix mocking of interface which extend Throwable sebastianbergmann/phpunit-mock-objects#402 is merged and released" 407a70d (I think this will be needed as long as we are on phpunit6, because that phpunit-mock-objects change never got into a release with dependencies for phpunit6) (3)
  • (other commits from Increase version to 10.1 prealpha #28043 are already back in stable10)
  • Bump doctrine/dbal from 2.7.1 to 2.8.0 #32065 2nd commit "Remove our own sqlite autoincrement hack" (needed with doctrine/dbal version bump that comes when composer PHP 7.1 happens) (4)
  • Adjust drone matrix to match what is currently being done in master (actual commits from master would be from 2 years of travis and drone times!) (5)
  • Disable phpstan in drone until we can sort out code fix backporting (see [stable10] Introduce phpstan #35774 that is waiting for review) (6)
  • Do not test postgres:10.3 - needs more backports (I will look for what is needed for this) (7)
  • Fix ExceptionPlugin.php logException like in master (this is fixed with "Introduce phpstan") (8)
    That stops the warning:
[PHP Warning:  Declaration of OCA\DAV\Tests\unit\Connector\Sabre\RequestTest\ExceptionPlugin::logException(Exception $ex) should be compatible with OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin::logException(Throwable $ex) in /drone/src/apps/dav/tests/unit/Connector/Sabre/RequestTest/ExceptionPlugin.php on line 26]

Related Issue

Motivation and Context

Have a place to consolidate backports that are "blocked" waiting for PHP7.0 to be dropped.

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 Mar 30, 2019

Codecov Report

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

Impacted file tree graph

@@               Coverage Diff               @@
##             stable10   #34936       +/-   ##
===============================================
- Coverage       64.24%   45.03%   -19.22%     
===============================================
  Files            1276      116     -1160     
  Lines           76246    11478    -64768     
  Branches         1292     1292               
===============================================
- Hits            48985     5169    -43816     
+ Misses          26882     5930    -20952     
  Partials          379      379
Flag Coverage Δ Complexity Δ
#javascript 53.2% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 30.71% <ø> (-34.71%) 0 <ø> (-19894)
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Storage/DAV.php 59.45% <0%> (-21.64%) 0% <0%> (ø)
apps/updatenotification/templates/admin.php
lib/private/Encryption/Keys/Storage.php
lib/private/App/CodeChecker/NodeVisitor.php
lib/private/RedisFactory.php
apps/dav/lib/Avatars/AvatarNode.php
...s/dav/appinfo/Migrations/Version20170202213905.php
apps/dav/lib/Upload/ChunkLocationProvider.php
apps/files/lib/AppInfo/Application.php
apps/systemtags/list.php
... and 1148 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 77c026b...4532b30. Read the comment docs.

@codecov
Copy link

codecov bot commented Mar 30, 2019

Codecov Report

Merging #34936 into stable10 will increase coverage by 0.18%.
The diff coverage is 0%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34936      +/-   ##
==============================================
+ Coverage       64.84%   65.02%   +0.18%     
+ Complexity      20243    20238       -5     
==============================================
  Files            1299     1299              
  Lines           77220    77266      +46     
  Branches         1301     1301              
==============================================
+ Hits            50070    50242     +172     
+ Misses          26765    26639     -126     
  Partials          385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 66.2% <0%> (+0.2%) 20238 <0> (-5) ⬇️
Impacted Files Coverage Δ Complexity Δ
lib/private/DB/ConnectionFactory.php 82.66% <ø> (-0.23%) 21 <0> (ø)
index.php 0% <0%> (ø) 0 <0> (ø) ⬇️
console.php 0% <0%> (ø) 0 <0> (ø) ⬇️
lib/private/DB/OCPostgreSqlPlatform.php 24.13% <0%> (-72.42%) 15% <0%> (ø)
lib/private/Files/Cache/HomePropagator.php 88.88% <0%> (-11.12%) 3% <0%> (ø)
apps/files/lib/Command/Scan.php 71.91% <0%> (-9.17%) 74% <0%> (ø)
apps/files/appinfo/update.php 0% <0%> (ø) 0% <0%> (?)
lib/private/Share/Share.php 71.61% <0%> (+0.2%) 507% <0%> (ø) ⬇️
apps/dav/lib/Connector/Sabre/File.php 84.19% <0%> (+0.64%) 115% <0%> (ø) ⬇️
... and 14 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...9caf76f. Read the comment docs.

@phil-davis phil-davis force-pushed the stable10-future-drop-php-7.0 branch 2 times, most recently from 8e82324 to 4e03c2b Compare April 3, 2019 04:58
@phil-davis phil-davis force-pushed the stable10-future-drop-php-7.0 branch from 4e03c2b to 6ede24e Compare June 24, 2019 03:21
@phil-davis phil-davis force-pushed the stable10-future-drop-php-7.0 branch from 6ede24e to 53ee9a6 Compare July 2, 2019 05:10
@phil-davis
Copy link
Contributor Author

Note to self: when dropping PHP7.0 we can probably also go straight to phpunit7 at the same time in stable10. PR #34921 moves to phpunit7 in core master. That could be backported on top of this stable10 code and the planets might come into alignment.

@phil-davis phil-davis force-pushed the stable10-future-drop-php-7.0 branch 4 times, most recently from dc75630 to 5272102 Compare July 5, 2019 03:29
@phil-davis
Copy link
Contributor Author

phil-davis commented Jul 5, 2019

Note: see PR #31810 for what was done in master to get phpstan running and passing.
We might not want to get mixed up in all that, just for "drop PHP 7.0" - see #35774 which does "introduce phpstan" as a separate PR to stable10

@phil-davis phil-davis force-pushed the stable10-future-drop-php-7.0 branch 3 times, most recently from eb56f86 to 534ef90 Compare July 7, 2019 14:35
@phil-davis
Copy link
Contributor Author

This needs mariadb:10.3 changes backported from #33255
That is sorted out in a new PR #35786 which has the commits cherry-picked in a better order that reduced the conflicts along the way.

@phil-davis phil-davis closed this Jul 9, 2019
@phil-davis phil-davis deleted the stable10-future-drop-php-7.0 branch July 9, 2019 09:39
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