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

merge conficts

Browse Source
This commit is contained in:
Chirag Aggarwal
2026-03-19 22:15:31 +05:30
parent 8d925f3670
commit 4224f6ea5a
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+25 -9
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": "1404c8821e43b3fe92e06a8ed658ed26",
"content-hash": "5b7f63ff3136da1b7db44c6e5f8da030",
"packages": [
{
"name": "adhocore/jwt",
@@ -5478,16 +5478,16 @@
"packages-dev": [
{
"name": "appwrite/sdk-generator",
"version": "1.11.10",
"version": "1.11.11",
"source": {
"type": "git",
"url": "https://github.com/appwrite/sdk-generator.git",
"reference": "96e6b79a241fc615627a820107ca64bbd1b550a6"
"reference": "cfc37c85161a5515af4cd2f9885a811f51a2483a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/96e6b79a241fc615627a820107ca64bbd1b550a6",
"reference": "96e6b79a241fc615627a820107ca64bbd1b550a6",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/cfc37c85161a5515af4cd2f9885a811f51a2483a",
"reference": "cfc37c85161a5515af4cd2f9885a811f51a2483a",
"shasum": ""
},
"require": {
@@ -5523,9 +5523,9 @@
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
"support": {
"issues": "https://github.com/appwrite/sdk-generator/issues",
"source": "https://github.com/appwrite/sdk-generator/tree/1.11.10"
"source": "https://github.com/appwrite/sdk-generator/tree/1.11.11"
},
"time": "2026-03-19T05:27:36+00:00"
"time": "2026-03-19T16:21:03+00:00"
},
{
"name": "brianium/paratest",
@@ -8472,9 +8472,25 @@
"time": "2024-11-07T12:36:22+00:00"
}
],
"aliases": [],
"aliases": [
{
"package": "utopia-php/framework",
"version": "dev-feat/swoole-adapters-and-compression",
"alias": "0.34.15",
"alias_normalized": "0.34.15.0"
},
{
"package": "utopia-php/queue",
"version": "dev-feat/di-container-refactor",
"alias": "0.16.0",
"alias_normalized": "0.16.0.0"
}
],
"minimum-stability": "dev",
"stability-flags": {},
"stability-flags": {
"utopia-php/framework": 20,
"utopia-php/queue": 20
},
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
tests/e2e/Services/Functions/junit.xml
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuites>
<testsuite name="Tests\E2E\Services\Functions\FunctionsCustomServerTest" file="/usr/src/code/tests/e2e/Services/Functions/FunctionsCustomServerTest.php" tests="1" assertions="66" errors="0" failures="0" skipped="0" time="9.181782">
<testcase name="testScopes" class="Tests\E2E\Services\Functions\FunctionsCustomServerTest" classname="Tests.E2E.Services.Functions.FunctionsCustomServerTest" file="/usr/src/code/tests/e2e/Services/Functions/FunctionsCustomServerTest.php" line="2016" assertions="66" time="9.181782"/>
</testsuite>
</testsuites>