Commit 36e7c467 authored by Александр Плохих's avatar Александр Плохих 🌔
Browse files

Merge branch 'STA-931' into STA-959

parents 7eb59d48 4f8aeed5

.env.example

0 → 100644
+33 −0
Original line number Diff line number Diff line 
# In all environments, the following files are loaded if they exist,

# the latter taking precedence over the former:

#

#  * .env                contains default values for the environment variables needed by the app

#  * .env.local          uncommitted file with local overrides

#  * .env.$APP_ENV       committed environment-specific defaults

#  * .env.$APP_ENV.local uncommitted environment-specific overrides

#

# Real environment variables win over .env files.

#

# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.

# https://symfony.com/doc/current/configuration/secrets.html

#

# 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



# --- name for containers ---



# ---------------------------



# ---- data base config -----

#DB_URL="postgresql://db:5432/fenix?serverVersion=16&charset=utf8"



# ---------------------------



# - symfony/framework-bundle -

#APP_ENV=dev

#APP_SECRET=397fa37eb874a2d47f2cac19e2f8802a

# ----------------------------



# ---- symfony/messenger -----

#MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0

# ----------------------------
 
 No newline at end of file

.gitignore

+4 −0
Original line number Diff line number Diff line 
# --- block jetbrains files ---

/.idea/

# -----------------------------



# ------ block env files ------

/.env
 
 No newline at end of file

app/.env

+0 −43
Original line number Diff line number Diff line 
# In all environments, the following files are loaded if they exist,

# the latter taking precedence over the former:

#

#  * .env                contains default values for the environment variables needed by the app

#  * .env.local          uncommitted file with local overrides

#  * .env.$APP_ENV       committed environment-specific defaults

#  * .env.$APP_ENV.local uncommitted environment-specific overrides

#

# Real environment variables win over .env files.

#

# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.

# https://symfony.com/doc/current/configuration/secrets.html

#

# 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



###> symfony/framework-bundle ###

APP_ENV=dev

APP_SECRET=397fa37eb874a2d47f2cac19e2f8802a

###< symfony/framework-bundle ###



###> 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="sqlite:///%kernel.project_dir%/var/data.db"

# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"

# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"

DATABASE_URL="postgresql://db:5432/db?serverVersion=16&charset=utf8"

DATABASE_USER="root"

DATABASE_PASSWORD="root"

###< doctrine/doctrine-bundle ###



###> symfony/messenger ###

# Choose one of the transports below

# MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages

# MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages

MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0

###< symfony/messenger ###



###> symfony/mailer ###

# MAILER_DSN=null://null

###< symfony/mailer ###

app/.gitignore

+2 −2
Original line number Diff line number Diff line 


###> symfony/framework-bundle ###

/.env

/.env.local

/.env.local.php

/.env.*.local
@@ -7,6 +8,7 @@ 
/public/bundles/

/var/

/vendor/

composer.lock

###< symfony/framework-bundle ###



###> phpunit/phpunit ###
@@ -23,5 +25,3 @@ 
/public/assets/

/assets/vendor/

###< symfony/asset-mapper ###
 


.idea

app/config/packages/doctrine.yaml

+3 −3
Original line number Diff line number Diff line 
doctrine:

    dbal:

        url: '%env(resolve:DATABASE_URL)%'

        password: '%env(resolve:DATABASE_PASSWORD)%'

        user: '%env(resolve:DATABASE_USER)%'

        url: '%env(resolve:DB_URL)%'

        user: '%env(resolve:DB_USER)%'

        password: '%env(resolve:DB_PASSWORD)%'



        # IMPORTANT: You MUST configure your server version,

        # either here or in the DATABASE_URL env var (see .env file)