From 895d72daffe00fbfdb8ccc198f638816cc3ce875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <kevin@dunglas.fr>
Date: Fri, 5 Aug 2022 14:37:06 +0200
Subject: [PATCH] chore: minor improvements and sync with API Platform (#277)

---
 .dockerignore                   | 18 ++++++++++--------
 .editorconfig                   |  6 +-----
 docker-compose.override.yml     |  5 ++---
 docker/php/docker-entrypoint.sh |  2 --
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index eed80d3..3225cf9 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,9 @@
 **/*.log
 **/*.md
 **/*.php~
+**/*.dist.php
+**/*.dist
+**/*.cache
 **/._*
 **/.dockerignore
 **/.DS_Store
@@ -14,15 +17,14 @@
 **/docker-compose.yml
 **/Dockerfile
 **/Thumbs.db
+.github/
+docs/
+public/bundles/
+tests/
+var/
+vendor/
 .editorconfig
 .env.*.local
 .env.local
 .env.local.php
-.php_cs.cache
-bin/*
-!bin/console
-docker/db/data/
-helm/
-public/bundles/
-var/
-vendor/
+.env.test
diff --git a/.editorconfig b/.editorconfig
index b918331..3ac9219 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,7 +15,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{js,html}]
+[*.{js,html,ts,tsx}]
 indent_style = space
 indent_size = 2
 
@@ -43,10 +43,6 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = false
 
-[api/helm/api/**.yaml]
-indent_style = space
-indent_size = 2
-
 [.github/workflows/*.yml]
 indent_style = space
 indent_size = 2
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index e8daee3..190e87b 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -8,9 +8,8 @@ services:
     volumes:
       - ./:/srv/app
       - ./docker/php/conf.d/app.dev.ini:/usr/local/etc/php/conf.d/app.dev.ini:ro
-      # If you develop on Mac or Windows you can remove the var/ and vendor/ directories 
-      #  from the bind-mount for better performance by enabling the next 2 lines:
-      #- /srv/app/var
+      # If you develop on Mac or Windows you can remove the vendor/ directory
+      #  from the bind-mount for better performance by enabling the next line:
       #- /srv/app/vendor
     environment:
       # See https://xdebug.org/docs/all_settings#mode 
diff --git a/docker/php/docker-entrypoint.sh b/docker/php/docker-entrypoint.sh
index 43b44a8..0884add 100755
--- a/docker/php/docker-entrypoint.sh
+++ b/docker/php/docker-entrypoint.sh
@@ -7,8 +7,6 @@ if [ "${1#-}" != "$1" ]; then
 fi
 
 if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
-	mkdir -p var/cache var/log
-
 	# Install the project the first time PHP is started
 	# After the installation, the following block can be deleted
 	if [ ! -f composer.json ]; then