Эх сурвалжийг харах

[webman] Update to PHP 8 (#6206)

with JIT
Joan Miquel 4 жил өмнө
parent
commit
e215ea00ef

+ 2 - 2
frameworks/PHP/webman/app/controller/Index.php

@@ -64,7 +64,7 @@ class Index
         $statement = Db::$statement;
 
         $query_count = 1;
-        if ($q > 1) {
+        if ((int) $q > 1) {
             $query_count = \min($q, 500);
         }
 
@@ -86,7 +86,7 @@ class Index
         $update = Db::$update;
 
         $query_count = 1;
-        if ($q > 1) {
+        if ((int) $q > 1) {
             $query_count = \min($q, 500);
         }
 

+ 3 - 0
frameworks/PHP/webman/php.ini

@@ -8,3 +8,6 @@ opcache.huge_code_pages=1
 mysqlnd.collect_statistics = Off
 
 memory_limit = 512M
+
+opcache.jit_buffer_size=128M
+opcache.jit=tracing

+ 5 - 6
frameworks/PHP/webman/webman.dockerfile

@@ -1,23 +1,22 @@
-FROM ubuntu:20.04
+FROM ubuntu:20.10
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq php7.4 php7.4-common php7.4-cli php7.4-pgsql php7.4-xml > /dev/null
+    apt-get install -yqq php8.0-cli php8.0-pgsql php8.0-xml > /dev/null
 
 RUN apt-get install -yqq composer > /dev/null
 
-RUN apt-get install -y php-pear php-dev libevent-dev > /dev/null
-RUN printf "\n\n /usr/lib/x86_64-linux-gnu/\n\n\nno\n\n\n" | pecl install event > /dev/null && echo "extension=event.so" > /etc/php/7.4/cli/conf.d/event.ini
+RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
+RUN pecl install event-3.0.2 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini
 
-COPY php.ini /etc/php/7.4/cli/php.ini
+COPY php.ini /etc/php/8.0/cli/php.ini
 
 ADD ./ /webman
 WORKDIR /webman
 
-
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 
 CMD php /webman/start.php start