Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[php] Webman update to PHP 8.4 #9425

Merged
merged 2 commits into from
Nov 25, 2024
Merged

[php] Webman update to PHP 8.4 #9425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f9a21e
[php] Webman update to PHP 8.4
walkor Nov 24, 2024
d3142b1
Remove maintainers
walkor Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions frameworks/PHP/webman/app/controller/Index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class Index
{
public function plaintext($request)
public function plaintext()
{
return new Response(200, [
'Content-Type' => 'text/plain',
Expand All @@ -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)]);
Expand All @@ -37,7 +37,7 @@ public function db($request)
], json_encode($statement->fetch()));
}

public function fortunes($request)
public function fortunes()
{
$fortune = Db::$fortune;

Expand All @@ -59,7 +59,7 @@ public function fortunes($request)
);
}

public function queries($request, $q = 1)
public function queries(Request $request, $q = 1)
{
$statement = Db::$random;

Expand All @@ -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;

Expand Down
1 change: 0 additions & 1 deletion frameworks/PHP/webman/benchmark_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"framework": "webman",
"maintainers": ["walkor"],
"tests": [{
"default": {
"dockerfile": "webman.dockerfile",
Expand Down
10 changes: 6 additions & 4 deletions frameworks/PHP/webman/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. "
Expand All @@ -51,5 +52,6 @@
"pre-package-uninstall": [
"support\\Plugin::uninstall"
]
}
}
},
"minimum-stability": "dev"
}
12 changes: 6 additions & 6 deletions frameworks/PHP/webman/webman-pgsql.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions frameworks/PHP/webman/webman.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading