feat: add .editorconfig and fix indent of some files (#98)
This commit is contained in:
		
							parent
							
								
									5ea2920e2b
								
							
						
					
					
						commit
						e319f76923
					
				
							
								
								
									
										76
									
								
								.editorconfig
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										76
									
								
								.editorconfig
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,76 @@ | ||||
| # EditorConfig helps developers define and maintain consistent | ||||
| # coding styles between different editors and IDEs | ||||
| # editorconfig.org | ||||
| 
 | ||||
| root = true | ||||
| 
 | ||||
| [*] | ||||
| # Change these settings to your own preference | ||||
| indent_style = space | ||||
| indent_size = 4 | ||||
| 
 | ||||
| # We recommend you to keep these unchanged | ||||
| end_of_line = lf | ||||
| charset = utf-8 | ||||
| trim_trailing_whitespace = true | ||||
| insert_final_newline = true | ||||
| 
 | ||||
| [*.{js,html}] | ||||
| indent_style = space | ||||
| indent_size = 2 | ||||
| 
 | ||||
| [*.json] | ||||
| indent_style = space | ||||
| indent_size = 2 | ||||
| 
 | ||||
| [*.md] | ||||
| trim_trailing_whitespace = false | ||||
| 
 | ||||
| [*.php] | ||||
| indent_style = space | ||||
| indent_size = 4 | ||||
| 
 | ||||
| [*.sh] | ||||
| indent_style = tab | ||||
| indent_size = 4 | ||||
| 
 | ||||
| [*.{,.dist}] | ||||
| indent_style = space | ||||
| indent_size = 4 | ||||
| 
 | ||||
| [*.{yaml,yml}] | ||||
| 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 | ||||
| 
 | ||||
| [.gitmodules] | ||||
| indent_style = tab | ||||
| indent_size = 4 | ||||
| 
 | ||||
| [.php_cs{,.dist}] | ||||
| indent_style = space | ||||
| indent_size = 4 | ||||
| 
 | ||||
| [.travis.yml] | ||||
| indent_style = space | ||||
| indent_size = 2 | ||||
| 
 | ||||
| [composer.json] | ||||
| indent_style = space | ||||
| indent_size = 4 | ||||
| 
 | ||||
| [docker-compose{,.*}.{yaml,yml}] | ||||
| indent_style = space | ||||
| indent_size = 2 | ||||
| 
 | ||||
| [Dockerfile] | ||||
| indent_style = tab | ||||
| indent_size = 4 | ||||
| @ -18,7 +18,7 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then | ||||
| 	# The first time volumes are mounted, the project needs to be recreated | ||||
| 	if [ ! -f composer.json ]; then | ||||
| 		composer create-project "symfony/skeleton $SYMFONY_VERSION" tmp --stability=$STABILITY --prefer-dist --no-progress --no-interaction | ||||
|       jq '.extra.symfony.docker=true' tmp/composer.json > tmp/composer.tmp.json | ||||
| 		jq '.extra.symfony.docker=true' tmp/composer.json >tmp/composer.tmp.json | ||||
| 		rm tmp/composer.json | ||||
| 		mv tmp/composer.tmp.json tmp/composer.json | ||||
| 
 | ||||
| @ -32,9 +32,9 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then | ||||
| 	if grep -q DATABASE_URL= .env; then | ||||
| 		echo "Waiting for db to be ready..." | ||||
| 		ATTEMPTS_LEFT_TO_REACH_DATABASE=60 | ||||
|     until [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ] || bin/console doctrine:query:sql "SELECT 1" > /dev/null 2>&1; do | ||||
| 		until [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ] || bin/console doctrine:query:sql "SELECT 1" >/dev/null 2>&1; do | ||||
| 			sleep 1 | ||||
|       ATTEMPTS_LEFT_TO_REACH_DATABASE=$((ATTEMPTS_LEFT_TO_REACH_DATABASE-1)) | ||||
| 			ATTEMPTS_LEFT_TO_REACH_DATABASE=$((ATTEMPTS_LEFT_TO_REACH_DATABASE - 1)) | ||||
| 			echo "Still waiting for db to be ready... Or maybe the db is not reachable. $ATTEMPTS_LEFT_TO_REACH_DATABASE attempts left" | ||||
| 		done | ||||
| 
 | ||||
| @ -45,7 +45,7 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then | ||||
| 			echo "The db is now ready and reachable" | ||||
| 		fi | ||||
| 
 | ||||
|     if ls -A migrations/*.php > /dev/null 2>&1; then | ||||
| 		if ls -A migrations/*.php >/dev/null 2>&1; then | ||||
| 			bin/console doctrine:migrations:migrate --no-interaction | ||||
| 		fi | ||||
| 	fi | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Kévin Dunglas
						Kévin Dunglas