Skip to content

Commit

Permalink
Added Incenteev ParameterHandler to ignore the parameters.yml file
Browse files Browse the repository at this point in the history
  • Loading branch information
stof committed Apr 6, 2013
1 parent 086d734 commit 8308995
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,6 +1,7 @@
/web/bundles/ /web/bundles/
/app/bootstrap.php.cache /app/bootstrap.php.cache
/app/cache/* /app/cache/*
/app/config/parameters.yml
/app/logs/* /app/logs/*
/build/ /build/
/vendor/ /vendor/
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -5,6 +5,6 @@ php:
- 5.3 - 5.3
- 5.4 - 5.4


before_script: composer install before_script: composer install -n


script: phpunit -c app script: phpunit -c app
File renamed without changes.
6 changes: 6 additions & 0 deletions composer.json
Expand Up @@ -16,17 +16,20 @@
"sensio/distribution-bundle": "2.2.*", "sensio/distribution-bundle": "2.2.*",
"sensio/framework-extra-bundle": "2.2.*", "sensio/framework-extra-bundle": "2.2.*",
"sensio/generator-bundle": "2.2.*", "sensio/generator-bundle": "2.2.*",
"incenteev/composer-parameter-handler": "~2.0",
"jms/security-extra-bundle": "1.4.*", "jms/security-extra-bundle": "1.4.*",
"jms/di-extra-bundle": "1.3.*" "jms/di-extra-bundle": "1.3.*"
}, },
"scripts": { "scripts": {
"post-install-cmd": [ "post-install-cmd": [
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
], ],
"post-update-cmd": [ "post-update-cmd": [
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
Expand All @@ -40,6 +43,9 @@
"extra": { "extra": {
"symfony-app-dir": "app", "symfony-app-dir": "app",
"symfony-web-dir": "web", "symfony-web-dir": "web",
"incenteev-parameters": {
"file": "app/config/parameters.yml"
},
"branch-alias": { "branch-alias": {
"dev-master": "2.3-dev" "dev-master": "2.3-dev"
} }
Expand Down
52 changes: 51 additions & 1 deletion composer.lock

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

0 comments on commit 8308995

Please sign in to comment.