From d3109d6c974ac34c383a95f11e7d76afe0922b17 Mon Sep 17 00:00:00 2001
From: Joanhey <joanhey@kumbiaphp.com>
Date: Wed, 29 Nov 2023 18:48:42 +0100
Subject: [PATCH] [php] Leaf update to PHP 8.3

---
 frameworks/PHP/leaf/index.php                 | 9 +++------
 frameworks/PHP/leaf/leaf-workerman.dockerfile | 8 ++++----
 frameworks/PHP/leaf/leaf.dockerfile           | 8 ++++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/frameworks/PHP/leaf/index.php b/frameworks/PHP/leaf/index.php
index 9848de6bd73..197c6c82191 100644
--- a/frameworks/PHP/leaf/index.php
+++ b/frameworks/PHP/leaf/index.php
@@ -2,13 +2,10 @@
 
 require __DIR__.'/vendor/autoload.php';
 
-app()->get("/plaintext", function () {
-    response()->plain('Hello, World!');
-});
+app()->get("/plaintext", fn() => response()->plain('Hello, World!'));
+
+app()->get('/json', fn() => response()->json(['message' => 'Hello, World!']));
 
-app()->get('/json', function () {
-    response()->json(['message' => 'Hello, World!']);
-});
 
 app()->run(); // commented with workerman
 
diff --git a/frameworks/PHP/leaf/leaf-workerman.dockerfile b/frameworks/PHP/leaf/leaf-workerman.dockerfile
index 12ac67bf00e..80f9248d07a 100644
--- a/frameworks/PHP/leaf/leaf-workerman.dockerfile
+++ b/frameworks/PHP/leaf/leaf-workerman.dockerfile
@@ -7,14 +7,14 @@ 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 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
+    php8.3-cli php8.3-mysql php8.3-mbstring php8.3-xml php8.3-curl > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-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
+RUN apt-get install -y php-pear php8.3-dev libevent-dev > /dev/null
+RUN pecl install event-3.0.8 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
 
-COPY deploy/conf/cli-php.ini /etc/php/8.2/cli/php.ini
+COPY deploy/conf/cli-php.ini /etc/php/8.3/cli/php.ini
 
 ADD ./ /leaf
 WORKDIR /leaf
diff --git a/frameworks/PHP/leaf/leaf.dockerfile b/frameworks/PHP/leaf/leaf.dockerfile
index 679d4bb6004..167a5af7039 100644
--- a/frameworks/PHP/leaf/leaf.dockerfile
+++ b/frameworks/PHP/leaf/leaf.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
 
 RUN apt-get install -yqq nginx git unzip \
-    php8.2 php8.2-common php8.2-cli php8.2-fpm php8.2-mysql php8.2-xml php8.2-curl > /dev/null
+    php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql php8.3-xml php8.3-curl > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-COPY deploy/conf/* /etc/php/8.2/fpm/
+COPY deploy/conf/* /etc/php/8.3/fpm/
 
 ADD ./ /leaf
 WORKDIR /leaf
 
-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 if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 
@@ -24,5 +24,5 @@ RUN chmod -R 777 /leaf
 
 EXPOSE 8080
 
-CMD service php8.2-fpm start && \
+CMD service php8.3-fpm start && \
     nginx -c /leaf/deploy/nginx.conf