[php] Webman update to PHP 8.4 (#9425)

walkor · web-flow · commit bb5e72afbb57 · 2024-11-25T09:02:54.000-08:00
* [php] Webman update to PHP 8.4

* Remove maintainers
diff --git a/frameworks/PHP/webman/app/controller/Index.php b/frameworks/PHP/webman/app/controller/Index.php
@@ -9,7 +9,7 @@
 
 class Index
 {
-    public function plaintext($request)
+    public function plaintext()
     {
         return new Response(200, [
             'Content-Type' => 'text/plain',
@@ -18,15 +18,15 @@ public function plaintext($request)
     }
 
 
-    public function json($request)
+    public function json()
     {
         return new Response(200, [
             'Content-Type' => 'application/json',
             'Date'         => Date::$date
         ], json_encode(['message' => 'Hello, World!']));
     }
 
-    public function db($request)
+    public function db()
     {
         $statement = Db::$random;
         $statement->execute([\mt_rand(1, 10000)]);
@@ -37,7 +37,7 @@ public function db($request)
         ], json_encode($statement->fetch()));
     }
 
-    public function fortunes($request)
+    public function fortunes()
     {
         $fortune = Db::$fortune;
 
@@ -59,7 +59,7 @@ public function fortunes($request)
         );
     }
 
-    public function queries($request, $q = 1)
+    public function queries(Request $request, $q = 1)
     {
         $statement = Db::$random;
 
@@ -80,7 +80,7 @@ public function queries($request, $q = 1)
         ], json_encode($arr));
     }
 
-    public function updates($request, $q = 1)
+    public function updates(Request $request, $q = 1)
     {
         $random = Db::$random;
 
diff --git a/frameworks/PHP/webman/benchmark_config.json b/frameworks/PHP/webman/benchmark_config.json
@@ -1,6 +1,5 @@
 {
   "framework": "webman",
-  "maintainers": ["walkor"],
   "tests": [{
     "default": {
       "dockerfile": "webman.dockerfile",
diff --git a/frameworks/PHP/webman/composer.json b/frameworks/PHP/webman/composer.json
@@ -25,9 +25,10 @@
   },
   "require": {
     "php": ">=7.2",
-    "workerman/webman-framework": "^1.0",
+    "workerman/webman-framework": "dev-master",
     "monolog/monolog": "^2.0",
-    "vlucas/phpdotenv": ">=4.1,<6.0"
+    "vlucas/phpdotenv": ">=4.1,<6.0",
+    "workerman/workerman": "dev-master"
   },
   "suggest": {
     "ext-event": "For better performance. "
@@ -51,5 +52,6 @@
     "pre-package-uninstall": [
       "support\\Plugin::uninstall"
     ]
-  }
-}
+  },
+  "minimum-stability": "dev"
+}
diff --git a/frameworks/PHP/webman/webman-pgsql.dockerfile b/frameworks/PHP/webman/webman-pgsql.dockerfile
@@ -8,19 +8,19 @@ 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 && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
-RUN apt-get install -yqq php8.3-cli php8.3-pgsql php8.3-xml > /dev/null
+RUN apt-get install -yqq php8.4-cli php8.4-pgsql php8.4-xml > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-RUN apt-get update -yqq && apt-get install -y php-pear php8.3-dev libevent-dev git  > /dev/null
-RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/30-event.ini
+RUN apt-get update -yqq && apt-get install -y php-pear php8.4-dev libevent-dev git  > /dev/null
+RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/30-event.ini
 
-ADD ./ /webman
 WORKDIR /webman
+COPY --link . .
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
-COPY php.ini /etc/php/8.3/cli/conf.d/10-opcache.ini
+COPY php.ini /etc/php/8.4/cli/conf.d/10-opcache.ini
 
 EXPOSE 8080
 
-CMD php /webman/start.php start
+CMD php /webman/start.php start
diff --git a/frameworks/PHP/webman/webman.dockerfile b/frameworks/PHP/webman/webman.dockerfile
@@ -8,19 +8,19 @@ 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 && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
-RUN apt-get install -yqq php8.3-cli php8.3-pgsql php8.3-xml > /dev/null
+RUN apt-get install -yqq php8.4-cli php8.4-pgsql php8.4-xml > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-RUN apt-get update -yqq && apt-get install -y php-pear php8.3-dev libevent-dev git  > /dev/null
-RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/30-event.ini
+RUN apt-get update -yqq && apt-get install -y php-pear php8.4-dev libevent-dev git  > /dev/null
+RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/30-event.ini
 
-ADD ./ /webman
 WORKDIR /webman
+COPY --link . .
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
-COPY php.ini /etc/php/8.3/cli/conf.d/10-opcache.ini
+COPY php.ini /etc/php/8.4/cli/conf.d/10-opcache.ini
 
 EXPOSE 8080
 
-CMD php /webman/start.php start
+CMD php /webman/start.php start

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`class Index`
`11`	`11`	`{`
`12`		`- public function plaintext($request)`
	`12`	`+ public function plaintext()`
`13`	`13`	`{`
`14`	`14`	`return new Response(200, [`
`15`	`15`	`'Content-Type' => 'text/plain',`
`@@ -18,15 +18,15 @@ public function plaintext($request)`
`18`	`18`	`}`
`19`	`19`
`20`	`20`
`21`		`- public function json($request)`
	`21`	`+ public function json()`
`22`	`22`	`{`
`23`	`23`	`return new Response(200, [`
`24`	`24`	`'Content-Type' => 'application/json',`
`25`	`25`	`'Date' => Date::$date`
`26`	`26`	`], json_encode(['message' => 'Hello, World!']));`
`27`	`27`	`}`
`28`	`28`
`29`		`- public function db($request)`
	`29`	`+ public function db()`
`30`	`30`	`{`
`31`	`31`	`$statement = Db::$random;`
`32`	`32`	`$statement->execute([\mt_rand(1, 10000)]);`
`@@ -37,7 +37,7 @@ public function db($request)`
`37`	`37`	`], json_encode($statement->fetch()));`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function fortunes($request)`
	`40`	`+ public function fortunes()`
`41`	`41`	`{`
`42`	`42`	`$fortune = Db::$fortune;`
`43`	`43`
`@@ -59,7 +59,7 @@ public function fortunes($request)`
`59`	`59`	`);`
`60`	`60`	`}`
`61`	`61`
`62`		`- public function queries($request, $q = 1)`
	`62`	`+ public function queries(Request $request, $q = 1)`
`63`	`63`	`{`
`64`	`64`	`$statement = Db::$random;`
`65`	`65`
`@@ -80,7 +80,7 @@ public function queries($request, $q = 1)`
`80`	`80`	`], json_encode($arr));`
`81`	`81`	`}`
`82`	`82`
`83`		`- public function updates($request, $q = 1)`
	`83`	`+ public function updates(Request $request, $q = 1)`
`84`	`84`	`{`
`85`	`85`	`$random = Db::$random;`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"framework": "webman",`
`3`		`- "maintainers": ["walkor"],`
`4`	`3`	`"tests": [{`
`5`	`4`	`"default": {`
`6`	`5`	`"dockerfile": "webman.dockerfile",`