1
0
Fork 0
mirror of synced 2024-06-29 11:40:45 +12:00

Merge branch 'feat-database-indexing' of https://github.com/appwrite/appwrite into feat-db-refactor-enable-strict-query-matching

This commit is contained in:
Torsten Dittmann 2021-11-24 17:18:18 +01:00
commit 59437b1ca8
4 changed files with 12 additions and 12 deletions

View file

@ -45,7 +45,7 @@
"utopia-php/cache": "0.4.*",
"utopia-php/cli": "0.11.*",
"utopia-php/config": "0.2.*",
"utopia-php/database": "0.11.*",
"utopia-php/database": "0.12.*",
"utopia-php/locale": "0.4.*",
"utopia-php/orchestration": "0.2.*",
"utopia-php/registry": "0.5.*",

14
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "8427bbf013694d9771cd09341a81562e",
"content-hash": "7e24a95bc534ed39b042f19b27268de9",
"packages": [
{
"name": "adhocore/jwt",
@ -2138,16 +2138,16 @@
},
{
"name": "utopia-php/database",
"version": "0.11.0",
"version": "0.12.0",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/database.git",
"reference": "5fc0476d05567d1a156b00e17033f32148c93a38"
"reference": "102ee1d21fd55fc92dc7a07b60672a98ae49be26"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/database/zipball/5fc0476d05567d1a156b00e17033f32148c93a38",
"reference": "5fc0476d05567d1a156b00e17033f32148c93a38",
"url": "https://api.github.com/repos/utopia-php/database/zipball/102ee1d21fd55fc92dc7a07b60672a98ae49be26",
"reference": "102ee1d21fd55fc92dc7a07b60672a98ae49be26",
"shasum": ""
},
"require": {
@ -2195,9 +2195,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/database/issues",
"source": "https://github.com/utopia-php/database/tree/0.11.0"
"source": "https://github.com/utopia-php/database/tree/0.12.0"
},
"time": "2021-11-17T09:53:02+00:00"
"time": "2021-11-24T14:53:22+00:00"
},
{
"name": "utopia-php/domains",

View file

@ -73,8 +73,8 @@ trait TeamsBaseClient
$this->assertEquals('Invitation to '.$teamName.' Team at '.$this->getProject()['name'], $lastEmail['subject']);
$secret = substr($lastEmail['text'], strpos($lastEmail['text'], '&secret=', 0) + 8, 256);
$membershipUid = substr($lastEmail['text'], strpos($lastEmail['text'], '?membershipId=', 0) + 14, 13);
$userUid = substr($lastEmail['text'], strpos($lastEmail['text'], '&userId=', 0) + 8, 13);
$membershipUid = substr($lastEmail['text'], strpos($lastEmail['text'], '?membershipId=', 0) + 14, 20);
$userUid = substr($lastEmail['text'], strpos($lastEmail['text'], '&userId=', 0) + 8, 20);
/**
* Test for FAILURE

View file

@ -534,8 +534,8 @@ trait WebhooksBase
$lastEmail = $this->getLastEmail();
$secret = substr($lastEmail['text'], strpos($lastEmail['text'], '&secret=', 0) + 8, 256);
$membershipUid = substr($lastEmail['text'], strpos($lastEmail['text'], '?membershipId=', 0) + 14, 13);
$userUid = substr($lastEmail['text'], strpos($lastEmail['text'], '&userId=', 0) + 8, 13);
$membershipUid = substr($lastEmail['text'], strpos($lastEmail['text'], '?membershipId=', 0) + 14, 20);
$userUid = substr($lastEmail['text'], strpos($lastEmail['text'], '&userId=', 0) + 8, 20);
$webhook = $this->getLastRequest();