Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Nicer-looking config keys for Midgard2 database connection
  • Loading branch information
bergie committed Jun 4, 2012
1 parent 71643bd commit 531c786
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions DependencyInjection/DoctrinePHPCRExtension.php
Expand Up @@ -182,13 +182,13 @@ private function loadMidgard2Session(array $session, ContainerBuilder $container
if (isset($session['backend']['config'])) {
// Starting repository with a Midgard2 INI file
$parameters['midgard2.configuration.file'] = $session['backend']['config'];
} else if (isset($session['backend']['dbname'])) {
} else if (isset($session['backend']['db_name'])) {
// Manually configured Midgard2 session
foreach ($session['backend'] as $key => $value) {
if (substr($key, 0, 2) !== 'db') {
if (substr($key, 0, 3) !== 'db_') {
continue;
}
$dbkey = substr($key, 2);
$dbkey = substr($key, 3);
$parameters["midgard2.configuration.db.{$dbkey}"] = $value;
}

Expand All @@ -199,7 +199,7 @@ private function loadMidgard2Session(array $session, ContainerBuilder $container
$parameters['midgard2.configuration.loglevel'] = $session['backend']['loglevel'];
}
} else {
throw new \InvalidArgumentException("You set an invalid Midgard2 PHPCR configuration for session '{$session['name']}'. Please provide a 'config' or 'db' key");
throw new \InvalidArgumentException("You set an invalid Midgard2 PHPCR configuration for session '{$session['name']}'. Please provide a 'config' or 'db_name' key");
}

$factory = $container
Expand Down
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -82,10 +82,10 @@ doctrine_phpcr:
session:
backend:
type: midgard2
dbtype: SQLite
dbname: cmf
dbdir: /tmp
dbinit: true
db_type: SQLite
db_name: cmf
db_dir: /tmp
db_init: true
blobdir: /tmp/cmf-blobs
```

Expand Down

0 comments on commit 531c786

Please sign in to comment.