Skip to content
This repository has been archived by the owner on Feb 16, 2021. It is now read-only.

Commit

Permalink
Merge pull request #191 from jonasdekeukelaere/76-paramaters
Browse files Browse the repository at this point in the history
Use parameters notation like Fork
  • Loading branch information
jonasdekeukelaere authored Aug 11, 2017
2 parents 3c0fa36 + 830f062 commit 495b1fa
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
before_script:
- composer self-update
- mysql -e 'create database app_test'
- "sed 's/database_name:*/database_name: app_test/' app/config/parameters.yml.dist | sed 's/database_user:*/database_user: root/' | sed 's/database_password:*/database_password:/' > app/config/parameters.yml"
- "sed 's/database.name:*/database.name: app_test/' app/config/parameters.yml.dist | sed 's/database.user:*/database.user: root/' | sed 's/database.password:*/database.password:/' > app/config/parameters.yml"
- composer install --prefer-source --no-interaction --no-scripts
- composer run-script post-travis
- php app/console doctrine:migration:migrate --env=test --no-interaction
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [8.0.0]
### Changes
* Update parameters like Fork

## [7.0.0]
### Changes
* Convert CoffeeScript to EcmaScript 6
Expand Down
22 changes: 11 additions & 11 deletions app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ twig:
# Doctrine Configuration
doctrine:
dbal:
driver: "%database_driver%"
host: "%database_host%"
port: "%database_port%"
dbname: "%database_name%"
user: "%database_user%"
password: "%database_password%"
driver: "%database.driver%"
host: "%database.host%"
port: "%database.port%"
dbname: "%database.name%"
user: "%database.user%"
password: "%database.password%"
charset: UTF8MB4
server_version: "%database_version%"
server_version: "%database.version%"
types:
user_status: SumoCoders\FrameworkMultiUserBundle\DBALType\StatusType

Expand Down Expand Up @@ -171,10 +171,10 @@ knp_paginator:

# Swiftmailer
swiftmailer:
transport: "%mailer_transport%"
host: "%mailer_host%"
username: "%mailer_user%"
password: "%mailer_password%"
transport: "%mailer.transport%"
host: "%mailer.host%"
username: "%mailer.user%"
password: "%mailer.password%"

# Translation configuration
jms_translation:
Expand Down
34 changes: 17 additions & 17 deletions app/config/parameters.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ parameters:
debug_email:

# Database configuration
database_driver: pdo_mysql
database_host: 127.0.0.1
database_port: null
database_name:
database_user:
database_password:
database_version: 5.5
database.driver: pdo_mysql
database.host: 127.0.0.1
database.port: null
database.name:
database.user:
database.password:
database.version: 5.5

# Mail configuration
mailer_transport: mail
mailer_host: mail.hostbots.be
mailer_user:
mailer_password:
mailer_default_sender_name:
mailer_default_sender_email:
mailer_default_to_name:
mailer_default_to_email:
mailer_default_reply_to_name: "%mailer_default_sender_name%"
mailer_default_reply_to_email:
mailer.transport: mail
mailer.host: mail.hostbots.be
mailer.user:
mailer.password:
mailer.default_sender_name:
mailer.default_sender_email:
mailer.default_to_name:
mailer.default_to_email:
mailer.default_reply_to_name: "%mailer.default_sender_name%"
mailer.default_reply_to_email:

# Locale configuration
locales:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"tijsverkoyen/css-to-inline-styles": "^2.0",
"jms/di-extra-bundle": "^1.7",
"sumocoders/framework-search-bundle": "^4.0.0",
"sumocoders/framework-example-bundle": "^5.0.0",
"sumocoders/framework-multi-user-bundle": "^5.0.0",
"sumocoders/framework-example-bundle": "^7.0.0",
"sumocoders/framework-multi-user-bundle": "^6.0.0",
"knplabs/knp-paginator-bundle": "^2.5",
"simple-bus/symfony-bridge": "^4.1",
"simple-bus/doctrine-orm-bridge": "^4.0",
Expand Down
22 changes: 11 additions & 11 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ services:
- "mails/default_email.html.twig"
- "%kernel.root_dir%/../web/assets/css/mail.css"
calls:
- [setDefaultSender, ["%mailer_default_sender_email%", "%mailer_default_sender_name%"]]
- [setDefaultReplyTo, ["%mailer_default_reply_to_email%", "%mailer_default_reply_to_name%"]]
- [setDefaultTo, ["%mailer_default_to_email%", "%mailer_default_to_name%"]]
- [setDefaultSender, ["%mailer.default_sender_email%", "%mailer.default_sender_name%"]]
- [setDefaultReplyTo, ["%mailer.default_reply_to_email%", "%mailer.default_reply_to_name%"]]
- [setDefaultTo, ["%mailer.default_to_email%", "%mailer.default_to_name%"]]

sumocoders_form_type_fieldset:
class: SumoCoders\FrameworkCoreBundle\Form\Type\FieldsetType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ Depending on the environment you should give other answers:
### Staging

* debug_email: null
* database_driver: pdo_mysql
* database_host: 127.0.0.1
* database_port: null
* database_name: the name of the database you created
* database_user: the user for the database you created
* database_password: the password for the database you created
* mailer_transport: mail
* database.driver: pdo_mysql
* database.host: 127.0.0.1
* database.port: null
* database.name: the name of the database you created
* database.user: the user for the database you created
* database.password: the password for the database you created
* mailer.transport: mail
* locales: enter an array with the languages that should be available
* locale: enter the default locale
* secret: this should be a random string
Expand All @@ -103,13 +103,13 @@ Depending on the environment you should give other answers:
### Production

* debug_email: [email protected]
* database_driver: pdo_mysql
* database_host: the host for the database
* database_port: null, unless the database is running on a non-default port
* database_name: the name of the database you created
* database_user: the user for the database you created
* database_password: the password for the database you created
* mailer_transport: mail
* database.driver: pdo_mysql
* database.host: the host for the database
* database.port: null, unless the database is running on a non-default port
* database.name: the name of the database you created
* database.user: the user for the database you created
* database.password: the password for the database you created
* mailer.transport: mail
* locales: enter an array with the languages that should be available
* locale: enter the default locale
* secret: this should be a random string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ $message = $messageFactory->createHtmlMessage(

// set some extra properties, just like you would do with a normal \Swift_Message
$message->setTo(
$this->getParameter('mailer_default_to_email')
$this->getParameter('mailer.default_to_email')
);

// send it
Expand Down

0 comments on commit 495b1fa

Please sign in to comment.