CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-26 18:20:43 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch '0.7.x' of github.com:appwrite/appwrite into swoole-and-functions

Browse source
This commit is contained in:
Eldad Fux 2020-08-26 20:42:45 +03:00
parent 856aa275a4 8c045db070
commit 565deca719
3 changed files with 93 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/api/database.php
View file

@ -408,6 +408,7 @@ App::post('/v1/database/collections/:collectionId/documents')
->setAttribute($parentProperty, $data, $parentPropertyType);
$data = $parentDocument->getArrayCopy();
$collection = $projectDB->getDocument($parentDocument->getCollection(), false);
}
/**

2
composer.json
View file

@ -33,7 +33,7 @@
"appwrite/php-clamav": "1.0.*",
"utopia-php/framework": "0.8.4",
"utopia-php/framework": "0.9.0",
"utopia-php/abuse": "0.2.*",
"utopia-php/audit": "0.3.*",
"utopia-php/cache": "0.2.*",

121
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": "fa5ca1bd60c2ebb41f76803af55744a8",
"content-hash": "c0550b37e526b97fc0fe0b8ff3025350",
"packages": [
{
"name": "appwrite/php-clamav",
@ -146,12 +146,12 @@
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
"reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd"
"reference": "8a7ecad675253e4654ea05505233285377405215"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd",
"reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/8a7ecad675253e4654ea05505233285377405215",
"reference": "8a7ecad675253e4654ea05505233285377405215",
"shasum": ""
},
"require": {
@ -194,7 +194,21 @@
"ssl",
"tls"
],
"time": "2020-04-08T08:27:21+00:00"
"funding": [
{
"url": "https://packagist.com",
"type": "custom"
},
{
"url": "https://github.com/composer",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/composer/composer",
"type": "tidelift"
}
],
"time": "2020-08-23T12:54:47+00:00"
},
{
"name": "dasprid/enum",
@ -452,6 +466,28 @@
"rest",
"web service"
],
"funding": [
{
"url": "https://github.com/GrahamCampbell",
"type": "github"
},
{
"url": "https://github.com/Nyholm",
"type": "github"
},
{
"url": "https://github.com/alexeyshockov",
"type": "github"
},
{
"url": "https://github.com/gmponos",
"type": "github"
},
{
"url": "https://github.com/sagikazarmark",
"type": "github"
}
],
"time": "2020-07-02T06:52:04+00:00"
},
{
@ -895,6 +931,12 @@
}
],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
"funding": [
{
"url": "https://github.com/synchro",
"type": "github"
}
],
"time": "2020-05-27T12:24:03+00:00"
},
{
@ -1771,16 +1813,16 @@
},
{
"name": "utopia-php/framework",
"version": "0.8.4",
"version": "0.9.0",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/framework.git",
"reference": "c5add2ac2cd31286bb086f19dd66cfaed00f9a85"
"reference": "2d40a89b6d5d6a9c08423bff1dcebe1809b0efc7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/framework/zipball/c5add2ac2cd31286bb086f19dd66cfaed00f9a85",
"reference": "c5add2ac2cd31286bb086f19dd66cfaed00f9a85",
"url": "https://api.github.com/repos/utopia-php/framework/zipball/2d40a89b6d5d6a9c08423bff1dcebe1809b0efc7",
"reference": "2d40a89b6d5d6a9c08423bff1dcebe1809b0efc7",
"shasum": ""
},
"require": {
@ -1811,7 +1853,7 @@
"php",
"upf"
],
"time": "2020-08-06T10:52:23+00:00"
"time": "2020-08-26T17:18:23+00:00"
},
{
"name": "utopia-php/locale",
@ -2012,7 +2054,7 @@
"source": {
"type": "git",
"url": "https://github.com/appwrite/sdk-generator",
"reference": "43d15fc337bcbfe480f2a5503bd7c0615743035b"
"reference": "95e29472f8416eb8ce6a83f6b5af9c139ec73ea2"
},
"require": {
"ext-curl": "*",
@ -2042,7 +2084,7 @@
}
],
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
"time": "2020-07-26T09:32:03+00:00"
"time": "2020-08-17T18:12:07+00:00"
},
{
"name": "doctrine/instantiator",
@ -2098,6 +2140,20 @@
"constructor",
"instantiate"
],
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
"type": "custom"
},
{
"url": "https://www.patreon.com/phpdoctrine",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
"type": "tidelift"
}
],
"time": "2020-06-15T18:51:04+00:00"
},
{
@ -2255,6 +2311,12 @@
"object",
"object graph"
],
"funding": [
{
"url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
"type": "tidelift"
}
],
"time": "2020-06-29T13:22:24+00:00"
},
{
@ -2414,12 +2476,12 @@
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "f3ab30788f7d3e90c065c70a1658a464b8beff91"
"reference": "13d9a6bb0b5bbb89d085c7d557c4b55499128eb9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f3ab30788f7d3e90c065c70a1658a464b8beff91",
"reference": "f3ab30788f7d3e90c065c70a1658a464b8beff91",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/13d9a6bb0b5bbb89d085c7d557c4b55499128eb9",
"reference": "13d9a6bb0b5bbb89d085c7d557c4b55499128eb9",
"shasum": ""
},
"require": {
@ -2458,34 +2520,33 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2020-08-15T12:16:28+00:00"
"time": "2020-08-22T07:19:02+00:00"
},
{
"name": "phpdocumentor/type-resolver",
"version": "dev-master",
"version": "1.x-dev",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "94f3ddc5d77e49daadadd33b798b933e52dde82c"
"reference": "e878a14a65245fbe78f8080eba03b47c3b705651"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/94f3ddc5d77e49daadadd33b798b933e52dde82c",
"reference": "94f3ddc5d77e49daadadd33b798b933e52dde82c",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651",
"reference": "e878a14a65245fbe78f8080eba03b47c3b705651",
"shasum": ""
},
"require": {
"php": "^7.2",
"php": "^7.2 || ^8.0",
"phpdocumentor/reflection-common": "^2.0"
},
"require-dev": {
"ext-tokenizer": "^7.2",
"mockery/mockery": "~1"
"ext-tokenizer": "*"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
"dev-1.x": "1.x-dev"
}
},
"autoload": {
@ -2504,7 +2565,7 @@
}
],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"time": "2020-06-19T19:40:27+00:00"
"time": "2020-06-27T10:12:23+00:00"
},
{
"name": "phpspec/prophecy",
@ -3711,12 +3772,12 @@
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "b531196d8cfaa485d7ff84d37b19668d8d6b254b"
"reference": "b48bd18dc6f967ad09af9eab521cdf0e68fb6a95"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/b531196d8cfaa485d7ff84d37b19668d8d6b254b",
"reference": "b531196d8cfaa485d7ff84d37b19668d8d6b254b",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/b48bd18dc6f967ad09af9eab521cdf0e68fb6a95",
"reference": "b48bd18dc6f967ad09af9eab521cdf0e68fb6a95",
"shasum": ""
},
"require": {
@ -3731,7 +3792,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.13-dev"
"dev-master": "2.14-dev"
}
},
"autoload": {
@ -3778,7 +3839,7 @@
"type": "tidelift"
}
],
"time": "2020-08-13T14:11:59+00:00"
"time": "2020-08-23T15:56:05+00:00"
},
{
"name": "webmozart/assert",