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

drop php 7.0 [DO NOT MERGE YET] #35786

Closed
wants to merge 33 commits into from

Conversation

phil-davis
Copy link
Contributor

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

Description

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

  1. Backport Add mariadb 10.3 + mysql 8 to Drone, remove 10.2 workarounds #33255 "Add mariadb 10.3 + mysql 8 to Drone, remove 10.2 workarounds' (5 commits)
  2. Drop PHP 7.0
  • 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
  • PHP 7.1+ is required
  • "[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)
  • (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)
  • Adjust drone for PHP7.1 like master (remaining drone.yml adjustments)
  • Use is_iterable for PHP7.1 (to match more modern test code from master)
  • Update to PHP 7.1 in travis - in case we use it to run UI tests on other browsers
  • Put back empty line in db_structure.xml that was removed by PR 34783 (resolves a minor diff between stable10 and master)
  • Remove special PHP7.0 checks from Makefile
  1. support PostgreSQL 10.3
  1. put back some test code that was for PHP 7.1-only (ref PR: Revert void return type declarations that are not valid in PHP 7.0 #35958 )

Related Issue

#29483 MariaDB
#33187 PostgreSQL 10

Motivation and Context

Get stable10 closer to master and support newer databases.

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 #35786 into stable10 will decrease coverage by 19.15%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##             stable10   #35786       +/-   ##
===============================================
- Coverage       64.84%   45.68%   -19.16%     
===============================================
  Files            1299      116     -1183     
  Lines           77220    11519    -65701     
  Branches         1301     1301               
===============================================
- Hits            50070     5263    -44807     
+ Misses          26765     5871    -20894     
  Partials          385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 31.14% <ø> (-34.86%) 0 <ø> (-20243)
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 1168 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...fd32961. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 9, 2019

Codecov Report

Merging #35786 into stable10 will increase coverage by 0.09%.
The diff coverage is 70%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #35786      +/-   ##
==============================================
+ Coverage        65.1%   65.19%   +0.09%     
+ Complexity      20197    20136      -61     
==============================================
  Files            1302     1299       -3     
  Lines           77158    77011     -147     
  Branches         1301     1301              
==============================================
- Hits            50232    50207      -25     
+ Misses          26541    26419     -122     
  Partials          385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 66.39% <70%> (+0.1%) 20136 <11> (-61) ⬇️
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) ⬆️
lib/private/DB/Connection.php 67.64% <0%> (-2.21%) 49% <0%> (ø)
lib/private/Memcache/ArrayCache.php 100% <0%> (ø) 16% <0%> (-1%) ⬇️
lib/private/Files/Cache/Cache.php 97.61% <0%> (ø) 110% <0%> (ø) ⬇️
lib/private/DB/MDB2SchemaWriter.php 94.79% <0%> (+1.04%) 34% <0%> (ø) ⬇️
lib/private/Repair/Collation.php 87.5% <0%> (+5%) 12% <0%> (ø) ⬇️
... and 2 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 bd3df85...1218101. Read the comment docs.

@phil-davis
Copy link
Contributor Author

phil-davis commented Jul 9, 2019

CI green. This is the best effort so far to drop PHP 7.0

@phil-davis phil-davis force-pushed the stable10-drop-php-7.0-20190709 branch 2 times, most recently from 4488486 to c6ca9d6 Compare July 10, 2019 14:27
@phil-davis phil-davis force-pushed the stable10-drop-php-7.0-20190709 branch from 51ce708 to 9de6708 Compare July 11, 2019 05:05
This was referenced Jul 11, 2019
@phil-davis phil-davis marked this pull request as ready for review July 11, 2019 06:12
@phil-davis
Copy link
Contributor Author

@DeepDiver1975 @patrickjahns @micbar I have found what I can for stable10 "drop PHP 7.0", which also gets us extra MariaDb and PostgreSQL support. This can be reviewed technically to see if I have missed anything.

I suggest just give "comment" reviews. Do not click "Approve" yet. This can only actually be merged once we have decided which release will drop PHP 7.0 support.

@phil-davis phil-davis changed the title [stable10] drop php 7.0 [stable10] drop php 7.0 [DO NOT MERGE YET] Jul 11, 2019
@phil-davis phil-davis force-pushed the stable10-drop-php-7.0-20190709 branch from fde1b82 to da6d66a Compare July 16, 2019 10:01
@phil-davis phil-davis force-pushed the stable10-drop-php-7.0-20190709 branch from da6d66a to 6bbddd6 Compare July 30, 2019 04:37
individual-it and others added 22 commits July 30, 2019 16:25
Minor mobile view adjustments for portrait mode
changes needed for files_lifecycle tests
Revert void return type declarations that are not valid in PHP 7.0
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 stable10-drop-php-7.0-20190709 branch from 6bbddd6 to 698a01a Compare July 31, 2019 10:31
@phil-davis phil-davis changed the title [stable10] drop php 7.0 [DO NOT MERGE YET] drop php 7.0 [DO NOT MERGE YET] Jul 31, 2019
@phil-davis
Copy link
Contributor Author

This PR has got various extra commits in it, because it came from stable10 originally.
PR #35961 is a newly-made branch and PR for this.
When that new PR is known to have good CI, then I will close this one.

@phil-davis
Copy link
Contributor Author

There are some phpunit on PHP 7.0 jobs that are still in drone. I have removed those in the next PR.
Otherwise, this code seems OK.
Closing in favour of the new PR.

@phil-davis phil-davis closed this Jul 31, 2019
@phil-davis phil-davis deleted the stable10-drop-php-7.0-20190709 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.

5 participants