Annotate how query works

[MorrisJobke]

https://github.com/phan/phan/wiki/Generic-Types#indicating-a-method-creates-an-instance-of-the-passed-in-class-name

Extracted from #18680 by @kesselb

[kesselb]

Yep. Should also work with Psalm and hopefully PHPStorm sometime.

[MorrisJobke]

Yep. Should also work with Psalm and hopefully PHPStorm sometime.

Does work, but now Psalm stumbles over the non-class keys. :/ Anyways - something that we can look into with this separate PR.

[MorrisJobke]

Anyways - something that we can look into with this separate PR.

Things that are good to clean up :)

[kesselb]

Ah. At some places we are still using ->query('UserStatus'). Psalm is unable to resolve those aliases and fails.

[MorrisJobke]

Ah. At some places we are still using ->query('UserStatus'). Psalm is unable to resolve those aliases and fails.

Exactly - but this is something we can tackle in 21.

[faily-bot]

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 33109: failure

mariadb10.1-php7.2

Show full log

There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There was 1 failure:

1) OCA\Files_Versions\Tests\VersioningTest::testRestoreMovedShare
File content has not changed
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'version 2'
+'version 1'

/drone/src/apps/files_versions/tests/VersioningTest.php:729

mysql8.0-php7.2

Show full log

There was 1 error:

1) OCA\Files_Trashbin\Tests\StorageTest::testDeleteVersionsOfFileAsRecipient
OCP\Files\StorageNotAvailableException: File with id "10689" has not been found.

/drone/src/lib/private/Files/Storage/FailedStorage.php:70
/drone/src/lib/private/Files/Storage/Wrapper/Jail.php:122
/drone/src/lib/private/Files/Storage/Wrapper/Wrapper.php:113
/drone/src/lib/private/Files/View.php:1161
/drone/src/lib/private/Files/View.php:379
/drone/src/lib/private/Files/View.php:715
/drone/src/apps/files_trashbin/tests/StorageTest.php:303

Caused by
OCP\Files\NotFoundException: File with id "10689" has not been found.

/drone/src/lib/private/Files/View.php:1755
/drone/src/apps/files_sharing/lib/SharedStorage.php:128
/drone/src/apps/files_sharing/lib/SharedStorage.php:480
/drone/src/lib/private/Files/Storage/Wrapper/Jail.php:122
/drone/src/lib/private/Files/Storage/Wrapper/Wrapper.php:113
/drone/src/lib/private/Files/View.php:1161
/drone/src/lib/private/Files/View.php:379
/drone/src/lib/private/Files/View.php:715
/drone/src/apps/files_trashbin/tests/StorageTest.php:303

--

There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

acceptance-app-theming

• tests/acceptance/features/app-theming.feature:17

Show full log

  Scenario: resetting the color updates the header color                       # /drone/src/tests/acceptance/features/app-theming.feature:17
    Given I am logged in as the admin                                          # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I visit the settings page                                              # SettingsMenuContext::iVisitTheSettingsPage()
    And I open the "Theming" section                                           # AppNavigationContext::iOpenTheSection()
    And I see that the color selector in the Theming app has loaded            # ThemingAppContext::iSeeThatTheColorSelectorInTheThemingAppHasLoaded()
    And I set the "Color" parameter in the Theming app to "#C9C9C9"            # ThemingAppContext::iSetTheParameterInTheThemingAppTo()
    And I see that the parameters in the Theming app are eventually saved      # ThemingAppContext::iSeeThatTheParametersInTheThemingAppAreEventuallySaved()
    And I see that the header color is eventually "#C9C9C9"                    # ThemingAppContext::iSeeThatTheHeaderColorIsEventually()
    When I reset the "Color" parameter in the Theming app to its default value # ThemingAppContext::iSetTheParameterInTheThemingAppToItsDefaultValue()
    Then I see that the parameters in the Theming app are eventually saved     # ThemingAppContext::iSeeThatTheParametersInTheThemingAppAreEventuallySaved()
      The 'Saved' status messages in Theming app has not been shown after 100 seconds
    And I see that the header color is eventually "#0082C9"                    # ThemingAppContext::iSeeThatTheHeaderColorIsEventually()

acceptance-header

• tests/acceptance/features/header.feature:31

Show full log

  Scenario: users from other groups are not seen in the contacts menu when autocompletion is restricted within the same group # /drone/src/tests/acceptance/features/header.feature:31
    Given I am logged in as the admin                                                                                         # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I visit the settings page                                                                                             # SettingsMenuContext::iVisitTheSettingsPage()
    And I open the "Sharing" section of the "Administration" group                                                            # AppNavigationContext::iOpenTheSectionOf()
    And I enable restricting username autocompletion to groups                                                                # SettingsContext::iEnableRestrictingUsernameAutocompletionToGroups()
    And I see that username autocompletion is restricted to groups                                                            # SettingsContext::iSeeThatUsernameAutocompletionIsRestrictedToGroups()
    When I open the Contacts menu                                                                                             # ContactsMenuContext::iOpenTheContactsMenu()
    Then I see that the Contacts menu is shown                                                                                # ContactsMenuContext::iSeeThatTheContactsMenuIsShown()
    And I see that the contact "user0" in the Contacts menu is not shown                                                      # ContactsMenuContext::iSeeThatTheContactInTheContactsMenuIsNotShown()
      Failed asserting that true is false.
    And I see that the contact "admin" in the Contacts menu is not shown                                                      # ContactsMenuContext::iSeeThatTheContactInTheContactsMenuIsNotShown()

[rullzer]

🙈 sure

[ChristophWurst]

what if you use class-string<T>|string for now? would that work with our named aliases?

[MorrisJobke]

Implemented via #23377