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.

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

Update documentation and container images to PHP 8.3 #244

Merged
merged 2 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 14 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
- ubuntu-22.04
- windows-2022
php:
- 8.3
- 8.2
- 8.1
- 8.0
Expand All @@ -22,7 +23,7 @@ jobs:
- 7.2
- 7.1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
Expand All @@ -46,6 +47,7 @@ jobs:
strategy:
matrix:
php:
- 8.3
- 8.2
- 8.1
- 8.0
Expand All @@ -54,7 +56,7 @@ jobs:
- 7.2
- 7.1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
Expand All @@ -68,6 +70,7 @@ jobs:
strategy:
matrix:
php:
- 8.3
- 8.2
- 8.1
- 8.0
Expand All @@ -76,7 +79,7 @@ jobs:
- 7.2
- 7.1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
Expand All @@ -94,10 +97,10 @@ jobs:
- "Dockerfile-basics"
- "Dockerfile-production"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: 8.2
php-version: 8.3
- run: composer install -d tests/install-as-dep/
- run: docker build -f tests/${{ matrix.dockerfile }} tests/install-as-dep/
- run: docker run -d -p 8080:8080 -v "$PWD/examples/index.php":/app/public/index.php -v "$PWD/composer.json":/app/composer.json -v "$PWD/LICENSE":/app/LICENSE -v "$PWD/tests/":/app/tests/ $(docker images -q | head -n1)
Expand All @@ -113,6 +116,7 @@ jobs:
strategy:
matrix:
php:
- 8.3
- 8.2
- 8.1
- 8.0
Expand All @@ -121,7 +125,7 @@ jobs:
- 7.2
- 7.1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
Expand All @@ -137,6 +141,7 @@ jobs:
strategy:
matrix:
php:
- 8.3
- 8.2
- 8.1
- 8.0
Expand All @@ -145,7 +150,7 @@ jobs:
- 7.2
- 7.1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
Expand All @@ -160,6 +165,7 @@ jobs:
strategy:
matrix:
php:
- 8.3
- 8.2
- 8.1
- 8.0
Expand All @@ -168,7 +174,7 @@ jobs:
- 7.2
- 7.1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"react/socket": "^1.13"
},
"require-dev": {
"phpstan/phpstan": "1.10.16 || 1.4.10",
"phpstan/phpstan": "1.10.47 || 1.4.10",
"phpunit/phpunit": "^9.6 || ^7.5",
"psr/container": "^2 || ^1",
"react/promise-timer": "^1.10"
Expand Down
10 changes: 5 additions & 5 deletions docs/best-practices/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ If you're not already running an Apache server, you can run your X project with
Apache in a temporary Docker container like this:

```bash
$ docker run -it --rm -p 80:80 -v "$PWD":/srv php:8.2-apache sh -c "rmdir /var/www/html;ln -s /srv/public /var/www/html;ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled; apache2-foreground"
$ docker run -it --rm -p 80:80 -v "$PWD":/srv php:8.3-apache sh -c "rmdir /var/www/html;ln -s /srv/public /var/www/html;ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled; apache2-foreground"
```

In order to check your web application responds as expected, you can use your
Expand Down Expand Up @@ -304,10 +304,10 @@ limit to match your concurrency workload. On Ubuntu- or Debian-based systems,
you may change your PHP configuration like this:

```bash
$ sudoedit /etc/php/8.2/cli/php.ini
$ sudoedit /etc/php/8.3/cli/php.ini
```

```diff title="/etc/php/8.2/cli/php.ini"
```diff title="/etc/php/8.3/cli/php.ini"
- memory_limit = 128M
+ memory_limit = -1
```
Expand Down Expand Up @@ -519,7 +519,7 @@ be achieved by using a `Dockerfile` with the following contents:

```docker title="Dockerfile"
# syntax=docker/dockerfile:1
FROM php:8.2-cli
FROM php:8.3-cli

WORKDIR /app/
COPY public/ public/
Expand All @@ -541,7 +541,7 @@ be achieved by using a `Dockerfile` with the following contents:
COPY composer.json composer.lock ./
RUN composer install --no-dev --ignore-platform-reqs --optimize-autoloader

FROM php:8.2-alpine
FROM php:8.3-alpine

# recommended: install optional extensions ext-ev and ext-sockets
RUN apk --no-cache add ${PHPIZE_DEPS} libev linux-headers \
Expand Down
2 changes: 1 addition & 1 deletion tests/AppTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,7 @@ public function testInvokeWithMatchingRouteReturnsInternalServerErrorResponseWhe

$line = __LINE__ + 2;
$app->get('/users', function () {
return await(reject(new \RuntimeException('Foo')));
await(reject(new \RuntimeException('Foo')));
});

$request = new ServerRequest('GET', 'http://localhost/users');
Expand Down
2 changes: 1 addition & 1 deletion tests/Dockerfile-basics
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM php:8.2-cli
FROM php:8.3-cli

WORKDIR /app/
COPY public/ public/
Expand Down
2 changes: 1 addition & 1 deletion tests/Dockerfile-production
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY composer.json composer.lock ./
# dev environment already has dependencies installed:
COPY vendor/ vendor/

FROM php:8.2-alpine
FROM php:8.3-alpine

# recommended: install optional extensions ext-ev and ext-sockets
RUN apk --no-cache add ${PHPIZE_DEPS} libev linux-headers \
Expand Down