Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolution

Browse Source
This commit is contained in:
wess
2023-04-18 10:08:54 -04:00
parent 10ed6af6e7
commit 2d39585db2
6 changed files with 108 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/collections.php
+10
View File
@@ -2953,6 +2953,7 @@ $collections = [
],
],
'indexes' => [
<<<<<<< HEAD
[
'$id' => ID::custom('_fulltext_name'),
'type' => Database::INDEX_FULLTEXT,
@@ -2960,6 +2961,15 @@ $collections = [
'lengths' => [],
'orders' => [Database::ORDER_ASC],
],
=======
// [
// '$id' => ID::custom('_fulltext_name'),
// 'type' => Database::INDEX_FULLTEXT,
// 'attributes' => ['name'],
// 'lengths' => [4096],
// 'orders' => [Database::ORDER_ASC],
// ],
>>>>>>> 26ac039ae (Testing mongo/db)
[
'$id' => ID::custom('_key_search'),
'type' => Database::INDEX_FULLTEXT,
composer.json
+6 -1
View File
@@ -43,7 +43,9 @@
"ext-sockets": "*",
"appwrite/php-clamav": "1.1.*",
"appwrite/php-runtimes": "0.11.*",
"utopia-php/abuse": "0.18.*",
"utopia-php/framework": "dev-master as 0.22.999999",
"utopia-php/logger": "0.3.*",
"utopia-php/abuse": "0.13.*",
"utopia-php/analytics": "0.2.*",
"utopia-php/audit": "0.20.*",
"utopia-php/cache": "0.8.*",
@@ -55,6 +57,9 @@
"utopia-php/preloader": "0.2.*",
"utopia-php/domains": "0.3.*",
"utopia-php/framework": "0.26.*",
"utopia-php/swoole": "dev-fix-utopia-framework-0-22 as 0.3.9999999",
"utopia-php/storage": "0.11.*",
"utopia-php/websocket": "0.1.0",
"utopia-php/image": "0.5.*",
"utopia-php/locale": "0.4.*",
"utopia-php/logger": "0.3.*",
composer.lock
Generated
+86
View File
@@ -4,7 +4,11 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
<<<<<<< HEAD
"content-hash": "6585f1a249e842abc698472ab942d9d8",
=======
"content-hash": "99144076bbefd0a40b38366abdcb616c",
>>>>>>> 26ac039ae (Testing mongo/db)
"packages": [
{
"name": "adhocore/jwt",
@@ -2226,6 +2230,7 @@
},
{
"name": "utopia-php/framework",
<<<<<<< HEAD
"version": "0.26.0",
"source": {
"type": "git",
@@ -2236,16 +2241,34 @@
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/framework/zipball/e8da5576370366d3bf9c574ec855f8c96fe4f34e",
"reference": "e8da5576370366d3bf9c574ec855f8c96fe4f34e",
=======
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/framework.git",
"reference": "9f35d36ed4b8fa1c92962c77ef02b49c2f5919df"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/framework/zipball/9f35d36ed4b8fa1c92962c77ef02b49c2f5919df",
"reference": "9f35d36ed4b8fa1c92962c77ef02b49c2f5919df",
>>>>>>> 26ac039ae (Testing mongo/db)
"shasum": ""
},
"require": {
"php": ">=8.0.0"
},
"require-dev": {
<<<<<<< HEAD
"laravel/pint": "^1.2",
"phpunit/phpunit": "^9.5.25",
"vimeo/psalm": "4.27.0"
=======
"phpunit/phpunit": "^9.5.25",
"vimeo/psalm": "^4.27.0"
>>>>>>> 26ac039ae (Testing mongo/db)
},
"default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
@@ -2264,9 +2287,15 @@
],
"support": {
"issues": "https://github.com/utopia-php/framework/issues",
<<<<<<< HEAD
"source": "https://github.com/utopia-php/framework/tree/0.26.0"
},
"time": "2023-01-13T08:14:43+00:00"
=======
"source": "https://github.com/utopia-php/framework/tree/0.22.1"
},
"time": "2022-10-07T14:51:40+00:00"
>>>>>>> 26ac039ae (Testing mongo/db)
},
{
"name": "utopia-php/image",
@@ -2747,6 +2776,7 @@
},
{
"name": "utopia-php/swoole",
<<<<<<< HEAD
"version": "0.5.0",
"source": {
"type": "git",
@@ -2757,6 +2787,18 @@
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/swoole/zipball/c2a3a4f944a2f22945af3cbcb95b13f0769628b1",
"reference": "c2a3a4f944a2f22945af3cbcb95b13f0769628b1",
=======
"version": "dev-fix-utopia-framework-0-22",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/swoole.git",
"reference": "79d291682876c5812135f65fc94ffeb970d41b1f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/swoole/zipball/79d291682876c5812135f65fc94ffeb970d41b1f",
"reference": "79d291682876c5812135f65fc94ffeb970d41b1f",
>>>>>>> 26ac039ae (Testing mongo/db)
"shasum": ""
},
"require": {
@@ -2792,9 +2834,15 @@
],
"support": {
"issues": "https://github.com/utopia-php/swoole/issues",
<<<<<<< HEAD
"source": "https://github.com/utopia-php/swoole/tree/0.5.0"
},
"time": "2022-10-19T22:19:07+00:00"
=======
"source": "https://github.com/utopia-php/swoole/tree/fix-utopia-framework-0-22"
},
"time": "2022-10-07T14:58:31+00:00"
>>>>>>> 26ac039ae (Testing mongo/db)
},
{
"name": "utopia-php/system",
@@ -5654,12 +5702,50 @@
"type": "tidelift"
}
],
<<<<<<< HEAD
"time": "2023-02-08T07:49:20+00:00"
=======
"time": "2022-09-28T08:42:51+00:00"
}
],
"aliases": [
{
"package": "mongodb/mongodb",
"version": "1.13.0.0",
"alias": "1.8.0",
"alias_normalized": "1.8.0.0"
},
{
"package": "utopia-php/database",
"version": "dev-fix-mongo-appwrite",
"alias": "0.25.999999",
"alias_normalized": "0.25.999999.0"
},
{
"package": "utopia-php/framework",
"version": "9999999-dev",
"alias": "0.22.999999",
"alias_normalized": "0.22.999999.0"
},
{
"package": "utopia-php/swoole",
"version": "dev-fix-utopia-framework-0-22",
"alias": "0.3.9999999",
"alias_normalized": "0.3.9999999.0"
>>>>>>> 26ac039ae (Testing mongo/db)
}
],
"aliases": [],
"minimum-stability": "stable",
<<<<<<< HEAD
"stability-flags": [],
=======
"stability-flags": {
"utopia-php/framework": 20,
"utopia-php/database": 20,
"utopia-php/swoole": 20
},
>>>>>>> 26ac039ae (Testing mongo/db)
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
docker-compose.yml
+1 -1
View File
@@ -624,7 +624,7 @@ services:
- ./src:/usr/src/code/src
depends_on:
- influxdb
- mariadb
- mongo
environment:
- _APP_ENV
- _APP_OPENSSL_KEY_V1
phpunit.xml
+1 -1
View File
@@ -6,7 +6,7 @@
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
stopOnFailure="true"
>
<extensions>
<extension class="Appwrite\Tests\TestHook" />
tests/e2e/Scopes/ProjectCustom.php
+4
View File
@@ -31,6 +31,10 @@ trait ProjectCustom
'teamId' => ID::unique(),
'name' => 'Demo Project Team',
]);
var_dump($team['headers']);
$this->assertEquals(201, $team['headers']['status-code']);
$this->assertEquals('Demo Project Team', $team['body']['name']);
$this->assertNotEmpty($team['body']['$id']);