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

Use autowiring where possible in server container #22202

Merged
merged 3 commits into from
Aug 13, 2020

Conversation

MorrisJobke
Copy link
Member

Basically removes the implicit wiring of dependencies where the automatic DI would also just work. The only real addition is the serverRoot alias that maps to OC::$SERVERROOT.

lib/private/Server.php Outdated Show resolved Hide resolved
lib/private/Server.php Outdated Show resolved Hide resolved
lib/private/Server.php Outdated Show resolved Hide resolved
@MorrisJobke
Copy link
Member Author

@ChristophWurst Thanks - resolved all of your comments.

@rullzer rullzer force-pushed the enh/noid/cleanup-servercontainer branch from 920027d to 8946402 Compare August 13, 2020 03:43
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good but didn't test.

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 13, 2020
@nextcloud nextcloud deleted a comment from faily-bot bot Aug 13, 2020
@MorrisJobke
Copy link
Member Author

I just added @deprecated PHPDoc comments above the aliases to better find them again in the future.

@faily-bot
Copy link

faily-bot bot commented Aug 13, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 31735: failure

mysql8.0-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_Sharing\Tests\SharedMountTest::testPermissionMovedGroupShare with data set #162 ('folder', 13, 1)
Failed asserting that false is true.

/drone/src/apps/files_sharing/tests/SharedMountTest.php:367

acceptance-app-files

  • tests/acceptance/features/app-files.feature:262
Show full log
  Scenario: unmarking a file as favorite causes the file list to be sorted again                          # /drone/src/tests/acceptance/features/app-files.feature:262
    Given I am logged in                                                                                  # LoginPageContext::iAmLoggedIn()
    And I create a new folder named "A name alphabetically lower than welcome.txt"                        # FileListContext::iCreateANewFolderNamed()
    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()
    And I close the details view                                                                          # FilesAppContext::iCloseTheDetailsView()
    And I see that the details view is closed                                                             # FilesAppContext::iSeeThatTheDetailsViewIsClosed()
    And I mark "welcome.txt" as favorite                                                                  # FileListContext::iMarkAsFavorite()
    And I see that "welcome.txt" is marked as favorite                                                    # FileListContext::iSeeThatIsMarkedAsFavorite()
    And I see that "welcome.txt" precedes "A name alphabetically lower than welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()
    When I unmark "welcome.txt" as favorite                                                               # FileListContext::iUnmarkAsFavorite()
    Then I see that "welcome.txt" is not marked as favorite                                               # FileListContext::iSeeThatIsNotMarkedAsFavorite()
      Not favorited state icon for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)
    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()

@MorrisJobke MorrisJobke merged commit 0b85632 into master Aug 13, 2020
@MorrisJobke MorrisJobke deleted the enh/noid/cleanup-servercontainer branch August 13, 2020 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish technical debt
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants