Browse Source

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

* [php] Webman update to PHP 8.4

* Remove maintainers
walkor 10 months ago
parent
commit
bb5e72afbb

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

@@ -9,7 +9,7 @@ use PDO;
 
 class Index
 {
-    public function plaintext($request)
+    public function plaintext()
     {
         return new Response(200, [
             'Content-Type' => 'text/plain',
@@ -18,7 +18,7 @@ class Index
     }
 
 
-    public function json($request)
+    public function json()
     {
         return new Response(200, [
             'Content-Type' => 'application/json',
@@ -26,7 +26,7 @@ class Index
         ], 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 @@ class Index
         ], json_encode($statement->fetch()));
     }
 
-    public function fortunes($request)
+    public function fortunes()
     {
         $fortune = Db::$fortune;
 
@@ -59,7 +59,7 @@ class Index
         );
     }
 
-    public function queries($request, $q = 1)
+    public function queries(Request $request, $q = 1)
     {
         $statement = Db::$random;
 
@@ -80,7 +80,7 @@ class Index
         ], json_encode($arr));
     }
 
-    public function updates($request, $q = 1)
+    public function updates(Request $request, $q = 1)
     {
         $random = Db::$random;
 

+ 0 - 1
frameworks/PHP/webman/benchmark_config.json

@@ -1,6 +1,5 @@
 {
   "framework": "webman",
-  "maintainers": ["walkor"],
   "tests": [{
     "default": {
       "dockerfile": "webman.dockerfile",

+ 6 - 4
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"
+}

+ 6 - 6
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

+ 6 - 6
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