Merge remote-tracking branch 'origin/main' into php82

This commit is contained in:
Julien Fastré 2023-03-21 10:35:07 +01:00
commit fb25e8b346
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
4 changed files with 12 additions and 2 deletions

View File

@ -11,3 +11,5 @@ MAILER_URL=smtp://smtp:1025
PGADMIN_DEFAULT_EMAIL=admin@chill.social PGADMIN_DEFAULT_EMAIL=admin@chill.social
PGADMIN_DEFAULT_PASSWORD=password PGADMIN_DEFAULT_PASSWORD=password
## Phpstorm IDE project path
PROJECT_DIR=

4
.gitignore vendored
View File

@ -9,6 +9,7 @@ config/secrets/
## env files ## env files
.env.local .env.local
.env.dev.local
.composer/* .composer/*
composer.phar composer.phar
@ -49,17 +50,18 @@ phpunit.xml
nbproject/* nbproject/*
.idea .idea
.ignore
### template/api/specs.yaml should be compiled ### template/api/specs.yaml should be compiled
templates/api/specs.yaml templates/api/specs.yaml
###> symfony/webpack-encore-bundle ### ###> symfony/webpack-encore-bundle ###
/node_modules/ /node_modules/
/public/build/ /public/build/
npm-debug.log npm-debug.log
yarn-error.log yarn-error.log
###< symfony/webpack-encore-bundle ### ###< symfony/webpack-encore-bundle ###
###> symfony/phpunit-bridge ### ###> symfony/phpunit-bridge ###
.phpunit .phpunit
.phpunit.result.cache .phpunit.result.cache

View File

@ -56,7 +56,6 @@ chill_budget:
- { key: mutuelle, labels: [{lang: fr, label: "Mutuelle"}]} - { key: mutuelle, labels: [{lang: fr, label: "Mutuelle"}]}
- { key: transport, labels: [{lang: fr, label: "Frais de transport"}]} - { key: transport, labels: [{lang: fr, label: "Frais de transport"}]}
- { key: decouvbank, labels: [{lang: fr, label: "Découvert bancaire utilisé"}]} - { key: decouvbank, labels: [{lang: fr, label: "Découvert bancaire utilisé"}]}
- { key: credit, labels: [{lang: fr, label: "Procédure de saisie"}]}
- { key: procsaisie, labels: [{lang: fr, label: "Procédure de saisie"}]} - { key: procsaisie, labels: [{lang: fr, label: "Procédure de saisie"}]}
- { key: indus, labels: [{lang: fr, label: "Indus"}]} - { key: indus, labels: [{lang: fr, label: "Indus"}]}
- { key: apurement, labels: [{lang: fr, label: "Plan d'apurement"}]} - { key: apurement, labels: [{lang: fr, label: "Plan d'apurement"}]}

View File

@ -3,3 +3,10 @@ framework:
# allow to debug from ngrok, useful for webhooks coming from outside: # allow to debug from ngrok, useful for webhooks coming from outside:
- '^(.+\.)?ngrok\.io$' - '^(.+\.)?ngrok\.io$'
- 'nginx' - 'nginx'
## Open files in phpstorm IDE from profiler links
# ref: https://symfony.com/doc/current/reference/configuration/framework.html#ide
# need: https://github.com/sanduhrs/phpstorm-url-handler/blob/master/phpstorm-url-handler
# set var in file .env.dev.local (PROJECT_DIR=<relative path from home folder>)
ide: 'phpstorm://open?file=%%f&line=%%l&/var/www/app/>%env(resolve:PROJECT_DIR)%'