Skip to content

[3rdparty] Doctrine: Fix unquoted stmt fragments backslash escaping - #22252

Merged
rullzer merged 1 commit into
stable19from
update-3rdparty/stable19
Aug 18, 2020
Merged

[3rdparty] Doctrine: Fix unquoted stmt fragments backslash escaping#22252
rullzer merged 1 commit into
stable19from
update-3rdparty/stable19

Conversation

@MorrisJobke

@MorrisJobkeMorrisJobke commented Aug 14, 2020

Copy link
Copy Markdown
Member

Needed for #22118 - already in master because there doctrine/dbal:2.10.2 is used

Then #22118 properly works.

How to test:

php occ group:add test
php occ user:add test1 --display-name abc --group test
curl 'http://SERVER/ocs/v2.php/cloud/groups/test/users/details?offset=0&limit=25&search=abc' -u admin:password -H "OCS-APIRequest: true"

The curl should return the proper result. Before it returned an empty set:

Before:

<?xml version="1.0"?>
<ocs>
<meta>
<status>ok</status>
<statuscode>200</statuscode>
<message>OK</message>
</meta>
<data>
<users/>
</data>
</ocs>

After:

<?xml version="1.0"?>
<ocs>
<meta>
<status>ok</status>
<statuscode>200</statuscode>
<message>OK</message>
</meta>
<data>
<users>
<test1>
<enabled>1</enabled>
<storageLocation>/Users/morris/Projects/nextcloud/server/data/test1</storageLocation>
<id>test1</id>
<lastLogin>0</lastLogin>
<backend>Database</backend>
<subadmin/>
<quota>
<quota>none</quota>
<used>0</used>
</quota>
<email/>
<displayname>abc</displayname>
<phone></phone>
<address></address>
<website></website>
<twitter></twitter>
<groups>
<element>test</element>
</groups>
<language>en</language>
<locale></locale>
<backendCapabilities>
<setDisplayName>1</setDisplayName>
<setPassword>1</setPassword>
</backendCapabilities>
</test1>
</users>
</data>
</ocs>

@blizzzblizzz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

🐘

Needed for #22118 - already in master because there doctrine/dbal:2.10.2 is used
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

Ready for review :)

@nextcloudnextcloud deleted a comment from faily-botBotAug 17, 2020
@faily-bot

faily-botBot commented Aug 17, 2020

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 31879: failure

mysql8.0-php7.2

Show full log
There was 1 failure:
1) OCA\Files_Sharing\Tests\SharedMountTest::testPermissionMovedGroupShare with data set #164 ('folder', 13, 5)
Failed asserting that false is true.
/drone/src/apps/files_sharing/tests/SharedMountTest.php:366

@rullzerrullzer mentioned this pull request Aug 18, 2020
1 task
@rullzer
rullzer merged commit 1bd36d0 into stable19Aug 18, 2020
@rullzer
rullzer deleted the update-3rdparty/stable19 branch August 18, 2020 08:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@MorrisJobke@nickvergessen@blizzz@rullzer