From 4224f6ea5af9b8269c9c4cc5bf108ae6b4875805 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Thu, 19 Mar 2026 21:36:06 +0530
Subject: [PATCH] merge conficts

---
 composer.lock                          | 34 +++++++++++++++++++-------
 tests/e2e/Services/Functions/junit.xml |  6 -----
 2 files changed, 25 insertions(+), 15 deletions(-)
 delete mode 100644 tests/e2e/Services/Functions/junit.xml

diff --git a/composer.lock b/composer.lock
index 48d51284a2..6650626e94 100644
--- a/composer.lock
+++ b/composer.lock
@@ -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": {
diff --git a/tests/e2e/Services/Functions/junit.xml b/tests/e2e/Services/Functions/junit.xml
deleted file mode 100644
index 7c1b11a7f2..0000000000
--- a/tests/e2e/Services/Functions/junit.xml
+++ /dev/null
@@ -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>