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

[stable20] Use string for storing a OCM remote id #24654

Merged
merged 11 commits into from
Dec 14, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Dec 11, 2020

⚠️ This backport had conflicts and is incomplete ⚠️ Resolved

backport of #24247

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.

🐘

@juliusknorr juliusknorr force-pushed the backport/24247/stable20 branch from 48edba4 to f4529d8 Compare December 11, 2020 12:29
@juliusknorr
Copy link
Member

Pushed a psalm baseline update

@nickvergessen
Copy link
Member

NullArgument: Argument 1 of OCP\ICertificateManager::getAbsoluteBundlePath cannot be null, null value provided to parameter with type string

@juliusknorr
Copy link
Member

They don't seem related to this PR as they are reported on stable20 as well.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
… share_external

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
…registered yet

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr juliusknorr force-pushed the backport/24247/stable20 branch from f4529d8 to 5c0e8c6 Compare December 14, 2020 10:12
@faily-bot
Copy link

faily-bot bot commented Dec 14, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 440: failure

mariadb10.4-php7.3

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\OAuth2\Tests\Db\ClientMapperTest::testGetByIdentifier
Failed asserting that two objects are equal.
--- Expected
+++ Actual
@@ @@
     'redirectUri' => 'https://example.com/'
     'clientIdentifier' => 'MyAwesomeClientIdentifier'
     'secret' => 'TotallyNotSecret'
-    'id' => 0
+    'id' => 1
     '_updatedFields' => Array ()
     '_fieldTypes' => Array (...)
 )

/drone/src/apps/oauth2/tests/Db/ClientMapperTest.php:58

@rullzer rullzer merged commit 209d4c0 into stable20 Dec 14, 2020
@rullzer rullzer deleted the backport/24247/stable20 branch December 14, 2020 14:31
@rullzer rullzer mentioned this pull request Dec 14, 2020
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