Merge pull request #1810 from appwrite/renovate/sdk-template-dependencies

chore(deps): update dependency mockery/mockery to v1.6.14

Author: ChiragAgg5k

.github/workflows/ci.yml

@@ -64,6 +64,10 @@ jobs:
 
       - name: Docker Setup Buildx
         uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
+        with:
+          # docker-container driver isolates the mock-server build and flakes
+          # when many matrix jobs hit Packagist/GitHub at once.
+          driver: docker
 
       - name: Setup PHP with PECL extension
         uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2

mock-server/Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2.10 as composer
+FROM composer:2.10 AS composer
 
 LABEL maintainer="team@appwrite.io"
 
@@ -10,11 +10,19 @@ WORKDIR /usr/local/src/
 COPY composer.lock /usr/local/src/
 COPY composer.json /usr/local/src/
 
-RUN composer install --ignore-platform-reqs --optimize-autoloader \
-    --no-plugins --no-scripts --prefer-dist \
-    `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
-
-FROM phpswoole/swoole:5.1.8-php8.3-alpine as final
+RUN set -eu; \
+    extra=""; \
+    if [ "${TESTING}" != "true" ]; then extra="--no-dev"; fi; \
+    n=0; \
+    until composer install --ignore-platform-reqs --optimize-autoloader \
+        --no-plugins --no-scripts --prefer-dist --no-interaction ${extra}; do \
+        n=$((n + 1)); \
+        if [ "${n}" -ge 5 ]; then exit 1; fi; \
+        echo "composer install failed, retrying ${n}/5..."; \
+        sleep $((n * 5)); \
+    done
+
+FROM phpswoole/swoole:5.1.8-php8.3-alpine AS final
 
 RUN apk add docker
 

templates/php/composer.json.twig

@@ -26,7 +26,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^12",
-        "mockery/mockery": "1.6.13"
+        "mockery/mockery": "1.6.14"
     },
     "prefer-stable": true,
     "minimum-stability": "dev"

tests/e2e/Base.php

@@ -5,6 +5,7 @@
 namespace Tests\E2E;
 
 use Exception;
+use Override;
 use RecursiveIteratorIterator;
 use RecursiveDirectoryIterator;
 use FilesystemIterator;
@@ -423,22 +424,33 @@ abstract class Base extends TestCase
     protected string $sdkLanguage;
     protected string $version;
 
+    #[Override]
     public function setUp(): void
     {
         \array_unshift($this->expectedOutput, $this->getExpectedSdkHeaders());
 
-        \exec('
-            cd ./mock-server && \
-            docker compose build && \
-            docker compose up -d --force-recreate
-        ');
+        $output = [];
+        $status = 0;
+
+        \exec(
+            'cd ./mock-server && docker compose build && docker compose up -d --force-recreate 2>&1',
+            $output,
+            $status
+        );
+
+        if ($status !== 0) {
+            $this->fail(
+                "Failed to start mock-server (exit {$status}):\n" . \implode("\n", $output)
+            );
+        }
     }
 
     protected function getExpectedSdkHeaders(): string
     {
         return "x-sdk-name: {$this->sdkName}; x-sdk-platform: {$this->sdkPlatform}; x-sdk-language: {$this->sdkLanguage}; x-sdk-version: {$this->version}";
     }
 
+    #[Override]
     public function tearDown(): void
     {
         // Remove the mock server so local test runs don't leave containers behind