fix: switch to VCS repos for query/async and simplify CI

Replace path repositories with VCS repos pointing to GitHub, removing
the need for separate checkout steps, sed rewrites, and Docker volume
mounts for query/async in all CI workflows and the Dockerfile.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: abnegate

.github/workflows/codeql-analysis.yml

@@ -11,34 +11,14 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 2
-          path: database
-
-      - name: Checkout query library
-        uses: actions/checkout@v4
-        with:
-          repository: utopia-php/query
-          ref: feat-builder
-          path: query
-
-      - name: Checkout async library
-        uses: actions/checkout@v4
-        with:
-          repository: utopia-php/async
-          path: async
 
       - run: git checkout HEAD^2
         if: github.event_name == 'pull_request'
-        working-directory: database
 
       - name: Run CodeQL
         run: |
-          docker run --rm -v $PWD/database:/app -v $PWD/query:/query -v $PWD/async:/async -w /app -e COMPOSER_MIRROR_PATH_REPOS=1 php:8.4-cli-alpine sh -c \
+          docker run --rm -v $PWD:/app -w /app php:8.4-cli-alpine sh -c \
           "php -r \"copy('https://getcomposer.org/installer', '/tmp/composer-setup.php');\" && \
            php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer && \
-           sed -i 's|\"url\": \"../query\"|\"url\": \"/query\"|' composer.json && \
-           sed -i 's|\"url\": \"../async\"|\"url\": \"/async\"|' composer.json && \
-           sed -i 's|\"symlink\": true|\"symlink\": false|' composer.json && \
-           sed -i 's|\"url\": \"../query\"|\"url\": \"/query\"|' composer.lock && \
-           sed -i 's|\"url\": \"../async\"|\"url\": \"/async\"|' composer.lock && \
            composer install --profile --ignore-platform-reqs && \
            composer check"

.github/workflows/linter.yml

@@ -11,34 +11,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 2
-          path: database
-
-      - name: Checkout query library
-        uses: actions/checkout@v4
-        with:
-          repository: utopia-php/query
-          ref: feat-builder
-          path: query
-
-      - name: Checkout async library
-        uses: actions/checkout@v4
-        with:
-          repository: utopia-php/async
-          path: async
 
       - run: git checkout HEAD^2
         if: github.event_name == 'pull_request'
-        working-directory: database
 
       - name: Run Linter
         run: |
-          docker run --rm -v $PWD/database:/app -v $PWD/query:/query -v $PWD/async:/async -w /app -e COMPOSER_MIRROR_PATH_REPOS=1 phpswoole/swoole:5.1.8-php8.3-alpine sh -c \
-          "sed -i 's|\"url\": \"../query\"|\"url\": \"/query\"|' composer.json && \
-           sed -i 's|\"url\": \"../async\"|\"url\": \"/async\"|' composer.json && \
-           sed -i 's|\"symlink\": true|\"symlink\": false|' composer.json && \
-           sed -i 's|\"url\": \"../query\"|\"url\": \"/query\"|' composer.lock && \
-           sed -i 's|\"url\": \"../async\"|\"url\": \"/async\"|' composer.lock && \
-           composer install --profile --ignore-platform-reqs && \
-           if [ -L vendor/utopia-php/query ]; then rm vendor/utopia-php/query && cp -r /query vendor/utopia-php/query; fi && \
-           if [ -L vendor/utopia-php/async ]; then rm vendor/utopia-php/async && cp -r /async vendor/utopia-php/async; fi && \
+          docker run --rm -v $PWD:/app -w /app phpswoole/swoole:5.1.8-php8.3-alpine sh -c \
+          "composer install --profile --ignore-platform-reqs && \
            composer lint"

.github/workflows/tests.yml

@@ -17,21 +17,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          path: database
-
-      - name: Checkout query library
-        uses: actions/checkout@v4
-        with:
-          repository: utopia-php/query
-          ref: feat-builder
-          path: query
-
-      - name: Checkout async library
-        uses: actions/checkout@v4
-        with:
-          repository: utopia-php/async
-          path: async
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -40,7 +25,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: database/Dockerfile
+          file: Dockerfile
           push: false
           tags: ${{ env.IMAGE }}
           load: true

Dockerfile

@@ -2,31 +2,16 @@ FROM composer:2.8 AS composer
 
 WORKDIR /usr/local/src/
 
-COPY database/composer.lock /usr/local/src/
-COPY database/composer.json /usr/local/src/
+COPY composer.lock /usr/local/src/
+COPY composer.json /usr/local/src/
 
-# Copy local dependencies (referenced as ../query and ../async in composer.json)
-COPY query /usr/local/query
-COPY async /usr/local/async
-
-# Rewrite path repositories to use copied locations
-RUN sed -i 's|"url": "../query"|"url": "/usr/local/query"|' /usr/local/src/composer.json \
- && sed -i 's|"url": "../async"|"url": "/usr/local/async"|' /usr/local/src/composer.json \
- && sed -i 's|"symlink": true|"symlink": false|' /usr/local/src/composer.json \
- && sed -i 's|"url": "../query"|"url": "/usr/local/query"|' /usr/local/src/composer.lock \
- && sed -i 's|"url": "../async"|"url": "/usr/local/async"|' /usr/local/src/composer.lock
-
-RUN COMPOSER_MIRROR_PATH_REPOS=1 composer install \
+RUN composer install \
     --ignore-platform-reqs \
     --optimize-autoloader \
     --no-plugins \
     --no-scripts \
     --prefer-dist
 
-# Replace symlink with actual copy (composer path repos may still symlink)
-RUN rm -rf /usr/local/src/vendor/utopia-php/query && \
-    cp -r /usr/local/query /usr/local/src/vendor/utopia-php/query
-
 FROM php:8.4.18-cli-alpine3.22 AS compile
 
 ENV PHP_REDIS_VERSION="6.3.0" \
@@ -120,17 +105,14 @@ RUN echo "opcache.enable_cli=1" >> $PHP_INI_DIR/php.ini
 RUN echo "memory_limit=1024M" >> $PHP_INI_DIR/php.ini
 
 COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor
-# Ensure local libs are copied (not symlinked) in vendor
-COPY query /usr/src/code/vendor/utopia-php/query
-COPY async /usr/src/code/vendor/utopia-php/async
 COPY --from=swoole /usr/local/lib/php/extensions/no-debug-non-zts-20240924/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20240924/
 COPY --from=redis /usr/local/lib/php/extensions/no-debug-non-zts-20240924/redis.so /usr/local/lib/php/extensions/no-debug-non-zts-20240924/
 COPY --from=pcov /usr/local/lib/php/extensions/no-debug-non-zts-20240924/pcov.so /usr/local/lib/php/extensions/no-debug-non-zts-20240924/
 COPY --from=xdebug /usr/local/lib/php/extensions/no-debug-non-zts-20240924/xdebug.so /usr/local/lib/php/extensions/no-debug-non-zts-20240924/
 
-COPY database/bin /usr/src/code/bin
-COPY database/src /usr/src/code/src
-COPY database/dev /usr/src/code/dev
+COPY bin /usr/src/code/bin
+COPY src /usr/src/code/src
+COPY dev /usr/src/code/dev
 
 # Add Debug Configs
 RUN if [ "$DEBUG" = "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi

composer.json

@@ -43,7 +43,7 @@
         "utopia-php/cache": "1.*",
         "utopia-php/pools": "1.*",
         "utopia-php/mongo": "1.*",
-        "utopia-php/query": "@dev",
+        "utopia-php/query": "dev-feat-builder",
         "utopia-php/async": "@dev"
     },
     "require-dev": {
@@ -64,18 +64,12 @@
     },
     "repositories": [
         {
-            "type": "path",
-            "url": "../query",
-            "options": {
-                "symlink": true
-            }
+            "type": "vcs",
+            "url": "https://github.com/utopia-php/query.git"
         },
         {
-            "type": "path",
-            "url": "../async",
-            "options": {
-                "symlink": true
-            }
+            "type": "vcs",
+            "url": "https://github.com/utopia-php/async.git"
         }
     ],
     "config": {

composer.lock

@@ -3,8 +3,8 @@ services:
     container_name: tests
     image: databases-dev
     build:
-      context: ..
-      dockerfile: database/Dockerfile
+      context: .
+      dockerfile: Dockerfile
       args:
         DEBUG: true
     networks:
@@ -54,8 +54,8 @@ services:
 
   postgres:
     build:
-      context: ..
-      dockerfile: database/postgres.dockerfile
+      context: .
+      dockerfile: postgres.dockerfile
       args:
         POSTGRES_VERSION: 16
     container_name: utopia-postgres
@@ -76,8 +76,8 @@ services:
 
   postgres-mirror:
     build:
-      context: ..
-      dockerfile: database/postgres.dockerfile
+      context: .
+      dockerfile: postgres.dockerfile
       args:
         POSTGRES_VERSION: 16
     container_name: utopia-postgres-mirror