[php] Laravel udpate to Adapterman 0.6 and PHP 8.2 (#8023)

* Laravel update to Adapterman 0.6 * Delete autoload * Laravel update to PHP 8.2
TechEmpower · Mar 13, 2023 · 683b97f · 683b97f
1 parent 6ba215e
commit 683b97f
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 22 deletions.
diff --git a/frameworks/PHP/laravel/deploy/conf/cli-php.ini b/frameworks/PHP/laravel/deploy/conf/cli-php.ini
@@ -13,4 +13,4 @@ memory_limit = 512M
 opcache.jit_buffer_size = 128M
 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
diff --git a/frameworks/PHP/laravel/deploy/workerman/composer.json b/frameworks/PHP/laravel/deploy/workerman/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": "^8.0",
         "laravel/framework": "^8.0",
-        "joanhey/adapterman": "^0.5"
+        "joanhey/adapterman": "^0.6"
     },
     "require-dev": {
         "facade/ignition": "^2.3.6",

diff --git a/frameworks/PHP/laravel/laravel-laravel-s.dockerfile b/frameworks/PHP/laravel/laravel-laravel-s.dockerfile
@@ -1,12 +1,12 @@
-FROM php:8.1-cli
+FROM php:8.2-cli
 
 RUN pecl install swoole > /dev/null && \
     docker-php-ext-enable swoole
 RUN docker-php-ext-install pdo_mysql pcntl opcache > /dev/null
 
 RUN echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-#RUN echo "opcache.jit=1205" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-#RUN echo "opcache.jit_buffer_size=128M" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+RUN echo "opcache.jit=1205" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+RUN echo "opcache.jit_buffer_size=128M" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 
 ADD ./ /laravel
 WORKDIR /laravel

diff --git a/frameworks/PHP/laravel/laravel-roadrunner.dockerfile b/frameworks/PHP/laravel/laravel-roadrunner.dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-cli
+FROM php:8.2-cli
 
 RUN docker-php-ext-install pdo_mysql pcntl opcache sockets > /dev/null
 

diff --git a/frameworks/PHP/laravel/laravel-swoole.dockerfile b/frameworks/PHP/laravel/laravel-swoole.dockerfile
@@ -1,12 +1,12 @@
-FROM php:8.1-cli
+FROM php:8.2-cli
 
 RUN pecl install swoole > /dev/null && \
     docker-php-ext-enable swoole
 RUN docker-php-ext-install pdo_mysql pcntl opcache > /dev/null
 
 RUN echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-#RUN echo "opcache.jit=1205" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-#RUN echo "opcache.jit_buffer_size=128M" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+RUN echo "opcache.jit=1205" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+RUN echo "opcache.jit_buffer_size=128M" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 
 ADD ./ /laravel
 WORKDIR /laravel

diff --git a/frameworks/PHP/laravel/laravel-workerman.dockerfile b/frameworks/PHP/laravel/laravel-workerman.dockerfile
@@ -7,12 +7,12 @@ 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
 
 RUN apt-get install -yqq git unzip \
-    php8.1-cli php8.1-mysql php8.1-mbstring php8.1-xml php8.1-curl > /dev/null
+    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
 
-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
 
 ADD ./ /laravel
 WORKDIR /laravel
@@ -26,6 +26,6 @@ COPY deploy/workerman/composer.json ./
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 RUN php artisan optimize
 
-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
 
 CMD php server-man.php start
diff --git a/frameworks/PHP/laravel/laravel.dockerfile b/frameworks/PHP/laravel/laravel.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -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
 
 RUN apt-get install -yqq nginx git unzip \
-    php8.1-cli php8.1-fpm php8.1-mysql  php8.1-mbstring php8.1-xml php8.1-dev > /dev/null
+    php8.2-cli php8.2-fpm php8.2-mysql  php8.2-mbstring php8.2-xml php8.2-dev > /dev/null
 
 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 ./ /laravel
 WORKDIR /laravel
 
-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 mkdir -p /laravel/bootstrap/cache /laravel/storage/logs /laravel/storage/framework/sessions /laravel/storage/framework/views /laravel/storage/framework/cache
 RUN chmod -R 777 /laravel
@@ -27,8 +27,8 @@ RUN php artisan optimize
 EXPOSE 8080
 
 # Uncomment next line for Laravel console error logging to be viewable in docker logs
-# RUN echo "catch_workers_output = yes" >> /etc/php/8.1/fpm/php-fpm.conf
+# RUN echo "catch_workers_output = yes" >> /etc/php/8.2/fpm/php-fpm.conf
 
 RUN mkdir -p /run/php
-CMD /usr/sbin/php-fpm8.1 --fpm-config /etc/php/8.1/fpm/php-fpm.conf && \
+CMD /usr/sbin/php-fpm8.2 --fpm-config /etc/php/8.2/fpm/php-fpm.conf && \
     nginx -c /laravel/deploy/nginx.conf
diff --git a/frameworks/PHP/laravel/server-man.php b/frameworks/PHP/laravel/server-man.php
@@ -11,7 +11,7 @@
 $http_worker                = new Worker('http://0.0.0.0:8080');
 $http_worker->count         = (int) shell_exec('nproc') * 4;
 $http_worker->name          = 'AdapterMan-Laravel';
-$http_worker->onWorkerStart = function () {
+$http_worker->onWorkerStart = static function () {
     Header::$date = gmdate('D, d M Y H:i:s').' GMT';
     Timer::add(1, function() {
          Header::$date = gmdate('D, d M Y H:i:s').' GMT';
@@ -20,7 +20,7 @@
     require __DIR__.'/start.php';
 };
 
-$http_worker->onMessage = static function ($connection, $request) {
+$http_worker->onMessage = static function ($connection) {
 
     $connection->send(run());
 };

diff --git a/frameworks/PHP/laravel/start.php b/frameworks/PHP/laravel/start.php
@@ -21,7 +21,7 @@
 |
 */
 
-require __DIR__.'/vendor/autoload.php';
+//require __DIR__.'/vendor/autoload.php';
 
 /*
 |--------------------------------------------------------------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ @@
     |
     */
-    require __DIR__.'/vendor/autoload.php';
+    //require __DIR__.'/vendor/autoload.php';
     /*
     |--------------------------------------------------------------------------
@@ Expand Down @@