Compare commits

...

146 Commits

Author SHA1 Message Date
bf29c7756f [wip] upgrade configuration to chill v3 (symfony 5) 2024-07-03 11:14:05 +02:00
002fd7b632 Fix workflow configuration 2024-04-29 15:28:24 +02:00
8d70ca871b update recipes symfony/translation 2024-02-14 09:58:40 +01:00
ca84e9416d update recipes symfony/phpunit-bridge 2024-02-14 09:57:09 +01:00
e03b0f71bf update recipes symfony/monolog-bundle 2024-02-14 09:56:09 +01:00
e287a832d2 update recipes symfony/mailer 2024-02-14 09:49:21 +01:00
1b5b62ba49 update recipes doctrine/doctrine-bundle 2024-02-14 09:48:36 +01:00
eb3c561f85 configure var-dump server in docker stack 2024-02-14 09:43:25 +01:00
008291bddb upgrade composer 2024-02-13 20:55:05 +01:00
c466dc297c Merge remote-tracking branch 'origin/main' into upgrade-sf5 2024-02-13 19:24:00 +01:00
2c6fb97f31 Merge pull request 'release/upgrade_vue' (#17) from release/upgrade_vue into main
Reviewed-on: Chill-project/chill-skeleton-basic#17
2024-02-13 13:39:47 +00:00
LenaertsJ
c58443dd72 update composer.lock and file (automatic update) 2024-02-13 13:39:25 +00:00
b6c17f62d0 add changie 2024-02-13 14:38:18 +01:00
7712d146c7 update yarn.lock and makefile to use node 20 and upgrade vue 2024-02-13 14:37:18 +01:00
9b42f328ae fixes after merge of master into upgrade-sf4 2024-02-13 10:59:30 +01:00
8a83372e2f make sure translations directory is kept 2024-02-12 18:31:06 +01:00
883725af10 Merge pull request 'release/delete_translations' (#16) from release/delete_translations into main
Reviewed-on: Chill-project/chill-skeleton-basic#16
2024-02-12 16:42:12 +00:00
LenaertsJ
7faee98294 update composer.lock and file (automatic update) 2024-02-12 16:40:41 +00:00
96e0c4c97e add changie 2024-02-12 17:39:42 +01:00
921726ec75 remove translations to prevent overwriting 2024-02-12 17:39:27 +01:00
fecb561b3b Merge branch 'main' into upgrade-sf5 2024-02-11 22:20:04 +01:00
61a77cc1de Merge pull request 'update chill to release 2.16.1' (#13) from release/chill-2.16.1 into main
Reviewed-on: Chill-project/chill-skeleton-basic#13
2024-02-08 23:15:49 +00:00
julienfastre
0c65d3d681 update composer.lock and file (automatic update) 2024-02-08 23:13:55 +00:00
9c125c6af6 update chill to release 2.16.1 2024-02-08 23:13:22 +00:00
e701b75f1e upgrade to node 20 2024-02-09 00:00:13 +01:00
6c0caef3d5 release 1.4.4 2024-02-08 22:58:06 +01:00
103282e44b restore previous version of yarn.lock 2024-02-08 22:57:12 +01:00
dd591628a8 better restriction for bootstrap version and release 1.4.3 2024-02-08 22:38:38 +01:00
656d27080b release 1.4.2 2024-02-08 22:13:30 +01:00
8d1693285d fix version of bootstrap to 5.2.3 2024-02-08 22:10:52 +01:00
818b4c36a3 upgrade node version and update 1.4.1 2024-02-08 21:53:25 +01:00
0fb57fcdd8 Merge pull request 'upgrade chill to version 2.16.0' (#12) from release/chill-2.16.0 into main
Reviewed-on: Chill-project/chill-skeleton-basic#12
2024-02-08 20:31:04 +00:00
julienfastre
c8d89e2a1d update composer.lock and file (automatic update) 2024-02-08 20:26:12 +00:00
d142fbe471 upgrade chill to version 2.16.0 2024-02-08 20:24:58 +00:00
deadabefa1 Merge pull request 'activate bundle event in app' (#7) from 6-activate-event-bundle into main
Reviewed-on: Chill-project/chill-skeleton-basic#7
2024-02-08 20:23:54 +00:00
e8c506e883 fixup! rename main firewall 2023-12-14 22:31:09 +01:00
e5a73e666b Merge branch 'merge-async-upload-app' into upgrade-sf5 2023-12-12 16:53:12 +01:00
c3d666ed74 symfony recipes: update symfony/phpunit-bridge 2023-12-12 16:52:40 +01:00
bc68b65cfb symfony recipes: update symfony/translations 2023-12-12 16:51:55 +01:00
62c96df759 symfony recipes: update phpstan/phpstan recipes 2023-12-12 16:49:52 +01:00
c00f7fa209 Update chill-bundles: remove async-upload app 2023-12-12 16:47:10 +01:00
ad1327a351 Upgrade recipes: doctrine/doctrine-migrations-bundle (fake change)
Manual intervention in symfony.lock
2023-12-12 16:25:05 +01:00
9b2e7d1aad Upgrade recipes: phpstan/phpstan 2023-12-12 16:25:05 +01:00
7090e678ef Upgrade recipes: doctrine/annotations 2023-12-12 16:25:04 +01:00
7f1ee500a0 Upgrade recipes: symfony/webpack-encore-bundle 2023-12-12 16:25:04 +01:00
ca5f69b911 Upgrade recipes: symfony/routing 2023-12-12 16:25:04 +01:00
475228297f Upgrade recipes: symfony/validator 2023-12-12 16:25:03 +01:00
f6216567f7 Upgrade recipes: symfony/twig-bundle 2023-12-12 16:25:03 +01:00
59625879a8 Upgrade recipes: symfony/security-bundle 2023-12-12 16:25:03 +01:00
f0645d0c45 Upgrade recipes: symfony/routing 2023-12-12 16:25:03 +01:00
fb1259ba81 Upgrade recipes: symfony/phpunit-bridge 2023-12-12 16:25:02 +01:00
cd876bd889 Upgrade recipes: symfony/monolog-bundle 2023-12-12 16:25:02 +01:00
d2717b0875 Upgrade recipes: symfony/messenger 2023-12-12 16:25:02 +01:00
cda9ecc8ec Upgrade recipes: symfony/mailer 2023-12-12 16:25:02 +01:00
070c1f963a Upgrade recipes: symfony/framework 2023-12-12 16:25:00 +01:00
9dd52af2c6 Upgrade recipes: symfony/flex 2023-12-12 16:24:40 +01:00
91172e45cb Upgrade recipes: symfony/debug-bundle 2023-12-12 16:24:39 +01:00
22ff9fe53f Upgrade recipes: symfony/console 2023-12-12 16:24:38 +01:00
11ab7f01c7 Upgrade recipes: phpunit/phpunit 2023-12-12 16:24:21 +01:00
498118d434 Upgrade recipes: nyholm/psr7 2023-12-12 16:24:20 +01:00
93d0e13f81 Upgrade recipes: nelmio/alice 2023-12-12 16:24:20 +01:00
9bb77b136d composer: chill-bundles to upgrade-sf5 branch + downgrade some bundles 2023-12-12 16:24:18 +01:00
b2636e5ab8 recipes update: lexik/jwt-authentication-bundle 2023-12-12 16:24:04 +01:00
04270eea26 Upgrade recipes: doctrine/doctrine-fixtures-bundle 2023-12-12 16:24:04 +01:00
28954f036e Upgrade recipes: doctrine-annotation 2023-12-12 16:24:04 +01:00
965f2e0281 update doctrine-annotations recipes 2023-12-12 16:24:04 +01:00
99e1763332 reset templates while upgrade 2023-12-12 16:24:03 +01:00
c3499c1881 upgrade chill-bundles to upgrade-sf5 branch 2023-12-12 16:24:01 +01:00
1f6e5a807b Remove comments into bundles.php file 2023-12-12 16:02:44 +01:00
db4effd727 Revert "Revert "Add configuration for chill-doc-store into skeleton""
This reverts commit 2c9ec9db55.
2023-12-12 15:59:16 +01:00
2c9ec9db55 Revert "Add configuration for chill-doc-store into skeleton"
This reverts commit 4aea2fe135.
2023-12-12 15:57:56 +01:00
4aea2fe135 Add configuration for chill-doc-store into skeleton 2023-12-12 15:17:18 +01:00
6fe97f3659 Merge pull request 'update chill to release 2.14.1' (#8) from release/chill-2.14.1 into main
Reviewed-on: Chill-project/chill-skeleton-basic#8
2023-11-30 08:27:55 +00:00
julienfastre
d9980a7e18 update composer.lock and file (automatic update) 2023-11-30 08:27:10 +00:00
59852c709d update chill to release 2.14.1 2023-11-30 08:25:54 +00:00
f7dc506506 upgrade node dependencies 2023-11-29 13:21:26 +01:00
8ef752fdd0 activate bundle event in app 2023-11-27 13:24:34 +01:00
1c544d392a Merge pull request 'Prepare for release - chill 2.14.0' (#5) from release/chill-2.14.0 into main
Reviewed-on: Chill-project/chill-skeleton-basic#5
2023-11-24 11:41:27 +00:00
julienfastre
dcfd7e4924 update composer.lock and file (automatic update) 2023-11-24 11:40:51 +00:00
deb47dd3aa Prepare for release - chill 2.14.0 2023-11-24 11:40:19 +00:00
ac909e8107 Merge pull request 'update to chill-bundles 2.13.0 - prepare for release' (#4) from release/chill-2.13.0 into main
Reviewed-on: Chill-project/chill-skeleton-basic#4
2023-11-22 15:35:12 +00:00
julienfastre
414b4e11ca update composer.lock and file (automatic update) 2023-11-22 15:34:21 +00:00
86e27595f5 restore release workflow 2023-11-22 15:33:33 +00:00
cb3ac56084 delete create-release-on-tag 2023-11-22 15:32:28 +00:00
4ef93ef722 update to chill-bundles 2.13.0 - prepare for release 2023-11-22 15:31:11 +00:00
7e3d741ea0 Merge pull request 'Integrate changie and create a workflow for publishing app' (#3) from julienfastre/chill-skeleton-basic:release/test2 into main
Reviewed-on: Chill-project/chill-skeleton-basic#3
2023-11-19 20:55:48 +00:00
bd011775a6 Integrate changie and create a workflow for publishing app
update composer.lock and file (automatic update)

prepare for realease

Signed-off-by: Julien Fastré <julienfastre@noreply.localhost>

update composer.lock and file (automatic update)

Workflow: tag and create release

Fix expressions

checkout before

remove permissions

finalize
2023-11-19 21:55:02 +01:00
f06b8dcd1e upgrade to chill 2.9.2 2023-10-17 23:39:58 +02:00
7f85d66337 upgrade chill to 2.9.1 2023-10-17 22:14:11 +02:00
cc716beaec upgrade to chill version 2.9.0 2023-10-17 16:22:42 +02:00
ac61038625 update to last chill dep version 2023-10-05 07:56:04 +00:00
9827832753 Add symfony flex and symfony runtime to composer.json 2023-09-26 16:26:22 +02:00
0706901415 update composer.json to chill-bundles version 2.6.3 2023-09-26 12:41:43 +02:00
c4d3c784d3 fix mismatches of variables in Makefile 2023-09-22 17:47:13 +02:00
ce136ba0f3 revert 05d4a10a5b
revert Dav: configuration of security for allowing dav endpoints
2023-09-22 09:16:51 +00:00
05d4a10a5b Dav: configuration of security for allowing dav endpoints 2023-09-17 15:47:05 +02:00
Lucas Silva
c06166fdc2 update composer 2023-04-26 13:43:36 +02:00
fb1219163e DX: sign drone file 2023-04-25 15:09:50 +02:00
52c40e5f52 update node deps 2023-04-25 15:03:11 +02:00
a144b0e4be Deploy: update chill-bundles 2023-04-25 15:02:54 +02:00
8d310ef7c8 remove overwrote translation on activity roles (see admin-permissiongroup-templates branch, chill-bundles MR !504) 2023-04-14 15:30:54 +02:00
eff7e9470d update yarn 2023-04-14 14:42:52 +02:00
cad7c0c53d Feature: [messenger] Update config for messenger to handle document generation 2023-03-30 18:20:54 +02:00
c29f6cdf96 adapt drone config 2023-03-30 18:14:30 +02:00
430915f831 Merge branch 'php82' 2023-03-30 18:11:43 +02:00
29253b4f01 update deps 2023-03-30 18:08:02 +02:00
93972a0135 remove budget element in config 2023-03-30 18:00:51 +02:00
63c7130be3 update yarn deps 2023-03-30 18:00:13 +02:00
63489e7055 yarn upgrade 2023-03-30 16:27:37 +02:00
6d8b858cc8 Merge branch 'php82' into main 2023-03-30 15:56:17 +02:00
28444d5bbf DX: upgrade packages to next minor versions 2023-03-21 11:06:28 +01:00
fb25e8b346 Merge remote-tracking branch 'origin/main' into php82 2023-03-21 10:35:07 +01:00
efed281312 Merge pull request 'Allow devs to directly open profiler links in php storm IDE' (#2) from skeleton/phpstorm-dev-integration into main
Reviewed-on: Chill-project/chill-skeleton-basic#2
2023-03-08 15:46:30 +00:00
a6a988a33a Merge remote-tracking branch 'origin/config-chill-budget' into main 2023-03-08 16:42:56 +01:00
859eb37526 Merge remote-tracking branch 'origin/main' into main 2023-03-08 16:07:55 +01:00
b55914e40f add a generic .ignore directory 2023-03-08 10:45:52 +01:00
7f1085d2c2 DX: add dev config for profiler <-> phpstorm links integration 2023-03-08 10:29:07 +01:00
Lucas Silva
b81638eda9 Fix error credit 2023-03-07 15:06:15 +01:00
571d662737 Merge pull request 'Feature: build a php base image usable for CI' (#1) from php82_ci into php82
Reviewed-on: Chill-project/chill-skeleton-basic#1
2023-02-17 15:41:16 +00:00
78a98bff40 Feature: publish base image 2023-02-17 16:39:53 +01:00
2f18130e72 Revert "remove gd deps"
This reverts commit eb059453282539b899b3dbdce72cb970d5c28bff.
2023-02-08 09:36:41 +01:00
2af27e8b42 Feature: add php-cs-fixer to the base image
Php-cs-fixer have conflicts with the symfony and doctrine version in use for us.

I propose to add it to the image until php-cs-fixer becomes compatible again with our dependencies.

This commit also add the environment variable PHP_CS_FIXER_IGNORE_ENV to make it works with php 8.2 (currently, it does not work with php > 8.1)
2023-02-08 09:36:41 +01:00
fcd00855f9 improve DockerFile deps to avoid errors with chill 2023-02-08 09:36:41 +01:00
e9c478c062 adapt Makefile and rename chill_php occurences by chill_php82 2023-02-08 09:36:41 +01:00
d38e9a5c0a add shell preference 2023-02-08 09:36:41 +01:00
b63a4f2a5f finish image 2023-02-08 09:36:41 +01:00
1a1188c612 merge deps RUN blocks to optimize 2023-02-08 09:36:41 +01:00
39b9e839c2 remove gd deps 2023-02-08 09:36:41 +01:00
23c438f0d7 add postgresql-client 2023-02-08 09:36:41 +01:00
a4fd3dbeb6 Upgrade chill_base_php image to PHP8: install deps and php extension 2023-02-08 09:36:41 +01:00
1ef5ef50a3 update composer files 2023-02-03 09:56:15 +01:00
da2149cb60 Deploy: update dependencies 2023-02-01 12:46:15 +01:00
491c5f3b49 deploy: update version of chill-bundles 2023-01-13 21:09:41 +01:00
8d3b56c6fe DX: avoid duplicate config 2023-01-13 18:21:02 +01:00
4157b4bb21 Feature: adapt skeleton for wopi / jwt and secret/public keys in base64 format in production 2023-01-13 13:31:11 +01:00
99ec0b765f Feature: trigger migration automatically only in prod mode 2023-01-13 13:26:10 +01:00
dc19006738 Feature: configure root app for usage of JWT access token for wopi 2023-01-09 20:50:11 +01:00
e55562c4cd Feature: install lexik jwt and configuration 2023-01-07 21:11:01 +01:00
82c8140e4b Feature: force to validate proof on wopi editor 2023-01-07 21:09:00 +01:00
e55745b48b DX: remove default doctrine query cache pool 2023-01-07 21:08:07 +01:00
f80d2c47ce Deps: upgrade recipes for symfony/framework-bundle 2022-12-29 23:07:06 +01:00
da2f5f37c0 deps: upgrade doctrine recipe 2022-12-29 22:55:13 +01:00
beab370cd6 deploy: use wopi as source 2022-12-29 22:33:19 +01:00
b10074e440 Feature: add parallelism in drone image compilation pipeline 2022-12-27 00:26:43 +01:00
d8792adc5f Deploy: last deploy for chill bundles 2022-12-27 00:11:54 +01:00
0ba659e17f Fixed: fixed env variable processor (typo) 2022-12-26 22:27:26 +01:00
111 changed files with 7520 additions and 6564 deletions

6
.changes/header.tpl.md Normal file
View File

@@ -0,0 +1,6 @@
# Changelog
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie).

View File

3
.changes/v1.0.0.md Normal file
View File

@@ -0,0 +1,3 @@
## v1.0.0 - 2023-11-19
### Feature
* Integrate changie and automate release management

3
.changes/v1.1.0.md Normal file
View File

@@ -0,0 +1,3 @@
## v1.1.0 - 2023-11-22
### Release
* Update dependencies. Chill-bundles upgraded from 2.12.1 to 2.13.0

3
.changes/v1.2.0.md Normal file
View File

@@ -0,0 +1,3 @@
## v1.2.0 - 2023-11-24
### Release
* Update dependencies. Chill-bundles upgraded from 2.13.0 to 2.14.0

3
.changes/v1.3.0.md Normal file
View File

@@ -0,0 +1,3 @@
## v1.3.0 - 2023-11-30
### Release
* Update dependencies. Chill-bundles upgraded from 2.14.0 to 2.14.1

4
.changes/v1.4.0.md Normal file
View File

@@ -0,0 +1,4 @@
## v1.4.0 - 2024-02-08
### Release
* Upgrade nodes dependencies
* Update dependencies. Chill-bundles upgraded from 2.14.1 to 2.16.0

3
.changes/v1.4.1.md Normal file
View File

@@ -0,0 +1,3 @@
## v1.4.1 - 2024-02-08
### Fixed
* upgrade node version while compiling

3
.changes/v1.4.2.md Normal file
View File

@@ -0,0 +1,3 @@
## v1.4.2 - 2024-02-08
### Fixed
* Fix version of bootstrap temporarily

3
.changes/v1.4.3.md Normal file
View File

@@ -0,0 +1,3 @@
## v1.4.3 - 2024-02-08
### Fixed
* better restriction for bootstrap version

3
.changes/v1.4.4.md Normal file
View File

@@ -0,0 +1,3 @@
## v1.4.4 - 2024-02-08
### Fixed
* fix incorrect upgrade

3
.changes/v1.5.0.md Normal file
View File

@@ -0,0 +1,3 @@
## v1.5.0 - 2024-02-08
### Release
* Update dependencies. Chill-bundles upgraded from 2.16.0 to 2.16.1

5
.changes/v1.6.0.md Normal file
View File

@@ -0,0 +1,5 @@
## v1.6.0 - 2024-02-12
### Release
* Update dependencies. Chill-bundles upgraded from 2.16.1 to 2.16.1
### Fixed
* Overwriting of bundles translations removed

5
.changes/v1.7.0.md Normal file
View File

@@ -0,0 +1,5 @@
## v1.7.0 - 2024-02-13
### Release
* Update dependencies. Chill-bundles upgraded from 2.16.1 to 2.16.1
### Fixed
* Upgrade vue to fix multiselect

35
.changie.yaml Normal file
View File

@@ -0,0 +1,35 @@
changesDir: .changes
unreleasedDir: unreleased
headerPath: header.tpl.md
changelogPath: CHANGELOG.md
versionExt: md
versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
kindFormat: '### {{.Kind}}'
# Note: it is possible to add a `.custom.Long` text manually into the yaml file produced by `changie new`. This will add a long description.
changeFormat: >-
* {{ if and (ne .Custom.Issue "") (ne .Custom.Issue "0") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{ end }}{{.Body}}
custom:
- key: Issue
label: Issue number (on chill-bundles repository) (optional)
optional: true
type: int
kinds:
- label: Release
auto: minor
- label: Feature
auto: minor
- label: Deprecated
auto: minor
- label: Fixed
auto: patch
- label: Security
auto: patch
- label: DX
auto: patch
- label: UX
auto: patch
newlines:
afterChangelogHeader: 1
beforeChangelogVersion: 1
endOfVersion: 1
envPrefix: CHANGIE_

View File

@@ -21,7 +21,7 @@ steps:
registry: h3m6q87t.gra7.container-registry.ovh.net registry: h3m6q87t.gra7.container-registry.ovh.net
repo: h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base repo: h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base
tag: latest tag: latest
target: chill_base_php target: chill_base_php82
pull_image: true pull_image: true
cache_from: cache_from:
- h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base:latest - h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base:latest
@@ -33,13 +33,18 @@ steps:
commands: commands:
- composer install --no-scripts --no-interaction - composer install --no-scripts --no-interaction
- composer update --with-all-dependencies --no-interaction chill-project/chill-bundles - composer update --with-all-dependencies --no-interaction chill-project/chill-bundles
depends_on:
- build-base-image
- name: build-assets - name: build-assets
image: node:14 image: node:20
pull: always pull: always
commands: commands:
- yarn install - yarn install
- yarn list
- yarn run encore production - yarn run encore production
depends_on:
- composer-install
- name: build-image-php - name: build-image-php
image: plugins/docker image: plugins/docker
@@ -56,6 +61,9 @@ steps:
cache_from: cache_from:
- h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base:latest - h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base:latest
- chill/base-image:latest - chill/base-image:latest
depends_on:
- build-assets
- composer-install
- name: build-image-nginx - name: build-image-nginx
image: plugins/docker image: plugins/docker
@@ -70,3 +78,40 @@ steps:
tag: tag:
- ${DRONE_TAG} - ${DRONE_TAG}
Dockerfile: docker/nginx/Dockerfile Dockerfile: docker/nginx/Dockerfile
depends_on:
- build-assets
---
kind: pipeline
type: docker
name: build-base-image-php82
trigger:
event:
- cron
- push
cron:
- base-image-php82
steps:
- name: build-base-image
image: plugins/docker
settings:
username:
from_secret: docker_username_gitea
password:
from_secret: docker_password_gitea
registry: gitea.champs-libres.be/chill-project/chill-skeleton-basic
repo: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image
tag:
- php82
- latest
target: chill_base_php82
pull_image: true
---
kind: signature
hmac: 0bca4dec9822a08338f6f3b88badf771558aee19b41967837aa64853a1573cad
...

59
.env
View File

@@ -1,20 +1,26 @@
## # * .env contains default values for the environment variables needed by the app
## Manually dump .env files in .env.local.php with # * .env.local uncommitted file with local overrides
## `$ composer symfony:dump-env prod` # * .env.$APP_ENV committed environment-specific defaults
## # * .env.$APP_ENV.local uncommitted environment-specific overrides
#
## Project environment # Real environment variables win over .env files.
# this should be set in docker-compose.yml file #
# APP_ENV=prod # DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
# https://symfony.com/doc/current/configuration/secrets.html
## Enable debug #
APP_DEBUG=false # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
## Locale ## Locale
LOCALE=fr LOCALE=fr
## Framework secret ###> symfony/framework-bundle ###
APP_SECRET=ThisTokenIsNotSoSecretChangeIt # this should be set in docker-compose.yml file
APP_ENV=prod
APP_SECRET=ChangeItf2b58287ef7f9976409d3f6c72529e99ChangeIt
TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
TRUSTED_HOSTS='^(localhost|example\.com|nginx)$'
###< symfony/framework-bundle ###
## Wopi server for editing documents online ## Wopi server for editing documents online
WOPI_SERVER=http://collabora:9980 WOPI_SERVER=http://collabora:9980
@@ -22,18 +28,8 @@ WOPI_SERVER=http://collabora:9980
# must be manually set in .env.local # must be manually set in .env.local
# ADMIN_PASSWORD= # ADMIN_PASSWORD=
## Symfony/framework-bundle
TRUSTED_HOSTS='^(localhost|127.0.0.1|test.localde)$'
TRUSTED_PROXIES=~
## Doctrine/doctrine-bundle
DATABASE_URL=
## Symfony/swiftmailer
## Mailer
###> symfony/mailer ### ###> symfony/mailer ###
# MAILER_DSN=smtp://localhost # MAILER_DSN=null://null
MAILER_DSN=
###< symfony/mailer ### ###< symfony/mailer ###
## Notifications ## Notifications
@@ -78,8 +74,21 @@ SHORT_MESSAGE_DSN=null://null
###> symfony/messenger ### ###> symfony/messenger ###
# Choose one of the transports below # Choose one of the transports below
# MESSENGER_TRANSPORT_DSN=doctrine://default
# MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages # MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
# MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages # MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
MESSENGER_TRANSPORT_DSN=sync:// MESSENGER_TRANSPORT_DSN=sync://
MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
###< symfony/messenger ### ###< symfony/messenger ###
###> doctrine/doctrine-bundle ###
# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
#
DATABASE_URL="postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8"
###< doctrine/doctrine-bundle ###
###> lexik/jwt-authentication-bundle ###
JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
JWT_PASSPHRASE=2a30f6ba26521a2613821da35f28386e
###< lexik/jwt-authentication-bundle ###

View File

@@ -11,3 +11,8 @@ 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
VAR_DUMPER_SERVER=dumper:9912
## Phpstorm IDE project path
PROJECT_DIR=

View File

@@ -1,4 +1,7 @@
# define your env variables for the test env here # define your env variables for the test env here
KERNEL_CLASS='App\Kernel' KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st' APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
PANTHER_APP_ENV=panther
PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
ADMIN_PASSWORD=password ADMIN_PASSWORD=password

View File

@@ -0,0 +1,59 @@
name: Prepare release for chill app
run-name: Update composer.lock and dependencies for preparing a release
on:
push:
branches:
- 'release/**'
jobs:
update-deps:
runs-on: ubuntu-latest
steps:
- name: check out repository
uses: https://github.com/actions/checkout@v4
- name: get the previous chill version
# parse the composer.lock file using jq to get the chill version before the upgrade
id: chill-before
uses: https://github.com/sergeysova/jq-action@v2
with:
cmd: 'cat composer.lock | jq --raw-output ''.packages[] | select ( .name | contains ("chill-project/chill-bundles")) | .version'''
- name: run composer update to update composer.lock
uses: docker://gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:latest
with:
# this is where we set the command to execute
args: composer update --no-install
- name: is composer.lock changed ?
id: composer-lock-changed
run: 'echo is_composer_lock_changed=$(git diff --name-only | grep "composer\.lock" | wc -l) >> $GITHUB_OUTPUT'
- name: get the new chill version
# parse the composer.lock file using jq to get the chill version after the upgrade
id: chill-after
uses: https://github.com/sergeysova/jq-action@v2
with:
cmd: 'cat composer.lock | jq --raw-output ''.packages[] | select ( .name | contains ("chill-project/chill-bundles")) | .version'''
- name: add a changie file for the upgrade
uses: https://github.com/miniscruff/changie-action@v2
if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
with:
version: latest
args: 'new --body "Update dependencies. Chill-bundles upgraded from ${{ steps.chill-before.outputs.value }} to ${{ steps.chill-after.outputs.value }}" --kind Release --custom "Issue=0"'
- name: changie batch
if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
uses: https://github.com/miniscruff/changie-action@v2
with:
version: latest
args: 'batch auto'
- name: changie merge
if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
uses: https://github.com/miniscruff/changie-action@v2
with:
version: latest
args: 'merge'
- name: commit changed files
if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
uses: https://github.com/stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "update composer.lock and file (automatic update)"
commit_user_name: Action Bot
commit_user_email: bot@chill.social

13
.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,19 +50,19 @@ 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.result.cache .phpunit.result.cache
/phpunit.xml /phpunit.xml
###< symfony/phpunit-bridge ### ###< symfony/phpunit-bridge ###
@@ -75,3 +76,11 @@ yarn-error.log
docker-compose.override.yml docker-compose.override.yml
docker-compose.override.yaml docker-compose.override.yaml
###> lexik/jwt-authentication-bundle ###
/config/jwt/*.pem
###< lexik/jwt-authentication-bundle ###
###> phpstan/phpstan ###
phpstan.neon
###< phpstan/phpstan ###

View File

@@ -1,12 +1,60 @@
# Changelog # Changelog
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie).
* [Semantic Versioning](https://semver.org/spec/v2.0.0.html) for stable releases;
* date versioning for test releases
## Unreleased ## v1.7.0 - 2024-02-13
### Release
* Update dependencies. Chill-bundles upgraded from 2.16.1 to 2.16.1
### Fixed
* Upgrade vue to fix multiselect
## v1.6.0 - 2024-02-12
### Release
* Update dependencies. Chill-bundles upgraded from 2.16.1 to 2.16.1
### Fixed
* Overwriting of bundles translations removed
## v1.5.0 - 2024-02-08
### Release
* Update dependencies. Chill-bundles upgraded from 2.16.0 to 2.16.1
## v1.4.4 - 2024-02-08
### Fixed
* fix incorrect upgrade
## v1.4.3 - 2024-02-08
### Fixed
* better restriction for bootstrap version
## v1.4.2 - 2024-02-08
### Fixed
* Fix version of bootstrap temporarily
## v1.4.1 - 2024-02-08
### Fixed
* upgrade node version while compiling
## v1.4.0 - 2024-02-08
### Release
* Upgrade nodes dependencies
* Update dependencies. Chill-bundles upgraded from 2.14.1 to 2.16.0
## v1.3.0 - 2023-11-30
### Release
* Update dependencies. Chill-bundles upgraded from 2.14.0 to 2.14.1
## v1.2.0 - 2023-11-24
### Release
* Update dependencies. Chill-bundles upgraded from 2.13.0 to 2.14.0
## v1.1.0 - 2023-11-22
### Release
* Update dependencies. Chill-bundles upgraded from 2.12.1 to 2.13.0
## v1.0.0 - 2023-11-19
### Feature
* Integrate changie and automate release management

View File

@@ -1,4 +1,4 @@
FROM php:7.4-fpm-buster AS chill_base_php FROM php:8.2-fpm-alpine AS chill_base_php82
ENV POSTGRES_VERSION 14 ENV POSTGRES_VERSION 14
@@ -6,27 +6,31 @@ ENV POSTGRES_VERSION 14
ARG UID=1000 ARG UID=1000
ARG GID=1000 ARG GID=1000
RUN apt update && apt -y --no-install-recommends install wget gnupg \ # install php extensions and deps
&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ RUN apk update && apk add --no-cache \
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ wget gnupg \
&& apt update && apt -y --no-install-recommends install \ libpq-dev \
libicu-dev \ icu-dev icu-libs icu-data-full \
g++ \ oniguruma-dev \
postgresql-server-dev-$POSTGRES_VERSION \ libzip libzip-dev \
libzip-dev libzip4 unzip \ linux-headers \
libfreetype6-dev \ gcc g++ make autoconf \
libonig-dev `# install oniguruma, required for mbstring` \ bash git \
libpng-dev \ && docker-php-ext-install pdo_pgsql intl mbstring zip bcmath exif sockets \
libjpeg62-turbo-dev \ && git clone https://github.com/nikic/php-ast.git \
git \ && cd php-ast \
&& docker-php-ext-configure gd --with-freetype --with-jpeg \ && phpize \
&& docker-php-ext-install -j$(nproc) gd \ && ./configure \
&& docker-php-ext-install intl pdo_pgsql mbstring zip bcmath sockets exif \ && make install \
&& pecl install redis \ && echo 'extension=ast.so' > /usr/local/etc/php/php.ini \
&& docker-php-ext-enable redis \ && cd .. && rm -rf php-ast \
&& apt remove -y wget libicu-dev g++ gnupg libzip-dev \ && pecl install redis \
&& apt autoremove -y \ && docker-php-ext-enable redis \
&& apt purge -y && apk add libpng-dev libjpeg-turbo-dev freetype-dev \
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
&& docker-php-ext-install -j$(nproc) gd \
&& apk add postgresql${POSTGRES_VERSION}-client \
&& apk del --purge wget gnupg libpq-dev icu-dev oniguruma-dev libzip-dev linux-headers gcc g++ make autoconf
RUN { \ RUN { \
echo ""; \ echo ""; \
@@ -41,15 +45,31 @@ RUN { \
echo ""; \ echo ""; \
} >> /usr/local/etc/php/conf.d/date.ini } >> /usr/local/etc/php/conf.d/date.ini
# temporary fix, while php-cs-fixer has conflict dependencies
# with chill
RUN curl -o /usr/local/bin/php-cs-fixer https://cs.symfony.com/download/php-cs-fixer-v3.phar \
&& chmod +x /usr/local/bin/php-cs-fixer
# to make php-cs-fixer works with php 8.2
ENV PHP_CS_FIXER_IGNORE_ENV=1
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
ENV COMPOSER_ALLOW_SUPERUSER=1 ENV COMPOSER_ALLOW_SUPERUSER=1
ENV COMPOSER_MEMORY_LIMIT=-1 ENV COMPOSER_MEMORY_LIMIT=-1
# shell bash preference
RUN sed -i " \
s|root:x:0:0:root:/root:/bin/ash|root:x:0:0:root:/root:/bin/bash|g; \
s|postgres:x:70:70:PostgreSQL user:/var/lib/postgresql:/bin/sh|postgres:x:70:70:PostgreSQL user:/var/lib/postgresql:/bin/bash|g" \
/etc/passwd
# chmod on redis.so
RUN chmod 755 -R /usr/local/lib/php/extensions/
WORKDIR /var/www/app WORKDIR /var/www/app
CMD ["php-fpm"] CMD ["php-fpm"]
FROM chill_base_php AS chill_php FROM chill_base_php82 AS chill_php82
# copy directories # copy directories

View File

@@ -2,12 +2,12 @@ THIS_FILE := $(lastword $(MAKEFILE_LIST))
PWD:=$(shell echo ${PWD}) PWD:=$(shell echo ${PWD})
UID:=$(shell id -u) UID:=$(shell id -u)
GID:=$(shell id -g) GID:=$(shell id -g)
BASE_TAG=chill_base_php DOCKERNODE_CMD=docker run --rm --user ${UID}:${GID} -v ${PWD}:/app --workdir /app -e YARN_CACHE_FOLDER=/app/.yarncache node:20
DOCKERNODE_CMD=docker run --rm --user ${UID}:${GID} -v ${PWD}:/app --workdir /app -e YARN_CACHE_FOLDER=/app/.yarncache node:16
DOCKER_COMPOSE_PHP_EXEC_CMD=docker-compose run --rm --user $(UID):$(GID) -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env php DOCKER_COMPOSE_PHP_EXEC_CMD=docker-compose run --rm --user $(UID):$(GID) -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env php
DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(BASE_TAG) DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(PHP_BASE_IMAGE_TAG)
PHP_BASE_IMAGE=php:7.4-fpm-buster PHP_BASE_IMAGE=php:8.2-fpm-alpine
PHP_BASE_IMAGE_CHILL=chill_base_php PHP_BASE_IMAGE_TARGET=chill_base_php82
PHP_BASE_IMAGE_TAG=chill_php82
NGINX_BASE_IMAGE=nginx NGINX_BASE_IMAGE=nginx
CALVER=$(shell date "+v%Y%m%d%H%M")-${CALVERSION} CALVER=$(shell date "+v%Y%m%d%H%M")-${CALVERSION}
ifneq (,$(wildcard ./.env)) ifneq (,$(wildcard ./.env))
@@ -39,7 +39,7 @@ build-assets:
$(DOCKERNODE_CMD) yarn run encore production $(DOCKERNODE_CMD) yarn run encore production
init: init:
docker build --target chill_base_php -t $(BASE_TAG) . docker build --pull --target $(PHP_BASE_IMAGE_TARGET) --tag $(PHP_BASE_IMAGE_TAG) .
$(DOCKER_PHP_EXEC_CMD_BASE) composer update --no-scripts --no-interaction $(DOCKER_PHP_EXEC_CMD_BASE) composer update --no-scripts --no-interaction
@$(MAKE) -f $(THIS_FILE) build-assets @$(MAKE) -f $(THIS_FILE) build-assets
@$(MAKE) -f $(THIS_FILE) post-install @$(MAKE) -f $(THIS_FILE) post-install

2
assets/bootstrap.js vendored
View File

@@ -4,7 +4,7 @@ import { startStimulusApp } from '@symfony/stimulus-bridge';
export const app = startStimulusApp(require.context( export const app = startStimulusApp(require.context(
'@symfony/stimulus-bridge/lazy-controller-loader!./controllers', '@symfony/stimulus-bridge/lazy-controller-loader!./controllers',
true, true,
/\.(j|t)sx?$/ /\.[jt]sx?$/
)); ));
// register any custom, 3rd party controllers here // register any custom, 3rd party controllers here

View File

@@ -3,40 +3,15 @@
use App\Kernel; use App\Kernel;
use Symfony\Bundle\FrameworkBundle\Console\Application; use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\ErrorHandler\Debug;
if (!in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) { if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL; throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
} }
set_time_limit(0); require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
require dirname(__DIR__).'/vendor/autoload.php'; return function (array $context) {
$kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
if (!class_exists(Application::class)) { return new Application($kernel);
throw new LogicException('You need to add "symfony/framework-bundle" as a Composer dependency.'); };
}
$input = new ArgvInput();
if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
}
if ($input->hasParameterOption('--no-debug', true)) {
putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
}
require dirname(__DIR__).'/config/bootstrap.php';
if ($_SERVER['APP_DEBUG']) {
umask(0000);
if (class_exists(Debug::class)) {
Debug::enable();
}
}
$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
$application = new Application($kernel);
$application->run($input);

View File

@@ -15,15 +15,14 @@
}, },
"require": { "require": {
"ext-redis": "*", "ext-redis": "*",
"chill-project/chill-bundles": "dev-master#351df930a1274ee4f308b7f898f2d7485c9659f3", "chill-project/chill-bundles": "dev-upgrade-sf5@dev",
"symfony/flex": "^1.9", "symfony/flex": "^1.9",
"symfony/http-client": "^4.4 || ^5",
"nelmio/alice": "^3.8", "nelmio/alice": "^3.8",
"phpoffice/phpword": "^0.18.2", "phpoffice/phpword": "^0.18.2",
"phpstan/phpstan": "^1.0", "phpstan/phpstan": "^1.0",
"spomky-labs/base64url": "^2.0", "spomky-labs/base64url": "^2.0",
"twig/string-extra": "^3.3", "twig/string-extra": "^3.3",
"symfony/mailer": "^5.4" "symfony/runtime": "^5.4"
}, },
"require-dev": { "require-dev": {
"fakerphp/faker": "^1.13", "fakerphp/faker": "^1.13",
@@ -31,13 +30,11 @@
"symfony/dotenv": "^5.1", "symfony/dotenv": "^5.1",
"symfony/maker-bundle": "^1.20", "symfony/maker-bundle": "^1.20",
"doctrine/doctrine-fixtures-bundle": "^3.3", "doctrine/doctrine-fixtures-bundle": "^3.3",
"symfony/stopwatch": "^5.1", "symfony/stopwatch": "^5.4",
"symfony/twig-bundle": "^4.4",
"symfony/web-profiler-bundle": "^5.0", "symfony/web-profiler-bundle": "^5.0",
"symfony/var-dumper": "4.*", "symfony/var-dumper": "4.*",
"symfony/phpunit-bridge": "^5.2", "symfony/phpunit-bridge": "^5.2",
"symfony/debug-bundle": "^5.1", "symfony/debug-bundle": "^5.1"
"box/spout": "^3.3"
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true, "prefer-stable": true,
@@ -54,11 +51,14 @@
"bin-dir": "bin", "bin-dir": "bin",
"allow-plugins": { "allow-plugins": {
"ocramius/package-versions": true, "ocramius/package-versions": true,
"symfony/flex": true "symfony/flex": true,
"symfony/runtime": true
}, },
"preferred-install": { "preferred-install": {
"chill-project/chill-bundles": "source", "chill-project/chill-bundles": "source",
"champs-libres/async-uploader-bundle": "source" "champs-libres/async-uploader-bundle": "source",
"champs-libres/wopi-bundle": "source",
"champs-libres/wopi-lib": "source"
} }
} }
} }

5770
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,23 +0,0 @@
<?php
use Symfony\Component\Dotenv\Dotenv;
require dirname(__DIR__).'/vendor/autoload.php';
if (!class_exists(Dotenv::class)) {
throw new LogicException('Please run "composer require symfony/dotenv" to load the ".env" files configuring the application.');
}
// Load cached env vars if the .env.local.php file exists
// Run "composer dump-env prod" to create it (requires symfony/flex >=1.2)
if (is_array($env = @include dirname(__DIR__).'/.env.local.php') && (!isset($env['APP_ENV']) || ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? $env['APP_ENV']) === $env['APP_ENV'])) {
(new Dotenv(false))->populate($env);
} else {
// load all the .env files
(new Dotenv(false))->loadEnv(dirname(__DIR__).'/.env');
}
$_SERVER += $_ENV;
$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';
$_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0';

View File

@@ -12,11 +12,9 @@ return [
Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true], Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true], Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true], Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true], Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true], Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true],
Knp\Bundle\TimeBundle\KnpTimeBundle::class => ['all' => true], Knp\Bundle\TimeBundle\KnpTimeBundle::class => ['all' => true],
ChampsLibres\AsyncUploaderBundle\ChampsLibresAsyncUploaderBundle::class => ['all' => true],
Chill\MainBundle\ChillMainBundle::class => ['all' => true], Chill\MainBundle\ChillMainBundle::class => ['all' => true],
Chill\PersonBundle\ChillPersonBundle::class => ['all' => true], Chill\PersonBundle\ChillPersonBundle::class => ['all' => true],
Chill\CustomFieldsBundle\ChillCustomFieldsBundle::class => ['all' => true], Chill\CustomFieldsBundle\ChillCustomFieldsBundle::class => ['all' => true],
@@ -36,4 +34,6 @@ return [
Misd\PhoneNumberBundle\MisdPhoneNumberBundle::class => ['all' => true], Misd\PhoneNumberBundle\MisdPhoneNumberBundle::class => ['all' => true],
App\App::class => ['all' => true], App\App::class => ['all' => true],
KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true], KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true],
Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
Chill\EventBundle\ChillEventBundle::class => ['all' => true],
]; ];

View File

@@ -0,0 +1,14 @@
framework:
cache:
default_redis_provider: '%env(resolve:REDIS_URL)%'
pools:
cache.user_data:
adapter: cache.adapter.redis
public: true
default_lifetime: 300 # 5 minutes
# will be used in chill_main.tag_aware_cache service
cache.tags:
adapter: cache.adapter.redis
public: false
default_lifetime: 300

View File

@@ -1,14 +0,0 @@
champs_libres_async_uploader:
openstack:
os_username: '%env(resolve:OS_USERNAME)%' # Required
os_password: '%env(resolve:OS_PASSWORD)%' # Required
os_tenant_id: '%env(resolve:OS_TENANT_ID)%' # Required
os_region_name: '%env(resolve:OS_REGION_NAME)%' # Required
os_auth_url: '%env(resolve:OS_AUTH_URL)%' # Required
temp_url:
temp_url_key: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_KEY)%' # Required
container: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_CONTAINER)%' # Required
temp_url_base_path: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_BASE_PATH)%' # Required. Do not forget a trailing slash
max_post_file_size: 15000000 # 15Mo (bytes)
max_expires_delay: 180
max_submit_delay: 3600

View File

@@ -24,9 +24,15 @@ chill_main:
default_country: '%env(string:ADD_ADDRESS_DEFAULT_COUNTRY)%' default_country: '%env(string:ADD_ADDRESS_DEFAULT_COUNTRY)%'
map_center: map_center:
x: '%env(float:ADD_ADDRESS_MAP_CENTER_X)%' x: '%env(float:ADD_ADDRESS_MAP_CENTER_X)%'
y: '%env(float:ADD_ADDRESS_MAP_CENTER_y)%' y: '%env(float:ADD_ADDRESS_MAP_CENTER_Y)%'
z: '%env(float:ADD_ADDRESS_MAP_CENTER_Z)%' z: '%env(float:ADD_ADDRESS_MAP_CENTER_Z)%'
when@test:
chill_main:
available_languages:
- 'fr'
- 'en'
chill_custom_fields: chill_custom_fields:
show_empty_values_in_views: false show_empty_values_in_views: false

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"}]}
@@ -82,6 +81,5 @@ chill_budget:
- { key: debt_bank, labels: [{lang: fr, label: "Dette de découvert bancaire utilisé"}]} - { key: debt_bank, labels: [{lang: fr, label: "Dette de découvert bancaire utilisé"}]}
- { key: debt_garbage, labels: [{lang: fr, label: "Dette de taxe dordures ménagère"}]} - { key: debt_garbage, labels: [{lang: fr, label: "Dette de taxe dordures ménagère"}]}
- { key: debt_other, labels: [{lang: fr, label: "Dette autre"}]} - { key: debt_other, labels: [{lang: fr, label: "Dette autre"}]}
- { key: credit, labels: [{lang: fr, label: "Crédit"}]}
- { key: autre, labels: [{lang: fr, label: "Autre"}]} - { key: autre, labels: [{lang: fr, label: "Autre"}]}

View File

@@ -0,0 +1,6 @@
chill_doc_store:
openstack:
temp_url:
temp_url_key: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_KEY)%' # Required
container: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_CONTAINER)%' # Required
temp_url_base_path: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_BASE_PATH)%' # Required

View File

@@ -1,88 +0,0 @@
chill_main:
cruds:
-
class: 'App\Entity\VendeePerson'
controller: 'App\Controller\VendeePersonController'
name: vendeeperson
base_path: /vendee/vendeeperson
actions:
infosociopro_edit:
controller_action: 'infosocioproEdit'
path: '/{id}/infosociopro/edit'
role: CHILL_PERSON_EDIT
infosociopro_view:
controller_action: 'infosocioproView'
path: '/{id}/infosociopro/view'
role: CHILL_PERSON_VIEW
entourage_edit:
controller_action: 'entourageEdit'
path: '/{id}/entourage/edit'
role: CHILL_PERSON_EDIT
entourage_view:
controller_action: 'entourageView'
path: '/{id}/entourage/view'
role: CHILL_PERSON_VIEW
infomedicale_edit:
controller_action: 'infomedicaleEdit'
path: '/{id}/infomedicale/edit'
role: CHILL_PERSON_EDIT
infomedicale_view:
controller_action: 'infomedicaleView'
path: '/{id}/infomedicale/view'
role: CHILL_PERSON_VIEW
infologement_edit:
controller_action: 'infologementEdit'
path: '/{id}/infologement/edit'
role: CHILL_PERSON_EDIT
infologement_view:
controller_action: 'infologementView'
path: '/{id}/infologement/view'
role: CHILL_PERSON_VIEW
-
class: 'App\Entity\VendeePersonMineur'
controller: 'App\Controller\VendeePersonMineurController'
name: vendeepersonmineur
base_path: /vendee/vendeepersonmineur
actions:
infofamille_edit:
controller_action: 'infofamilleEdit'
path: '/{id}/infofamille/edit'
role: CHILL_PERSON_EDIT
infofamille_view:
controller_action: 'infofamilleView'
path: '/{id}/infofamille/view'
role: CHILL_PERSON_VIEW
scolarite_edit:
controller_action: 'scolariteEdit'
path: '/{id}/scolarite/edit'
role: CHILL_PERSON_EDIT
scolarite_view:
controller_action: 'scolariteView'
path: '/{id}/scolarite/view'
role: CHILL_PERSON_VIEW
infomedicale_edit:
controller_action: 'infomedicaleEdit'
path: '/{id}/infomedicale/edit'
role: CHILL_PERSON_EDIT
infomedicale_view:
controller_action: 'infomedicaleView'
path: '/{id}/infomedicale/view'
role: CHILL_PERSON_VIEW
-
class: 'App\Entity\Security\Profile'
name: vendee_security_profile
base_path: '/admin/vendee/security/profile'
base_role: ROLE_ADMIN
form_class: 'App\Form\Security\ProfileType'
controller: 'App\Controller\SecurityProfileController'
actions:
index:
template: '/Security/Profile/index.html.twig'
role: ROLE_ADMIN
new:
role: ROLE_ADMIN
template: '/Security/Profile/new.html.twig'
edit:
role: ROLE_ADMIN
template: '/Security/Profile/edit.html.twig'

View File

@@ -0,0 +1,5 @@
when@dev:
debug:
# Forwards VarDumper Data clones to a centralized server allowing to inspect dumps on CLI or in your browser.
# See the "server:dump" command to start a new server.
dump_destination: "tcp://%env(VAR_DUMPER_SERVER)%"

View File

@@ -1,4 +0,0 @@
debug:
# Forwards VarDumper Data clones to a centralized server allowing to inspect dumps on CLI or in your browser.
# See the "server:dump" command to start a new server.
dump_destination: "tcp://%env(VAR_DUMPER_SERVER)%"

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)%'

View File

@@ -1,21 +0,0 @@
monolog:
handlers:
main:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
channels: ["!event"]
# uncomment to get logging in your browser
# you may have to allow bigger header sizes in your Web server configuration
#firephp:
# type: firephp
# level: info
#chromephp:
# type: chromephp
# level: info
console:
type: console
process_psr_3_messages: false
channels: ['!event', '!doctrine', '!console']
bubble: false

View File

@@ -1,9 +0,0 @@
nelmio_alice:
functions_blacklist:
- 'current'
- 'shuffle'
- 'date'
- 'time'
- 'file'
- 'md5'
- 'sha1'

View File

@@ -1,4 +0,0 @@
# See https://symfony.com/doc/current/email/dev_environment.html
swiftmailer:
# send all emails to a specific address
#delivery_addresses: ['me@example.com']

View File

@@ -1,3 +0,0 @@
twig:
globals:
responsive_debug: false

View File

@@ -1,6 +0,0 @@
web_profiler:
toolbar: true
intercept_redirects: false
framework:
profiler: { only_exceptions: false }

View File

@@ -1,3 +1,10 @@
framework:
cache:
pools:
doctrine.system_cache_pool:
adapter: cache.adapter.redis
doctrine: doctrine:
dbal: dbal:
url: '%env(resolve:DATABASE_URL)%' url: '%env(resolve:DATABASE_URL)%'
@@ -5,7 +12,8 @@ doctrine:
geometry: string geometry: string
# IMPORTANT: You MUST configure your server version, # IMPORTANT: You MUST configure your server version,
# either here or in the DATABASE_URL env var (see .env file) # either here or in the DATABASE_URL env var (see .env file)
#server_version: '5.7' #server_version: '16'
use_savepoints: true
orm: orm:
auto_generate_proxy_classes: true auto_generate_proxy_classes: true
naming_strategy: doctrine.orm.naming_strategy.default naming_strategy: doctrine.orm.naming_strategy.default
@@ -13,7 +21,32 @@ doctrine:
mappings: mappings:
App: App:
is_bundle: false is_bundle: false
type: annotation
dir: '%kernel.project_dir%/src/Entity' dir: '%kernel.project_dir%/src/Entity'
prefix: 'App\Entity' prefix: 'App\Entity'
alias: App alias: App
when@test:
doctrine:
dbal:
# "TEST_TOKEN" is typically set by ParaTest
dbname_suffix: '_test%env(default::TEST_TOKEN)%'
when@prod:
doctrine:
orm:
auto_generate_proxy_classes: false
proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies'
query_cache_driver:
type: pool
pool: doctrine.system_cache_pool
result_cache_driver:
type: pool
pool: doctrine.result_cache_pool
framework:
cache:
pools:
doctrine.result_cache_pool:
adapter: cache.app
doctrine.system_cache_pool:
adapter: cache.system

View File

@@ -2,25 +2,9 @@ doctrine_migrations:
migrations_paths: migrations_paths:
# migrations for custom modules # migrations for custom modules
'Application\Migrations': '%kernel.project_dir%/migrations' 'Application\Migrations': '%kernel.project_dir%/migrations'
# migrations for default chill modules
'Chill\Migrations\Main': '@ChillMainBundle/migrations'
'Chill\Migrations\Activity': '@ChillActivityBundle/migrations'
'Chill\Migrations\DocStore': '@ChillDocStoreBundle/migrations'
'Chill\Migrations\CustomFields': '@ChillCustomFieldsBundle/migrations'
# 'Chill\Migrations\Event': '@ChillEventBundle/migrations'
'Chill\Migrations\Person': '@ChillPersonBundle/migrations'
'Chill\Migrations\Task': '@ChillTaskBundle/migrations'
'Chill\Migrations\ThirdParty': '@ChillThirdPartyBundle/migrations'
'Chill\Migrations\DocGenerator': '@ChillDocGeneratorBundle/migrations'
'Chill\Migrations\AsideActivity': '@ChillAsideActivityBundle/migrations'
'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
all_or_nothing: all_or_nothing:
true true
services:
'Doctrine\Migrations\Version\Comparator': 'Chill\MainBundle\Doctrine\Migrations\VersionComparator'
storage: storage:
table_storage: table_storage:
table_name: 'migration_versions' table_name: 'migration_versions'

View File

@@ -0,0 +1,20 @@
doctrine_migrations:
migrations_paths:
# migrations for default chill modules
'Chill\Migrations\Main': '@ChillMainBundle/migrations'
'Chill\Migrations\Activity': '@ChillActivityBundle/migrations'
'Chill\Migrations\DocStore': '@ChillDocStoreBundle/migrations'
'Chill\Migrations\CustomFields': '@ChillCustomFieldsBundle/migrations'
'Chill\Migrations\Event': '@ChillEventBundle/migrations'
'Chill\Migrations\Person': '@ChillPersonBundle/migrations'
'Chill\Migrations\Task': '@ChillTaskBundle/migrations'
'Chill\Migrations\ThirdParty': '@ChillThirdPartyBundle/migrations'
'Chill\Migrations\DocGenerator': '@ChillDocGeneratorBundle/migrations'
'Chill\Migrations\AsideActivity': '@ChillAsideActivityBundle/migrations'
'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
all_or_nothing:
true
services:
'Doctrine\Migrations\Version\Comparator': 'Chill\MainBundle\Doctrine\Migrations\VersionComparator'

View File

@@ -7,14 +7,12 @@ framework:
verify_peer: false verify_peer: false
verify_host: false verify_host: false
# DIRTY FIX un bug dans symfony4 empêche de récupérer un tableau de variables depuis .env
# cfr. https://github.com/symfony/symfony/issues/28599
trusted_hosts: trusted_hosts:
- '^(localhost|127.0.0.1|web)$' - '^(localhost|127.0.0.1|web)$'
- '%env(resolve:TRUSTED_HOSTS)%' - '%env(resolve:TRUSTED_HOSTS)%'
#csrf_protection: true #csrf_protection: true
#http_method_override: true http_method_override: false
# Enables session support. Note that the session will ONLY be started if you read or write from it. # Enables session support. Note that the session will ONLY be started if you read or write from it.
# Remove or comment this section to explicitly disable session support. # Remove or comment this section to explicitly disable session support.
@@ -22,6 +20,7 @@ framework:
handler_id: null handler_id: null
cookie_secure: auto cookie_secure: auto
cookie_samesite: lax cookie_samesite: lax
storage_factory_id: session.storage.factory.native
#esi: true #esi: true
#fragments: true #fragments: true
@@ -30,9 +29,8 @@ framework:
#error_controller: App\Controller\ErrorController::show #error_controller: App\Controller\ErrorController::show
## sf4 check: ou à déplacer dans un chill.yaml when@test:
assets: framework:
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json' test: true
session:
templating: storage_factory_id: session.storage.factory.mock_file
engines: ['twig']

View File

@@ -0,0 +1,12 @@
lexik_jwt_authentication:
secret_key: '%env(resolve:JWT_SECRET_KEY)%'
public_key: '%env(resolve:JWT_PUBLIC_KEY)%'
pass_phrase: '%env(JWT_PASSPHRASE)%'
# required for wopi - recommended duration
token_ttl: 36000
token_extractors:
query_parameter:
enabled: true
name: access_token

View File

@@ -0,0 +1,4 @@
framework:
mailer:
envelope:
sender: '%env(NOTIFICATION_FROM_EMAIL)%'

View File

@@ -9,16 +9,11 @@ framework:
transports: transports:
# https://symfony.com/doc/current/messenger.html#transport-configuration # https://symfony.com/doc/current/messenger.html#transport-configuration
async: '%env(MESSENGER_TRANSPORT_DSN)%' async: '%env(MESSENGER_TRANSPORT_DSN)%'
priority:
dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
failed: 'doctrine://default?queue_name=failed' failed: 'doctrine://default?queue_name=failed'
# sync: 'sync://' # sync: 'sync://'
routing: routing:
# Route your messages to the transports # Route your messages to the transports
# 'App\Message\YourMessage': async # 'App\Message\YourMessage': async
'Chill\CalendarBundle\Messenger\Message\CalendarRangeMessage': async
'Chill\CalendarBundle\Messenger\Message\CalendarRangeRemovedMessage': async
'Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage': async
'Chill\CalendarBundle\Messenger\Message\CalendarMessage': async
'Chill\CalendarBundle\Messenger\Message\InviteUpdateMessage': async
'Chill\CalendarBundle\Messenger\Message\MSGraphChangeNotificationMessage': async
'Chill\MainBundle\Service\ShortMessage\ShortMessage': async

View File

@@ -0,0 +1,13 @@
framework:
messenger:
routing:
# Route your messages to the transports
# 'App\Message\YourMessage': async
'Chill\CalendarBundle\Messenger\Message\CalendarRangeMessage': async
'Chill\CalendarBundle\Messenger\Message\CalendarRangeRemovedMessage': async
'Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage': async
'Chill\CalendarBundle\Messenger\Message\CalendarMessage': async
'Chill\CalendarBundle\Messenger\Message\InviteUpdateMessage': async
'Chill\CalendarBundle\Messenger\Message\MSGraphChangeNotificationMessage': async
'Chill\MainBundle\Service\ShortMessage\ShortMessage': async
'Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage': priority

View File

@@ -0,0 +1,63 @@
monolog:
channels:
- deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists
when@dev:
monolog:
handlers:
main:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
channels: ["!event"]
# uncomment to get logging in your browser
# you may have to allow bigger header sizes in your Web server configuration
#firephp:
# type: firephp
# level: info
#chromephp:
# type: chromephp
# level: info
console:
type: console
process_psr_3_messages: false
channels: ["!event", "!doctrine", "!console"]
when@test:
monolog:
handlers:
main:
type: fingers_crossed
action_level: error
handler: nested
excluded_http_codes: [404, 405]
channels: ["!event"]
nested:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
# those comes from the symfony recipe. But this is overriden by the ./prod/monolog.yaml config
# when@prod:
# monolog:
# handlers:
# main:
# type: fingers_crossed
# action_level: error
# handler: nested
# excluded_http_codes: [404, 405]
# buffer_size: 50 # How many messages should be saved? Prevent memory leaks
# nested:
# type: stream
# path: php://stderr
# level: debug
# formatter: monolog.formatter.json
# console:
# type: console
# process_psr_3_messages: false
# channels: ["!event", "!doctrine"]
# deprecation:
# type: stream
# channels: [deprecation]
# path: php://stderr
# formatter: monolog.formatter.json

View File

@@ -0,0 +1,12 @@
when@dev: &dev
nelmio_alice:
functions_blacklist:
- 'current'
- 'shuffle'
- 'date'
- 'time'
- 'file'
- 'md5'
- 'sha1'
when@test: *dev

View File

@@ -7,15 +7,5 @@ services:
Psr\Http\Message\UploadedFileFactoryInterface: '@nyholm.psr7.psr17_factory' Psr\Http\Message\UploadedFileFactoryInterface: '@nyholm.psr7.psr17_factory'
Psr\Http\Message\UriFactoryInterface: '@nyholm.psr7.psr17_factory' Psr\Http\Message\UriFactoryInterface: '@nyholm.psr7.psr17_factory'
# Register nyholm/psr7 services for autowiring with HTTPlug factories
Http\Message\MessageFactory: '@nyholm.psr7.httplug_factory'
Http\Message\RequestFactory: '@nyholm.psr7.httplug_factory'
Http\Message\ResponseFactory: '@nyholm.psr7.httplug_factory'
Http\Message\StreamFactory: '@nyholm.psr7.httplug_factory'
Http\Message\UriFactory: '@nyholm.psr7.httplug_factory'
nyholm.psr7.psr17_factory: nyholm.psr7.psr17_factory:
class: Nyholm\Psr7\Factory\Psr17Factory class: Nyholm\Psr7\Factory\Psr17Factory
nyholm.psr7.httplug_factory:
class: Nyholm\Psr7\Factory\HttplugFactory

View File

@@ -1,8 +0,0 @@
# As of Symfony 5.1, deprecations are logged in the dedicated "deprecation" channel when it exists
#monolog:
# channels: [deprecation]
# handlers:
# deprecation:
# type: stream
# channels: [deprecation]
# path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log"

View File

@@ -1,20 +0,0 @@
doctrine:
orm:
auto_generate_proxy_classes: false
metadata_cache_driver:
type: pool
pool: doctrine.system_cache_pool
query_cache_driver:
type: pool
pool: doctrine.system_cache_pool
result_cache_driver:
type: pool
pool: doctrine.result_cache_pool
framework:
cache:
pools:
doctrine.result_cache_pool:
adapter: cache.app
doctrine.system_cache_pool:
adapter: cache.system

View File

@@ -0,0 +1,9 @@
lexik_jwt_authentication:
# in production, the secret must be located in an environment variable
# for converting the file to a raw variable, use this command:
#
# cat path/to/private_or_public.pem | base64 -w0
#
# then copy past the printed string into the dedicated environment variable
secret_key: '%env(base64:resolve:JWT_SECRET_KEY)%'
public_key: '%env(base64:resolve:JWT_PUBLIC_KEY)%'

View File

@@ -25,6 +25,7 @@ monolog:
id: monolog.gelf_handler id: monolog.gelf_handler
level: info level: info
channels: ['!event', '!php'] channels: ['!event', '!php']
excluded_http_codes: [404, 405]
console: console:
type: console type: console

View File

@@ -1,3 +0,0 @@
framework:
router:
strict_requirements: null

View File

@@ -1,4 +0,0 @@
#webpack_encore:
# Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
# Available in version 1.2
#cache: true

View File

@@ -5,3 +5,8 @@ framework:
# Configure how to generate URLs in non-HTTP contexts, such as CLI commands. # Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
# See https://symfony.com/doc/current/routing.html#generating-urls-in-commands # See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
#default_uri: http://localhost #default_uri: http://localhost
when@prod:
framework:
router:
strict_requirements: null

View File

@@ -1,66 +1,40 @@
security: security:
enable_authenticator_manager: true
access_decision_manager: # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
strategy: unanimous password_hashers:
allow_if_all_abstain: false Chill\MainBundle\Entity\User: 'auto'
Symfony\Component\Security\Core\User\User: plaintext
# https://symfony.com/doc/current/security.html#where-do-users-come-from-user-providers Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
# https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider
providers: providers:
# providers added by chill-bundles recipes
chain_provider: # those providers are required to make chill working
chain : chill_chain_provider:
providers: [in_memory, users] chain:
in_memory: providers: [chill_in_memory, chill_users]
chill_in_memory:
memory: memory:
users: users:
admin: { password: '%env(resolve:ADMIN_PASSWORD)%', roles: ['ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH', 'ROLE_USER'] } admin: { password: '%env(resolve:ADMIN_PASSWORD)%', roles: ['ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH', 'ROLE_USER'] }
users: chill_users:
id: chill.main.user_provider id: chill.main.user_provider
# end of providers added by chill-bundles recipes
# all other providers might be removed, unless you have specific needs
# TODO AFTER CHILL-BUNDLES RECIPES INSTALL: remove the user providers which are not used
encoders:
Chill\MainBundle\Entity\User:
algorithm: bcrypt
Symfony\Component\Security\Core\User\User: plaintext
firewalls:
dev:
pattern: ^/(_(profiler|wdt)|css|images|js)/
security: false
default:
anonymous: ~
provider: chain_provider
form_login:
csrf_parameter: _csrf_token
csrf_token_id: authenticate
#csrf_provider: security.csrf.token_manager
logout_on_user_change: true
logout:
path: /logout
# uncomment to enable impersonate mode in Chill
# https://symfony.com/doc/current/security/impersonating_user.html
switch_user: true
# activate different ways to authenticate
# https://symfony.com/doc/current/security.html#firewalls-authentication
# Easy way to control access for large sections of your site # Easy way to control access for large sections of your site
# Note: Only the *first* access control that matches will be used # Note: Only the *first* access control that matches will be used
access_control:
- { path: ^/saml/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } when@test:
- { path: ^/saml/metadata, roles: IS_AUTHENTICATED_ANONYMOUSLY } security:
- { path: ^/(login|logout), roles: IS_AUTHENTICATED_ANONYMOUSLY } password_hashers:
- { path: ^/public, roles: IS_AUTHENTICATED_ANONYMOUSLY } # By default, password hashers are resource intensive and take time. This is
- { path: ^/wopi, roles: IS_AUTHENTICATED_ANONYMOUSLY } # important to generate secure password hashes. In tests however, secure hashes
# access for homepage, the homepage redirect admin to admin section # are not important, waste resources and increase test times. The following
- { path: ^/$, roles: [ IS_AUTHENTICATED_REMEMBERED ] } # reduces the work factor to the lowest possible values.
- { path: ^/homepage$, roles: [ IS_AUTHENTICATED_REMEMBERED ] } Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
# idem algorithm: auto
- { path: ^/([a-z]+/)?homepage, roles: [ IS_AUTHENTICATED_REMEMBERED ] } cost: 4 # Lowest possible value for bcrypt
# admin section, only for admin time_cost: 3 # Lowest possible value for argon
- { path: ^/([a-z]+/)?admin, roles: ROLE_ADMIN } memory_cost: 10 # Lowest possible value for argon
# other pages, only for regular user (no admin)
- { path: ^/, roles: ROLE_USER }

View File

@@ -0,0 +1,50 @@
security:
access_decision_manager:
strategy: unanimous
allow_if_all_abstain: false
firewalls:
dev:
pattern: ^/(_(profiler|wdt)|css|images|js)/
security: false
wopi:
pattern: ^/wopi
provider: chill_chain_provider
stateless: true
guard:
authenticators:
- lexik_jwt_authentication.jwt_token_authenticator
chill_main:
# remove during upgrade from symfony 4 to symfony 5 TODO check this
#anonymous: ~
provider: chill_chain_provider
form_login:
csrf_parameter: _csrf_token
csrf_token_id: authenticate
#csrf_provider: security.csrf.token_manager
# remove during upgrade from symfony 4 to symfony 5 TODO check this
# logout_on_user_change: true
logout:
path: /logout
# uncomment to enable impersonate mode in Chill
# https://symfony.com/doc/current/security/impersonating_user.html
switch_user: true
# activate different ways to authenticate
# https://symfony.com/doc/current/security.html#firewalls-authentication
# Easy way to control access for large sections of your site
# Note: Only the *first* access control that matches will be used
access_control:
- { path: ^/(login|logout), roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/public, roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/wopi, roles: IS_AUTHENTICATED_FULLY }
# access for homepage, the homepage redirect admin to admin section
- { path: ^/$, roles: [ IS_AUTHENTICATED_REMEMBERED ] }
- { path: ^/homepage$, roles: [ IS_AUTHENTICATED_REMEMBERED ] }
# idem
- { path: ^/([a-z]+/)?homepage, roles: [ IS_AUTHENTICATED_REMEMBERED ] }
# admin section, only for admin
- { path: ^/([a-z]+/)?admin, roles: ROLE_ADMIN }
# other pages, only for regular user (no admin)
- { path: ^/, roles: ROLE_USER }

View File

@@ -1,3 +0,0 @@
swiftmailer:
url: '%env(MAILER_URL)%'
spool: { type: 'memory' }

View File

View File

@@ -1,5 +0,0 @@
---
chill_main:
available_languages:
- 'fr'
- 'en'

View File

@@ -1,6 +0,0 @@
framework:
test: true
session:
storage_id: session.storage.mock_file
assets:
json_manifest_path: NULL

View File

@@ -1,12 +0,0 @@
monolog:
handlers:
main:
type: fingers_crossed
action_level: error
handler: nested
excluded_http_codes: [404, 405]
channels: ["!event"]
nested:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug

View File

@@ -1,2 +0,0 @@
imports:
- { resource: ../dev/nelmio_alice.yaml }

View File

@@ -1,8 +1,5 @@
--- ---
# config/packages/test/security.yaml # config/packages/test/security.yaml
security: security:
firewalls:
default:
http_basic: ~
role_hierarchy: role_hierarchy:
CHILL_MASTER_ROLE: [CHILL_INHERITED_ROLE_1] CHILL_MASTER_ROLE: [CHILL_INHERITED_ROLE_1]

View File

@@ -1,2 +0,0 @@
swiftmailer:
disable_delivery: true

View File

@@ -1,2 +0,0 @@
twig:
strict_variables: true

View File

@@ -1,3 +0,0 @@
framework:
validation:
not_compromised_password: false

View File

@@ -1,6 +0,0 @@
web_profiler:
toolbar: false
intercept_redirects: false
framework:
profiler: { collect: false }

View File

@@ -1,2 +0,0 @@
webpack_encore:
strict_mode: false

View File

@@ -1,7 +1,6 @@
framework: framework:
default_locale: '%env(resolve:LOCALE)%' default_locale: '%env(resolve:LOCALE)%'
translator: translator:
default_path: '%kernel.project_dir%/translations' default_path: '%kernel.project_dir%/translations'
fallbacks: [ '%env(resolve:LOCALE)%' ] fallbacks: [ '%env(resolve:LOCALE)%' ]
providers:

View File

@@ -1,17 +1,5 @@
twig: twig:
default_path: '%kernel.project_dir%/templates' default_path: '%kernel.project_dir%/templates'
debug: '%kernel.debug%' when@test:
strict_variables: '%kernel.debug%' twig:
exception_controller: null strict_variables: true
## In Symfony 5, bootstrap_5 theme is supported. But not yet in sf4 !!
# see sf5 https://symfony.com/doc/current/form/form_themes.html
# see sf4 https://symfony.com/doc/4.4/form/form_themes.html
#
# While waiting for the upgrade, we get the form theme file
# (https://github.com/symfony/symfony/tree/5.4/src/Symfony/Bridge/Twig/Resources/views/Form),
# put it in ChillMainBundle/Resources/views/Form/bootstrap5/
# and adapt it lightly.
#
form_themes: ['@ChillMain/Form/bootstrap5/bootstrap_5_horizontal_layout.html.twig']
#form_themes: ['bootstrap_5_horizontal_layout.html.twig']

View File

@@ -0,0 +1,16 @@
twig:
## In Symfony 5, bootstrap_5 theme is supported. But not yet in sf4 !!
# see sf5 https://symfony.com/doc/current/form/form_themes.html
# see sf4 https://symfony.com/doc/4.4/form/form_themes.html
#
# While waiting for the upgrade, we get the form theme file
# (https://github.com/symfony/symfony/tree/5.4/src/Symfony/Bridge/Twig/Resources/views/Form),
# put it in ChillMainBundle/Resources/views/Form/bootstrap5/
# and adapt it lightly.
#
form_themes: ['@ChillMain/Form/bootstrap5/bootstrap_5_horizontal_layout.html.twig']
when@dev:
twig:
globals:
responsive_debug: false

View File

@@ -6,3 +6,8 @@ framework:
# For instance, basic validation constraints will be inferred from Doctrine's metadata. # For instance, basic validation constraints will be inferred from Doctrine's metadata.
#auto_mapping: #auto_mapping:
# App\Entity\: [] # App\Entity\: []
when@test:
framework:
validation:
not_compromised_password: false

View File

@@ -0,0 +1,15 @@
when@dev:
web_profiler:
toolbar: true
intercept_redirects: false
framework:
profiler: { only_exceptions: false }
when@test:
web_profiler:
toolbar: false
intercept_redirects: false
framework:
profiler: { collect: false }

View File

@@ -1,16 +1,18 @@
---
webpack_encore: webpack_encore:
# The path where Encore is building the assets - i.e. Encore.setOutputPath() # The path where Encore is building the assets - i.e. Encore.setOutputPath()
output_path: '%kernel.project_dir%/public/build' output_path: '%kernel.project_dir%/public/build'
# If multiple builds are defined (as shown below), you can disable the default build: # If multiple builds are defined (as shown below), you can disable the default build:
# output_path: false # output_path: false
# Set attributes that will be rendered on all script and link tags # Set attributes that will be rendered on all script and link tags
script_attributes: script_attributes:
defer: true defer: true
# Uncomment (also under link_attributes) if using Turbo Drive
# https://turbo.hotwired.dev/handbook/drive#reloading-when-assets-change
# 'data-turbo-track': reload
# link_attributes: # link_attributes:
# # Uncomment if using Turbo Drive
# 'data-turbo-track': reload
# If using Encore.enableIntegrityHashes() and need the crossorigin attribute (default: false, or use 'anonymous' or 'use-credentials') # If using Encore.enableIntegrityHashes() and need the crossorigin attribute (default: false, or use 'anonymous' or 'use-credentials')
# crossorigin: 'anonymous' # crossorigin: 'anonymous'
@@ -23,11 +25,17 @@ webpack_encore:
# If you have multiple builds: # If you have multiple builds:
# builds: # builds:
# pass "frontend" as the 3rg arg to the Twig functions # pass the build name as the 3rd argument to the Twig functions
# {{ encore_entry_script_tags('entry1', null, 'frontend') }} # {{ encore_entry_script_tags('entry1', null, 'frontend') }}
# frontend: '%kernel.project_dir%/public/frontend/build' # frontend: '%kernel.project_dir%/public/frontend/build'
# Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes) #when@prod:
# Put in config/packages/prod/webpack_encore.yaml # webpack_encore:
# cache: true # # Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
# # Available in version 1.2
# cache: true
#when@test:
# webpack_encore:
# strict_mode: false

View File

@@ -1,3 +1,3 @@
wopi: wopi:
server: "%env(resolve:WOPI_SERVER)%" server: "%env(resolve:WOPI_SERVER)%"
access_token_ttl: 0 enable_lock: false

View File

@@ -11,6 +11,9 @@ framework:
fr: 'Suivi' fr: 'Suivi'
support_strategy: Chill\MainBundle\Workflow\RelatedEntityWorkflowSupportsStrategy support_strategy: Chill\MainBundle\Workflow\RelatedEntityWorkflowSupportsStrategy
initial_marking: 'initial' initial_marking: 'initial'
marking_store:
property: step
type: method
places: places:
initial: initial:
metadata: metadata:

5
config/preload.php Normal file
View File

@@ -0,0 +1,5 @@
<?php
if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
}

View File

@@ -1,3 +1,3 @@
chill_wopi_bundle: chill_wopi_bundle:
resource: '@ChillWopiBundle/Resources/config/routes/routes.php' resource: '@ChillWopiBundle/Resources/config/routes/routes.php'
prefix: /wopi prefix: /chill/wopi

View File

@@ -1,3 +0,0 @@
_errors:
resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
prefix: /_error

View File

@@ -1,7 +0,0 @@
web_profiler_wdt:
resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
prefix: /_wdt
web_profiler_profiler:
resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
prefix: /_profiler

View File

@@ -0,0 +1,4 @@
when@dev:
_errors:
resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
prefix: /_error

View File

@@ -0,0 +1,8 @@
when@dev:
web_profiler_wdt:
resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
prefix: /_wdt
web_profiler_profiler:
resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
prefix: /_profiler

View File

@@ -2,7 +2,7 @@
# Files in the packages/ subdirectory configure your dependencies. # Files in the packages/ subdirectory configure your dependencies.
# Put parameters here that don't need to change on each machine where the app is deployed # Put parameters here that don't need to change on each machine where the app is deployed
# https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
parameters: parameters:
services: services:
@@ -19,13 +19,6 @@ services:
- '../src/DependencyInjection/' - '../src/DependencyInjection/'
- '../src/Entity/' - '../src/Entity/'
- '../src/Kernel.php' - '../src/Kernel.php'
- '../src/Tests/'
# controllers are imported separately to make sure services can be injected
# as action arguments even if you don't extend any base controller class
App\Controller\:
resource: '../src/Controller/'
tags: ['controller.service_arguments']
# add more service definitions when explicit configuration is needed # add more service definitions when explicit configuration is needed
# please note that last definitions always *replace* previous ones # please note that last definitions always *replace* previous ones
@@ -36,15 +29,7 @@ services:
resource: '../src/Service/' resource: '../src/Service/'
Chill\WopiBundle\Service\Wopi\ChillWopi:
decorates: ChampsLibres\WopiLib\Contract\Service\WopiInterface
arguments:
$cache: '@cache.user_data'
ChampsLibres\WopiLib\Service\DocumentLockManager: ChampsLibres\WopiLib\Service\DocumentLockManager:
arguments: arguments:
$cache: '@cache.user_data' $cache: '@cache.user_data'
App\Service\Wopi\NullProofValidator:
decorates: ChampsLibres\WopiLib\Contract\Service\ProofValidatorInterface

View File

@@ -8,7 +8,7 @@ services:
args: args:
UID: ${PHP_FPM_USER:-1000} UID: ${PHP_FPM_USER:-1000}
# uncomment and set your own image if needed # uncomment and set your own image if needed
image: ${IMAGE_PHP-chill_php}:${VERSION:-latest} image: ${IMAGE_PHP-chill_php82}:${VERSION:-latest}
volumes: volumes:
- .:/var/www/app - .:/var/www/app
environment: environment:

View File

@@ -22,6 +22,14 @@ services:
- DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8 - DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8
links: links:
- smtp - smtp
- dumper
dumper:
image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:latest
entrypoint: ["/usr/bin/env"]
command: ["bin/var-dump-server", "--host", "0.0.0.0:9912"]
volumes:
- .:/var/www/app
nginx: nginx:
volumes: volumes:

View File

@@ -10,7 +10,7 @@ services:
args: args:
UID: ${PHP_FPM_USER:-1000} UID: ${PHP_FPM_USER:-1000}
# uncomment and set your own image if needed # uncomment and set your own image if needed
image: ${IMAGE_PHP-chill_php}:${VERSION:-latest} image: ${IMAGE_PHP-chill_php82}:${VERSION:-latest}
# #
# normally, you should not mount any volume and use your own image # normally, you should not mount any volume and use your own image
# #

View File

@@ -8,7 +8,7 @@ services:
args: args:
UID: ${PHP_FPM_USER:-1000} UID: ${PHP_FPM_USER:-1000}
# uncomment and set your own image if needed # uncomment and set your own image if needed
image: ${IMAGE_PHP:-chill_php}:${VERSION:-latest} image: ${IMAGE_PHP:-chill_php82}:${VERSION:-latest}
volumes: volumes:
- .:/var/www/app - .:/var/www/app
environment: environment:

View File

@@ -18,4 +18,4 @@ docker run \
--volume ${PWD}:/app \ --volume ${PWD}:/app \
--workdir /app \ --workdir /app \
--env YARN_CACHE_FOLDER=/app/.yarncache \ --env YARN_CACHE_FOLDER=/app/.yarncache \
node:16 ${cmd} node:20 ${cmd}

View File

@@ -36,6 +36,13 @@ fi
if [ "${APP_ENV}" = "prod" ]; then if [ "${APP_ENV}" = "prod" ]; then
composer dump-env "${APP_ENV}" composer dump-env "${APP_ENV}"
chmod +r /var/www/app/.env.local.php chmod +r /var/www/app/.env.local.php
if [ "${PREVENT_MIGRATIONS}" != "true" ]; then
php /var/www/app/bin/console doctrine:migrations:status
php /var/www/app/bin/console doctrine:migrations:migrate -n
php /var/www/app/bin/console messenger:setup-transports
php /var/www/app/bin/console chill:db:sync-views
fi
fi fi
if [ "${CLEAR_CACHE}" != "false" ]; then if [ "${CLEAR_CACHE}" != "false" ]; then
@@ -45,11 +52,5 @@ if [ "${CLEAR_CACHE}" != "false" ]; then
chgrp ${PHP_FPM_GROUP} /var/www/app/var/log -R && chmod g+rw /var/www/app/var/log -R chgrp ${PHP_FPM_GROUP} /var/www/app/var/log -R && chmod g+rw /var/www/app/var/log -R
fi fi
if [ "${PREVENT_MIGRATIONS}" != "true" ]; then
php /var/www/app/bin/console doctrine:migrations:status
php /var/www/app/bin/console doctrine:migrations:migrate -n
php /var/www/app/bin/console messenger:setup-transports
fi
exec "${@}" exec "${@}"

View File

@@ -3,6 +3,9 @@
"vendor/chill-project/chill-bundles" "vendor/chill-project/chill-bundles"
], ],
"private": true, "private": true,
"devDependencies": {
"bootstrap": "5.2.3"
},
"scripts": { "scripts": {
"specs-build": "yaml-merge vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillPersonBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml", "specs-build": "yaml-merge vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillPersonBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
"specs-validate": "swagger-cli validate templates/api/specs.yaml", "specs-validate": "swagger-cli validate templates/api/specs.yaml",

8
phpstan.dist.neon Normal file
View File

@@ -0,0 +1,8 @@
parameters:
level: 6
paths:
- bin/
- config/
- public/
- src/
- tests/

Some files were not shown because too many files have changed in this diff Show More