Skip to content

Commit 6faf1db

Browse files
committed
chore: make linters happy
1 parent ec5d71e commit 6faf1db

File tree

11 files changed

+43
-29
lines changed

11 files changed

+43
-29
lines changed

.github/workflows/ci.yml renamed to .github/workflows/ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: CI
23

34
on:

compose.override.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# Development environment override
23
services:
34
php:

compose.prod.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# Production environment override
23
services:
34
php:

compose.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
services:
23
php:
34
image: ${IMAGES_PREFIX:-}app-php

docs/build.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ For instance, use the following command to install Symfony 6.4:
99
On Linux:
1010

1111
SYMFONY_VERSION=6.4.* docker compose up -d --wait
12+
1213
On Windows:
1314

1415
set SYMFONY_VERSION=6.4.* && docker compose up -d --wait&set SYMFONY_VERSION=
@@ -25,7 +26,7 @@ On Linux:
2526
STABILITY=dev docker compose up -d --wait
2627

2728
On Windows:
28-
29+
2930
set STABILITY=dev && docker compose up -d --wait&set STABILITY=
3031

3132
## Customizing the Server Name

docs/makefile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ And rebuild the PHP image.
3232
3333
## The template
3434

35-
```Makefile
35+
```makefile
3636
# Executables (local)
3737
DOCKER_COMP = docker compose
3838

docs/production.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ docker compose -f compose.yaml -f compose.prod.yaml up -d --wait
6868

6969
Be sure to replace `your-domain-name.example.com` with your actual domain name and to set the values of `APP_SECRET`, `CADDY_MERCURE_JWT_SECRET` to cryptographically secure random values.
7070

71-
Your server is up and running, and a HTTPS certificate has been automatically generated for you.
72-
Go to `https://your-domain-name.example.com` and enjoy!
73-
7471
> [!NOTE]
7572
> The worker mode of FrankenPHP is enabled by default in prod. To disable it, add the env var FRANKENPHP_CONFIG as empty to the compose.prod.yaml file.
7673
74+
Your server is up and running, and a HTTPS certificate has been automatically generated for you.
75+
Go to `https://your-domain-name.example.com` and enjoy!
76+
7777
> [!CAUTION]
7878
> Docker can have a cache layer, make sure you have the right build for each deployment or rebuild your project with --no-cache option to avoid cache issue.
7979

docs/tls.md

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,24 @@
33
## Trusting the Authority
44

55
With a standard installation, the authority used to sign certificates generated in the Caddy container is not trusted by your local machine.
6-
You must add the authority to the trust store of the host :
6+
You must add the authority to the trust store of the host.
77

8+
Mac:
9+
10+
```console
11+
docker cp $(docker compose ps -q php):/data/caddy/pki/authorities/local/root.crt /tmp/root.crt && sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain /tmp/root.crt
12+
```
13+
14+
Linux:
15+
16+
```console
17+
docker cp $(docker compose ps -q php):/data/caddy/pki/authorities/local/root.crt /usr/local/share/ca-certificates/root.crt && sudo update-ca-certificates
818
```
9-
# Mac
10-
$ docker cp $(docker compose ps -q php):/data/caddy/pki/authorities/local/root.crt /tmp/root.crt && sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain /tmp/root.crt
11-
# Linux
12-
$ docker cp $(docker compose ps -q php):/data/caddy/pki/authorities/local/root.crt /usr/local/share/ca-certificates/root.crt && sudo update-ca-certificates
13-
# Windows
14-
$ docker compose cp php:/data/caddy/pki/authorities/local/root.crt %TEMP%/root.crt && certutil -addstore -f "ROOT" %TEMP%/root.crt
19+
20+
Windows:
21+
22+
```console
23+
docker compose cp php:/data/caddy/pki/authorities/local/root.crt %TEMP%/root.crt && certutil -addstore -f "ROOT" %TEMP%/root.crt
1524
```
1625

1726
## Using Custom TLS Certificates
@@ -22,10 +31,10 @@ But sometimes you may prefer using custom certificates.
2231
For instance, to use self-signed certificates created with [mkcert](https://github.com/FiloSottile/mkcert) do as follows:
2332

2433
1. Locally install `mkcert`
25-
2. Create the folder storing the certs:
26-
`mkdir frankenphp/certs -p`
34+
2. Create the folder storing the certs:
35+
`mkdir frankenphp/certs -p`
2736
3. Generate the certificates for your local host (example: "server-name.localhost"):
28-
`mkcert -cert-file frankenphp/certs/tls.pem -key-file frankenphp/certs/tls.key "server-name.localhost"`
37+
`mkcert -cert-file frankenphp/certs/tls.pem -key-file frankenphp/certs/tls.key "server-name.localhost"`
2938
4. Add these lines to the `./compose.override.yaml` file about `CADDY_SERVER_EXTRA_DIRECTIVES` environment and volume for the `php` service :
3039
```diff
3140
php:

docs/troubleshooting.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
If you work on linux and cannot edit some of the project files right after the first installation, you can run `docker compose run --rm php chown -R $(id -u):$(id -g) .` to set yourself as owner of the project files that were created by the docker container.
66

7-
## HTTPs and Redirects
7+
## HTTPS and Redirects
88

9-
If Symfony is generating an internal redirect for an `https://` url, but the resulting url is `http://`, you have to uncomment the `TRUSTED_PROXIES` setting in your `.env` file.
9+
If Symfony is generating an internal redirect for an `https://` URL, but the resulting URL is `http://`, you have to uncomment the `TRUSTED_PROXIES` setting in your `.env` file.
1010
For more details see the [Symfony internal redirect documentation](https://symfony.com/doc/current/routing.html#redirecting-to-urls-and-routes-directly-from-a-route).
1111

1212
## TLS/HTTPS Issues

docs/xdebug.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ It can be enabled by setting the `XDEBUG_MODE` environment variable to `debug`.
88

99
On Linux and Mac:
1010

11-
```
11+
```console
1212
XDEBUG_MODE=debug docker compose up -d
1313
```
1414

1515
On Windows:
1616

17-
```
17+
```console
1818
set XDEBUG_MODE=debug&& docker compose up -d&set XDEBUG_MODE=
1919
```
2020

21-
## Debugging with Xdebug and PHPStorm
21+
## Debugging with Xdebug and PhpStorm
2222

2323
First, [create a PHP debug remote server configuration](https://www.jetbrains.com/help/phpstorm/creating-a-php-debug-server-configuration.html):
2424

@@ -33,12 +33,12 @@ First, [create a PHP debug remote server configuration](https://www.jetbrains.co
3333

3434
You can now use the debugger!
3535

36-
1. In PHPStorm, open the `Run` menu and click on `Start Listening for PHP Debug Connections`
36+
1. In PhpStorm, open the `Run` menu and click on `Start Listening for PHP Debug Connections`
3737
2. Add the `XDEBUG_SESSION=PHPSTORM` query parameter to the URL of the page you want to debug, or use [other available triggers](https://xdebug.org/docs/step_debug#activate_debugger)
3838

39-
Alternatively, you can use [the **Xdebug extension**](https://xdebug.org/docs/step_debug#browser-extensions) for your preferred web browser.
39+
Alternatively, you can use [the **Xdebug extension**](https://xdebug.org/docs/step_debug#browser-extensions) for your preferred web browser.
4040

41-
3. On command line, we might need to tell PHPStorm which [path mapping configuration](https://www.jetbrains.com/help/phpstorm/zero-configuration-debugging-cli.html#configure-path-mappings) should be used, set the value of the PHP_IDE_CONFIG environment variable to `serverName=symfony`, where `symfony` is the name of the debug server configured higher.
41+
3. On command line, we might need to tell PhpStorm which [path mapping configuration](https://www.jetbrains.com/help/phpstorm/zero-configuration-debugging-cli.html#configure-path-mappings) should be used, set the value of the PHP_IDE_CONFIG environment variable to `serverName=symfony`, where `symfony` is the name of the debug server configured higher.
4242

4343
Example:
4444

0 commit comments

Comments
 (0)