Browse Source

[php] Slim update to Adapterman 0.6 and PHP 8.2 (#8025)

* Slim update to Adapterman 0.6

* Slim update to PHP 8.2

* Fix duplicate

* Pin Adapterman version
Joan Miquel 2 years ago
parent
commit
aae1d2681c

+ 1 - 1
frameworks/PHP/slim/deploy/conf/cli-php.ini

@@ -13,4 +13,4 @@ memory_limit = 512M
 opcache.jit_buffer_size = 128M
 opcache.jit_buffer_size = 128M
 opcache.jit = tracing
 opcache.jit = tracing
 
 
-disable_functions=header,header_remove,http_response_code,setcookie,session_create_id,session_id,session_name,session_save_path,session_status,session_start,session_write_close,session_regenerate_id,set_time_limit
+disable_functions=header,header_remove,headers_sent,http_response_code,setcookie,session_create_id,session_id,session_name,session_save_path,session_status,session_start,session_write_close,session_regenerate_id,set_time_limit

+ 2 - 2
frameworks/PHP/slim/server.php

@@ -12,13 +12,13 @@ $http_worker                = new Worker('http://0.0.0.0:8080');
 $http_worker->count         = (int) shell_exec('nproc') * 4;
 $http_worker->count         = (int) shell_exec('nproc') * 4;
 $http_worker->name          = 'AdapterMan-Slim';
 $http_worker->name          = 'AdapterMan-Slim';
 
 
-$http_worker->onWorkerStart = function () {
+$http_worker->onWorkerStart = static function () {
     HeaderDate::init();
     HeaderDate::init();
     //init();
     //init();
     require __DIR__.'/index.php';
     require __DIR__.'/index.php';
 };
 };
 
 
-$http_worker->onMessage = static function ($connection, $request) {
+$http_worker->onMessage = static function ($connection) {
 
 
     $connection->send(run());
     $connection->send(run());
 };
 };

+ 7 - 6
frameworks/PHP/slim/slim-workerman-pgsql.dockerfile

@@ -4,17 +4,18 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 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 > /dev/null && \
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
-    apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
+    apt-get update -yqq > /dev/null
+RUN apt-get upgrade -yqq > /dev/null
 
 
 RUN apt-get install -yqq git \
 RUN apt-get install -yqq git \
-    php8.1-cli php8.1-pgsql php8.1-mbstring php8.1-xml php8.1-curl > /dev/null
+    php8.2-cli php8.2-pgsql php8.2-mbstring php8.2-xml php8.2-curl > /dev/null
 
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 
-RUN apt-get install -y php-pear php8.1-dev libevent-dev > /dev/null
-RUN pecl install event-3.0.8 > /dev/null && echo "extension=event.so" > /etc/php/8.1/cli/conf.d/event.ini
+RUN apt-get install -y php-pear php8.2-dev libevent-dev > /dev/null
+RUN pecl install event-3.0.8 > /dev/null && echo "extension=event.so" > /etc/php/8.2/cli/conf.d/event.ini
 
 
-COPY deploy/conf/cli-php.ini /etc/php/8.1/cli/php.ini
+COPY deploy/conf/cli-php.ini /etc/php/8.2/cli/php.ini
 
 
 ADD ./ /slim
 ADD ./ /slim
 WORKDIR /slim
 WORKDIR /slim
@@ -22,7 +23,7 @@ WORKDIR /slim
 EXPOSE 8080
 EXPOSE 8080
 
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
-RUN composer require joanhey/adapterman
+RUN composer require joanhey/adapterman:^0.6 --quiet
 
 
 RUN sed -i 's|/index.php|/start.php|g' server.php
 RUN sed -i 's|/index.php|/start.php|g' server.php
 
 

+ 7 - 7
frameworks/PHP/slim/slim-workerman.dockerfile

@@ -6,23 +6,23 @@ RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /de
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 
-RUN apt-get install -yqq git \
-    php8.1-cli php8.1-mysql php8.1-mbstring php8.1-xml php8.1-curl > /dev/null
+RUN apt-get update -yqq > /dev/null && apt-get install -yqq git \
+    php8.2-cli php8.2-mysql php8.2-mbstring php8.2-xml php8.2-curl > /dev/null
 
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 
-RUN apt-get install -y php-pear php8.1-dev libevent-dev > /dev/null
-RUN pecl install event-3.0.8 > /dev/null && echo "extension=event.so" > /etc/php/8.1/cli/conf.d/event.ini
+RUN apt-get install -y php-pear php8.2-dev libevent-dev > /dev/null
+RUN pecl install event-3.0.8 > /dev/null && echo "extension=event.so" > /etc/php/8.2/cli/conf.d/event.ini
 
 
-COPY deploy/conf/cli-php.ini /etc/php/8.1/cli/php.ini
+COPY deploy/conf/cli-php.ini /etc/php/8.2/cli/php.ini
 
 
 ADD ./ /slim
 ADD ./ /slim
 WORKDIR /slim
 WORKDIR /slim
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
-RUN composer require joanhey/adapterman
+RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet 
+RUN composer require joanhey/adapterman:^0.6 --quiet
 
 
 
 
 RUN sed -i 's|$app->run(); //| //$app->run(); //|g' index.php
 RUN sed -i 's|$app->run(); //| //$app->run(); //|g' index.php

+ 4 - 4
frameworks/PHP/slim/slim.dockerfile

@@ -7,16 +7,16 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 
 RUN apt-get install -yqq nginx git unzip \
 RUN apt-get install -yqq nginx git unzip \
-    php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql php8.1-xml php8.1-curl > /dev/null
+    php8.2 php8.2-common php8.2-cli php8.2-fpm php8.2-mysql php8.2-xml php8.2-curl > /dev/null
 
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 
-COPY deploy/conf/* /etc/php/8.1/fpm/
+COPY deploy/conf/* /etc/php/8.2/fpm/
 
 
 ADD ./ /slim
 ADD ./ /slim
 WORKDIR /slim
 WORKDIR /slim
 
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.1/fpm/php-fpm.conf ; fi;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.2/fpm/php-fpm.conf ; fi;
 
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 
 
@@ -24,5 +24,5 @@ RUN chmod -R 777 /slim
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-CMD service php8.1-fpm start && \
+CMD service php8.2-fpm start && \
     nginx -c /slim/deploy/nginx.conf
     nginx -c /slim/deploy/nginx.conf

+ 1 - 1
frameworks/PHP/slim/start.php

@@ -1,7 +1,7 @@
 <?php
 <?php
 error_reporting(-1);
 error_reporting(-1);
 
 
-require_once __DIR__.'/vendor/autoload.php';
+//require_once __DIR__.'/vendor/autoload.php';
 
 
 use DI\Container;
 use DI\Container;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ResponseInterface as Response;