Merge pull request #919 from utopia-php/upgrade-php-8.5-validators-0.3

Upgrade PHP to 8.5 and validators to 0.3.*

Author: Meldiron

Dockerfile

@@ -12,12 +12,12 @@ RUN composer install \
     --no-scripts \
     --prefer-dist
 
-FROM php:8.4.18-cli-alpine3.22 AS compile
+FROM php:8.5.8-cli-alpine AS compile
 
 ENV PHP_REDIS_VERSION="6.3.0" \
-    PHP_SWOOLE_VERSION="v6.1.6" \
-    PHP_XDEBUG_VERSION="3.4.2" \
-    PHP_MONGODB_VERSION="2.1.1"
+    PHP_SWOOLE_VERSION="v6.2.2" \
+    PHP_XDEBUG_VERSION="3.5.3" \
+    PHP_MONGODB_VERSION="2.3.3"
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apk update && apk add --no-cache \
@@ -29,22 +29,23 @@ RUN apk update && apk add --no-cache \
     gcc \
     g++ \
     git \
+    file \
+    openssl-dev \
     brotli-dev \
     linux-headers \
     docker-cli \
     docker-cli-compose \
- && (pecl install mongodb-$PHP_MONGODB_VERSION \
-    || (git clone --depth 1 --branch $PHP_MONGODB_VERSION --recurse-submodules https://github.com/mongodb/mongo-php-driver.git /tmp/mongodb \
-      && cd /tmp/mongodb \
-      && git submodule update --init --recursive \
-      && phpize \
-      && ./configure \
-      && make \
-      && make install \
-      && cd / \
-      && rm -rf /tmp/mongodb)) \
+ && git clone --depth 1 --branch $PHP_MONGODB_VERSION --recurse-submodules https://github.com/mongodb/mongo-php-driver.git /tmp/mongodb \
+ && cd /tmp/mongodb \
+ && git submodule update --init --recursive \
+ && phpize \
+ && ./configure \
+ && make -j$(nproc) \
+ && cp "$(find . -name mongodb.so -print -quit)" "$(php-config --extension-dir)/" \
+ && cd / \
+ && rm -rf /tmp/mongodb \
  && docker-php-ext-enable mongodb \
- && docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \
+ && docker-php-ext-install pgsql pdo_mysql pdo_pgsql \
  && apk del libpq-dev \
  && rm -rf /var/cache/apk/*
 
@@ -55,7 +56,9 @@ RUN \
   && cd phpredis \
   && phpize \
   && ./configure \
-  && make && make install
+  && make && make install \
+  && mkdir -p /ext \
+  && cp $(php-config --extension-dir)/redis.so /ext/redis.so
 
 ## Swoole Extension
 FROM compile AS swoole
@@ -64,7 +67,9 @@ RUN \
   && cd swoole-src \
   && phpize \
   && ./configure --enable-http2 \
-  && make && make install
+  && make && make install \
+  && mkdir -p /ext \
+  && cp $(php-config --extension-dir)/swoole.so /ext/swoole.so
 
 ## PCOV Extension
 FROM compile AS pcov
@@ -73,7 +78,9 @@ RUN \
    && cd pcov \
    && phpize \
    && ./configure --enable-pcov \
-   && make && make install
+   && make && make install \
+   && mkdir -p /ext \
+   && cp $(php-config --extension-dir)/pcov.so /ext/pcov.so
 
 ## XDebug Extension
 FROM compile AS xdebug
@@ -82,7 +89,9 @@ RUN \
   cd xdebug && \
   phpize && \
   ./configure && \
-  make && make install
+  make && make install \
+  && mkdir -p /ext \
+  && cp $(php-config --extension-dir)/xdebug.so /ext/xdebug.so
 
 FROM compile AS final
 
@@ -93,6 +102,16 @@ ENV DEBUG=$DEBUG
 
 WORKDIR /usr/src/code
 
+COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor
+COPY --from=swoole /ext/swoole.so /ext/swoole.so
+COPY --from=redis /ext/redis.so /ext/redis.so
+COPY --from=pcov /ext/pcov.so /ext/pcov.so
+COPY --from=xdebug /ext/xdebug.so /ext/xdebug.so
+
+RUN EXT_DIR=$(php-config --extension-dir) \
+  && mkdir -p $EXT_DIR \
+  && cp /ext/*.so $EXT_DIR/
+
 RUN echo extension=redis.so >> /usr/local/etc/php/conf.d/redis.ini
 RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini
 RUN echo extension=pcov.so >> /usr/local/etc/php/conf.d/pcov.ini
@@ -104,12 +123,6 @@ 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
-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 ./bin /usr/src/code/bin
 COPY ./src /usr/src/code/src
 COPY ./dev /usr/src/code/dev
@@ -118,6 +131,6 @@ COPY ./dev /usr/src/code/dev
 RUN if [ "$DEBUG" = "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi
 RUN if [ "$DEBUG" = "true" ]; then mkdir -p /tmp/xdebug; fi
 RUN if [ "$DEBUG" = "false" ]; then rm -rf /usr/src/code/dev; fi
-RUN if [ "$DEBUG" = "false" ]; then rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20240924/xdebug.so; fi
+RUN if [ "$DEBUG" = "false" ]; then rm -f $(php-config --extension-dir)/xdebug.so; fi
 
 CMD [ "tail", "-f", "/dev/null" ]

composer.json

@@ -33,12 +33,12 @@
         "coverage": "./vendor/bin/coverage-check ./tmp/clover.xml 90"
     },
     "require": {
-        "php": ">=8.4",
+        "php": ">=8.5",
         "ext-pdo": "*",
         "ext-mongodb": "*",
         "ext-mbstring": "*",
         "ext-redis": "*",
-        "utopia-php/validators": "0.2.*",
+        "utopia-php/validators": "0.3.*",
         "utopia-php/console": "0.1.*",
         "utopia-php/cache": "^3.1.0",
         "utopia-php/pools": "1.*",