Skip to content

Commit 3fd6e7e

Browse files
committed
updated dependencies, use incenteev-parameters
1 parent 0602046 commit 3fd6e7e

File tree

5 files changed

+361
-287
lines changed

5 files changed

+361
-287
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ web/config.php
1212
app/SymfonyRequirements.php
1313
app/check.php
1414

15-
/bin/
15+
/bin/
16+
/app/config/parameters.yml

app/config/config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ liip_doctrine_cache:
6969
nodes:
7070
type: file_system
7171

72+
cmf_core:
73+
publish_workflow:
74+
enabled: false
75+
7276
cmf_routing:
7377
dynamic:
7478
enabled: true
Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
parameters:
2-
locale: en
3-
locales: [en, de]
4-
secret: 10784a86848b5412b5f7fa644e90ef24e
5-
database_driver: pdo_sqlite
2+
database_driver: pdo_sqlite
63
database_path: '%kernel.root_dir%/app.sqlite'
4+
database_host: null
5+
database_port: null
6+
database_name: null
7+
database_user: null
8+
database_password: null
9+
710
phpcr_backend:
811
type: doctrinedbal
912
connection: doctrine.dbal.default_connection
@@ -14,8 +17,12 @@ parameters:
1417
phpcr_workspace: default
1518
phpcr_user: admin
1619
phpcr_pass: admin
17-
database_host: null
18-
database_port: null
19-
database_name: null
20-
database_user: null
21-
database_password: null
20+
21+
mailer_transport: smtp
22+
mailer_host: 127.0.0.1
23+
mailer_user: ~
24+
mailer_password: ~
25+
26+
locale: en
27+
locales: [en, de]
28+
secret: ThisTokenIsNotSoSecretChangeIt

composer.json

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,29 @@
1414
"symfony/monolog-bundle": "2.3.*",
1515
"symfony/assetic-bundle": "2.3.*",
1616
"sensio/distribution-bundle": "2.3.*",
17-
"doctrine/phpcr-bundle": "1.0.0-beta1",
18-
"doctrine/phpcr-odm": "1.0.0-beta1",
19-
"symfony-cmf/symfony-cmf": "1.0.0-beta1",
20-
"symfony-cmf/simple-cms-bundle": "1.0.0-beta1",
21-
"symfony-cmf/create-bundle": "1.0.0-beta1",
22-
"jackalope/jackalope-doctrine-dbal":"1.0.0-beta1",
17+
"doctrine/phpcr-bundle": "1.0.0-beta2",
18+
"doctrine/phpcr-odm": "1.0.0-beta2",
19+
"symfony-cmf/symfony-cmf": "1.0.0-beta2",
20+
"symfony-cmf/simple-cms-bundle": "1.0.0-beta2",
21+
"symfony-cmf/create-bundle": "1.0.0-beta2",
22+
"jackalope/jackalope-doctrine-dbal":"1.0.0-beta2",
2323
"doctrine/doctrine-bundle": "1.2.*",
2424
"doctrine/doctrine-fixtures-bundle": "2.1.*",
2525
"liip/functional-test-bundle": "1.0.*",
2626
"lunetics/locale-bundle": "2.2.*",
27-
"liip/doctrine-cache-bundle": "1.0.*"
27+
"liip/doctrine-cache-bundle": "1.0.*",
28+
"incenteev/composer-parameter-handler": "~2.0"
2829
},
2930
"scripts": {
3031
"post-install-cmd": [
32+
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
3133
"Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreate",
3234
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
3335
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
3436
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
3537
],
3638
"post-update-cmd": [
39+
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
3740
"Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreate",
3841
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
3942
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
@@ -46,6 +49,11 @@
4649
"extra": {
4750
"symfony-app-dir": "app",
4851
"symfony-web-dir": "web",
49-
"symfony-assets-install": "symlink"
52+
"incenteev-parameters": {
53+
"file": "app/config/parameters.yml"
54+
},
55+
"branch-alias": {
56+
"dev-master": "1.0-dev"
57+
}
5058
}
5159
}

0 commit comments

Comments
 (0)