diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DoctrineBundle] Don't mix "user" and "username"

Browse Source 
The Doctrine Bundle refered to "username" in some places and to user in others.
Namely the schema and the DoctrineExtension have been updated to use "user".

I chose user rather than username because Doctrine uses that term itself.
This commit is contained in:
Nils Adermann 2010-02-19 02:54:08 +01:00 committed by Fabien Potencier
parent 1d8a65a1b5
commit 61f3603a7a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Framework/DoctrineBundle/DependencyInjection/DoctrineExtension.php
View File

@ -41,7 +41,7 @@ class DoctrineExtension extends LoaderExtension
* *
* Usage example: * Usage example:
* *
* <doctrine:dbal dbname="sfweb" username="root" /> * <doctrine:dbal dbname="sfweb" user="root" />
* *
* @param array $config A configuration array * @param array $config A configuration array
* *
@ -54,7 +54,7 @@ class DoctrineExtension extends LoaderExtension
$loader = new XmlFileLoader(__DIR__.'/../Resources/config'); $loader = new XmlFileLoader(__DIR__.'/../Resources/config');
$configuration->merge($loader->load($this->resources['dbal'])); $configuration->merge($loader->load($this->resources['dbal']));
foreach (array('dbname', 'host', 'username', 'password', 'path', 'port') as $key) foreach (array('dbname', 'host', 'user', 'password', 'path', 'port') as $key)
{ {
if (isset($config[$key])) if (isset($config[$key]))
{ {

2
src/Symfony/Framework/DoctrineBundle/Resources/config/schema/dic/doctrine/doctrine-1.0.xsd
View File

@ -11,7 +11,7 @@
<xsd:attribute name="dbname" type="xsd:string" /> <xsd:attribute name="dbname" type="xsd:string" />
<xsd:attribute name="host" type="xsd:string" /> <xsd:attribute name="host" type="xsd:string" />
<xsd:attribute name="port" type="xsd:integer" /> <xsd:attribute name="port" type="xsd:integer" />
<xsd:attribute name="username" type="xsd:string" /> <xsd:attribute name="user" type="xsd:string" />
<xsd:attribute name="password" type="xsd:string" /> <xsd:attribute name="password" type="xsd:string" />
<xsd:attribute name="driver" type="xsd:string" /> <xsd:attribute name="driver" type="xsd:string" />
<xsd:attribute name="options" type="xsd:string" /> <xsd:attribute name="options" type="xsd:string" />