Bump phan to 1.3.5 and enable on PHP 7.2 7.3 #35818

phil-davis · 2019-07-12T10:48:38Z

Backport #35817

The 4th commit is for code that is in stable10 but not master and gets reported by phan

Note: this has been rebased to the "new" master.

phil-davis · 2019-07-12T10:50:49Z

ToDo:

sort out extra PhanUndeclaredMethod reported in stable10

apps/encryption/lib/AppInfo/Application.php:143 PhanUndeclaredMethod Call to undeclared method \OCP\IServerContainer::getTimeFactory
apps/files_sharing/lib/Scanner.php:78 PhanUndeclaredMethod Call to undeclared method \OC\Files\Storage\Storage::resolvePath
apps/files_sharing/lib/Scanner.php:93 PhanUndeclaredMethod Call to undeclared method \OC\Files\Storage\Storage::resolvePath
apps/provisioning_api/lib/Groups.php:106 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
apps/provisioning_api/lib/Groups.php:181 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
lib/private/DB/MySqlSchemaColumnDefinitionListener.php:54 PhanUndeclaredMethod Call to undeclared method \OCP\IDBConnection::getDatabaseVersionString
lib/private/Files/ObjectStore/ObjectStoreStorage.php:341 PhanUndeclaredMethod Call to undeclared method \OCP\Files\Storage::getBucket
lib/private/Files/View.php:384 PhanUndeclaredMethod Call to undeclared method \OC\Files\Storage\Local::readdir
lib/private/Group/MetaData.php:192 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
lib/private/Share/Share.php:2037 PhanUndeclaredMethod Call to undeclared method \OCP\Share_Backend::getParents
lib/private/Share/Share.php:2061 PhanUndeclaredMethod Call to undeclared method \OCP\Share_Backend::getParents
settings/Controller/UsersController.php:196 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
settings/Controller/UsersController.php:314 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
settings/Controller/UsersController.php:419 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
settings/Controller/UsersController.php:426 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
settings/Controller/UsersController.php:757 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
settings/Controller/UsersController.php:810 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
settings/Controller/UsersController.php:930 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
settings/Controller/UsersController.php:972 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
settings/Controller/UsersController.php:1056 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
settings/Controller/UsersController.php:1057 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin
settings/Controller/UsersController.php:1138 PhanUndeclaredMethod Call to undeclared method \OCP\IGroupManager::getSubAdmin

phil-davis · 2019-07-12T12:17:59Z

Note: https://drone.owncloud.com/owncloud/core/19398/112

The latest Phan release (Phan 2) requires PHP 7.1+ to run, but PHP 7.0.33-8+ubuntu16.04.1+deb.sury.org+1 and Phan 1.3.5 are installed.

This is why I bumped to only phan 1.3.5

After we drop PHP 7.0 then we can move to phan 2.*.*

codecov · 2019-07-12T13:03:20Z

Codecov Report

Merging #35818 into stable10 will decrease coverage by 0.01%.
The diff coverage is 47.45%.

@@              Coverage Diff               @@
##             stable10   #35818      +/-   ##
==============================================
- Coverage       65.09%   65.08%   -0.02%     
  Complexity      20239    20239              
==============================================
  Files            1300     1300              
  Lines           77238    77269      +31     
  Branches         1301     1301              
==============================================
+ Hits            50279    50289      +10     
- Misses          26574    26595      +21     
  Partials          385      385

Flag	Coverage Δ	Complexity Δ
#javascript	`53.85% <ø> (ø)`	`0 <ø> (ø)`	⬇️
#phpunit	`66.26% <47.45%> (-0.02%)`	`20239 <0> (ø)`

Impacted Files	Coverage Δ	Complexity Δ
lib/public/AppFramework/OCSController.php	`95.45% <ø> (ø)`	`14 <0> (ø)`	⬇️
lib/private/legacy/defaults.php	`59.25% <ø> (ø)`	`45 <0> (ø)`	⬇️
lib/private/Console/Application.php	`0% <ø> (ø)`	`23 <0> (ø)`	⬇️
lib/private/legacy/files.php	`0% <ø> (ø)`	`68 <0> (ø)`	⬇️
core/Command/User/ResetPassword.php	`70.52% <ø> (ø)`	`23 <0> (ø)`	⬇️
lib/private/User/User.php	`88.94% <ø> (ø)`	`78 <0> (ø)`	⬇️
lib/private/Files/Meta/MetaVersionCollection.php	`87.5% <ø> (ø)`	`16 <0> (ø)`	⬇️
lib/private/Repair/MoveAvatarIntoSubFolder.php	`23.72% <ø> (ø)`	`18 <0> (ø)`	⬇️
apps/dav/lib/Connector/Sabre/TagsPlugin.php	`93.54% <ø> (ø)`	`41 <0> (ø)`	⬇️
lib/private/Files/Mount/MountPoint.php	`93.5% <ø> (ø)`	`34 <0> (ø)`	⬇️
... and 78 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 50df15a...7798c05. Read the comment docs.

codecov · 2019-07-12T13:03:50Z

Codecov Report

Merging #35818 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master   #35818   +/-   ##
=======================================
  Coverage      54%      54%           
=======================================
  Files          63       63           
  Lines        7403     7403           
  Branches     1307     1307           
=======================================
  Hits         3998     3998           
  Misses       3019     3019           
  Partials      386      386

Flag	Coverage Δ
#javascript	`54% <ø> (ø)`	⬆️

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 8bdd3d9...0397abf. Read the comment docs.

phil-davis · 2019-07-22T04:12:22Z

@patrickjahns @DeepDiver1975 or somebody, please review.

phil-davis · 2019-07-30T06:32:38Z

@DeepDiver1975 @patrickjahns if someone could review this, then it could be merged now. That will save having to regenerate it against the "new" master that is coming.

I rebased it this morning and drone passed. It fails codecov by a bit, because it edits "random" files in places that might not have the average 65% code coverage.

phil-davis · 2019-08-05T04:13:17Z

@patrickjahns @DeepDiver1975 or anybody.
This has been rebased to "new" master.
drone CI passes. It fails codecov because the small additions for phan on average are in classes that do not have the project-average code coverage.
IMO it would be nice to get this running again.
Please review.

phil-davis · 2019-08-08T03:03:42Z

In the drone update we have preserved the "random" drone errors:
https://drone.owncloud.com/owncloud/core/20018/26/9

cURL error 6: Could not resolve host: scality

individual-it · 2019-08-12T03:50:12Z

@phil-davis please resolve conflict

phil-davis · 2019-08-12T03:56:29Z

Conflicts resolved.
@patrickjahns @DeepDiver1975 or somebody - please review.

phil-davis · 2019-08-23T06:54:12Z

I rebased again to make sure that CI is all good with today's current master.
@PVince81 @DeepDiver1975 @patrickjahns or anybody - review please.

PVince81 · 2019-08-23T07:01:11Z

I wonder why our code needs that many string literals for variables and whether there is something we can do to avoid those in the future, like better variable / type declarations ? Or is it the way our classes are constructed ?

PVince81

👍 if CI passes

phil-davis · 2019-08-23T07:16:33Z

I wonder why our code needs that many string literals for variables and whether there is something we can do to avoid those in the future, like better variable / type declarations ? Or is it the way our classes are constructed ?

This gets phan running and passing again. Basically I did:

if there was already a "comment" typehint (which phan could not understand) or other "obvious" evidence of what type the object is, then I put in the "magic" @phan-var string literal that allows phan to understand the type hint.
if the type of the object was not "obviously" guaranteed in some way, then I did @phan-suppress-next-line PhanUndeclaredMethod to suppress the report from phan

"somebody" "someday" should go through these in detail, understand why phan could not deduce the object type, understand if there is a real code problem that could actually go boom in some way, and fix/refactor our code.

phil-davis · 2019-08-23T09:21:44Z

Stupid drone https://drone.owncloud.com/owncloud/core/20351/83/4

behat-chrome-webUIWebdavLockProtection: Error: No such image: docker.io/library/mariadb:10.2

patrickjahns · 2019-08-23T17:01:55Z

@phil-davis
Instead of needing to use @phan-var please try to use @property for class properties. This should deliver a more clean annotation

https://github.com/phan/phan/wiki/Annotating-Your-Source-Code#property

This reverts commit 5a8d82e.

phil-davis added 2 - Developing QA:team labels Jul 12, 2019

phil-davis self-assigned this Jul 12, 2019

phil-davis mentioned this pull request Jul 12, 2019

Bump phan to 1.3.5 and enable on PHP 7.2 7.3 #35817

Closed

11 tasks

phil-davis added 3 - To Review and removed 2 - Developing labels Jul 12, 2019

phil-davis requested review from DeepDiver1975 and patrickjahns July 12, 2019 12:19

phil-davis marked this pull request as ready for review July 12, 2019 12:19

phil-davis force-pushed the stable10-php-phan-20190711 branch from 7798c05 to 22b44f8 Compare July 17, 2019 03:56

phil-davis mentioned this pull request Jul 20, 2019

phan failing on PHP 7.2 and 7.3 #35697

Closed

3 tasks

phil-davis force-pushed the stable10-php-phan-20190711 branch 2 times, most recently from 763a7dd to c9950c9 Compare July 30, 2019 04:35

DeepDiver1975 changed the base branch from stable10 to master July 30, 2019 08:54

phil-davis force-pushed the stable10-php-phan-20190711 branch from c9950c9 to e928284 Compare July 31, 2019 10:26

phil-davis changed the title ~~[stable10] Bump phan to 1.3.5 and enable on PHP 7.2 7.3~~ Bump phan to 1.3.5 and enable on PHP 7.2 7.3 Aug 1, 2019

phil-davis force-pushed the stable10-php-phan-20190711 branch from e928284 to 7ec8b37 Compare August 1, 2019 11:06

phil-davis force-pushed the stable10-php-phan-20190711 branch 3 times, most recently from 53cdeaa to 261dd5c Compare August 8, 2019 01:45

phil-davis force-pushed the stable10-php-phan-20190711 branch from 3e3c431 to c3acf9d Compare August 12, 2019 03:55

phil-davis force-pushed the stable10-php-phan-20190711 branch from c3acf9d to e82eff9 Compare August 15, 2019 15:58

phil-davis requested a review from PVince81 August 23, 2019 06:51

phil-davis force-pushed the stable10-php-phan-20190711 branch from e82eff9 to 7277f88 Compare August 23, 2019 06:52

PVince81 approved these changes Aug 23, 2019

View reviewed changes

phil-davis added 4 - To release and removed 3 - To Review labels Aug 23, 2019

phil-davis force-pushed the stable10-php-phan-20190711 branch from 66b2dce to bff20ba Compare August 24, 2019 01:50

phil-davis added 6 commits August 26, 2019 14:28

Bump phan to 1.3.*

111f5f9

Adjust for PhanUndeclaredMethod

2074883

Revert "Disable running of phan on PHP 7.2 and PHP 7.3"

81b9747

This reverts commit 5a8d82e.

fix phan PhanUndeclaredMethod for stable10

458140e

Add phan-var to MetaPlugin.php that is only in stable10

5578007

suppress new PhanUndeclaredMethod

0397abf

phil-davis force-pushed the stable10-php-phan-20190711 branch from bff20ba to 0397abf Compare August 26, 2019 08:44

phil-davis merged commit b9ff4c9 into master Aug 26, 2019

delete-merged-branch bot deleted the stable10-php-phan-20190711 branch August 26, 2019 13:11

phil-davis mentioned this pull request Aug 26, 2019

Review issues from phan #36092

Closed

davitol mentioned this pull request Sep 3, 2019

10.3 - Changelog test Results #36142

Closed

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump phan to 1.3.5 and enable on PHP 7.2 7.3 #35818

Bump phan to 1.3.5 and enable on PHP 7.2 7.3 #35818

phil-davis commented Jul 12, 2019 •

edited

Loading

phil-davis commented Jul 12, 2019 •

edited

Loading

phil-davis commented Jul 12, 2019

codecov bot commented Jul 12, 2019

codecov bot commented Jul 12, 2019 •

edited

Loading

phil-davis commented Jul 22, 2019

phil-davis commented Jul 30, 2019 •

edited

Loading

phil-davis commented Aug 5, 2019

phil-davis commented Aug 8, 2019

individual-it commented Aug 12, 2019

phil-davis commented Aug 12, 2019

phil-davis commented Aug 23, 2019

PVince81 commented Aug 23, 2019

PVince81 left a comment

phil-davis commented Aug 23, 2019

phil-davis commented Aug 23, 2019

patrickjahns commented Aug 23, 2019

Bump phan to 1.3.5 and enable on PHP 7.2 7.3 #35818

Bump phan to 1.3.5 and enable on PHP 7.2 7.3 #35818

Conversation

phil-davis commented Jul 12, 2019 • edited Loading

phil-davis commented Jul 12, 2019 • edited Loading

phil-davis commented Jul 12, 2019

codecov bot commented Jul 12, 2019

Codecov Report

codecov bot commented Jul 12, 2019 • edited Loading

Codecov Report

phil-davis commented Jul 22, 2019

phil-davis commented Jul 30, 2019 • edited Loading

phil-davis commented Aug 5, 2019

phil-davis commented Aug 8, 2019

individual-it commented Aug 12, 2019

phil-davis commented Aug 12, 2019

phil-davis commented Aug 23, 2019

PVince81 commented Aug 23, 2019

PVince81 left a comment

Choose a reason for hiding this comment

phil-davis commented Aug 23, 2019

phil-davis commented Aug 23, 2019

patrickjahns commented Aug 23, 2019

phil-davis commented Jul 12, 2019 •

edited

Loading

phil-davis commented Jul 12, 2019 •

edited

Loading

codecov bot commented Jul 12, 2019 •

edited

Loading

phil-davis commented Jul 30, 2019 •

edited

Loading