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

[For 10.4] Drop php 7.0 bump phpunit7 #36290

Merged
merged 25 commits into from
Nov 28, 2019

Conversation

phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Oct 18, 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. (from PR #36289 )
Plus moving from phpunit6 to phpunit7

  1. From PR 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 applied 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 which is nowadays master)
  • 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 adjustments)
  • Use is_iterable for PHP7.1 (to match more modern test code from archive/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 old stable10 and old 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 )

  2. add commits to update phpunit to V7.5.17

Related Issue

#29483 MariaDB
#33187 PostgreSQL 10

Motivation and Context

Gather all the changes required for "drop PHP7.0" and related support for newer MariaDB and PostgreSQL versions... that were in the "old" master, and have them ready for "new" master.

@phil-davis phil-davis self-assigned this Oct 18, 2019
@phil-davis phil-davis changed the title [WIP] Drop php 7.0 bump phpunit7 20191018 [THINK BEFORE MERGING] Drop php 7.0 bump phpunit7 20191018 Oct 18, 2019
@phil-davis
Copy link
Contributor Author

This is a rebased-refactor of PR #35962 that works with the new .drone.starlark and other recent changes in master. It is the stuff that needs to happen/is waiting to happen when we drop PHP 7.0 support plus move from phpunit6 to phpunit7

@DeepDiver1975 @PVince81 @micbar and others please review to see what is good/needs fixing or has been forgotten. Just make review comments - probably best not to click "approve" just yet (or someone might merge it)

Then it will be here ready for whenever the decision is made to release "drop PHP 7.0"

@codecov
Copy link

codecov bot commented Oct 18, 2019

Codecov Report

Merging #36290 into master will decrease coverage by 0.5%.
The diff coverage is 77.77%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #36290      +/-   ##
============================================
- Coverage     65.18%   64.68%   -0.51%     
+ Complexity    19794    19023     -771     
============================================
  Files          1271     1268       -3     
  Lines         74730    74362     -368     
  Branches       1309     1309              
============================================
- Hits          48712    48100     -612     
- Misses        25632    25876     +244     
  Partials        386      386
Flag Coverage Δ Complexity Δ
#javascript 54% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.86% <77.77%> (-0.55%) 19023 <18> (-771)
Impacted Files Coverage Δ Complexity Δ
lib/private/DB/ConnectionFactory.php 89.85% <ø> (-0.94%) 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 24.77% <0%> (-13.63%) 1% <0%> (-25%)
apps/files/lib/AppInfo/Application.php 30.55% <0%> (-9.93%) 1% <0%> (-6%)
settings/Application.php 53.98% <0%> (-8.52%) 2% <0%> (-38%)
...e/AppFramework/DependencyInjection/DIContainer.php 64.09% <0%> (-8.19%) 15% <0%> (-66%)
... and 204 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 4ee3233...aad53a2. Read the comment docs.

@phil-davis phil-davis marked this pull request as ready for review October 18, 2019 07:34
@phil-davis phil-davis force-pushed the drop-php-7.0-bump-phpunit7-20191018 branch 4 times, most recently from 14cd6fb to 1e0b2a9 Compare October 29, 2019 09:58
@phil-davis phil-davis force-pushed the drop-php-7.0-bump-phpunit7-20191018 branch 2 times, most recently from 1570d6a to 8a950cf Compare November 7, 2019 08:25
@phil-davis phil-davis force-pushed the drop-php-7.0-bump-phpunit7-20191018 branch 3 times, most recently from 5328ef0 to d4f73fc Compare November 14, 2019 01:19
@phil-davis phil-davis force-pushed the drop-php-7.0-bump-phpunit7-20191018 branch 2 times, most recently from 0bb83f2 to b148bd4 Compare November 21, 2019 06:32
@micbar micbar changed the title [THINK BEFORE MERGING] Drop php 7.0 bump phpunit7 20191018 [For 10.4] Drop php 7.0 bump phpunit7 20191018 Nov 25, 2019
@phil-davis phil-davis force-pushed the drop-php-7.0-bump-phpunit7-20191018 branch from b148bd4 to daf1de4 Compare November 26, 2019 04:02
@phil-davis
Copy link
Contributor Author

@PVince81 @DeepDiver1975 @micbar this is ready for review.
(and then merge at the appropriate time when we are happy/confident to start moving master towards a 10.4 release)
Feel free to delegate reviewing to someone else!

We could merge this whole PR that also includes phpunit7 rather than merging #36289 first. Whatever you think.

This was referenced Nov 28, 2019
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.

4 participants