Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactored previous commit, fixed tests
How to upgrade?
For XML configuration files:
* All extensions should now use the config tag (this is just a convention as
the YAML configurations files do not use it anymore):
* The previous change means that the doctrine and security bundles now are
wrapped under a main "config" tag:
<doctrine:config>
<doctrine:orm />
<doctrine:dbal />
</doctrine:config>
<security:config>
<security:acl />
...
</security:config>
For YAML configuration files:
* The main keys have been renamed as follows:
* assetic:config -> assetic
* app:config -> framework
* webprofiler:config -> web_profiler
* doctrine_odm.mongodb -> doctrine_mongo_db
* doctrine:orm -> doctrine: { orm: ... }
* doctrine:dbal -> doctrine: { dbal: ... }
* security:config -> security
* security:acl -> security: { acl: ... }
* twig.config -> twig
* zend.config -> zend- Loading branch information
Showing
68 changed files
with
543 additions
and
510 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 29 additions & 27 deletions
56
...undle/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_multiple_connections.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,35 @@ | ||
| <?xml version="1.0" ?> | ||
|
|
||
| <container xmlns="http://www.symfony-project.org/schema/dic/services" | ||
| <srv:container xmlns="http://www.symfony-project.org/schema/dic/doctrine" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns:doctrine="http://www.symfony-project.org/schema/dic/doctrine" | ||
| xmlns:srv="http://www.symfony-project.org/schema/dic/services" | ||
| xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd | ||
| http://www.symfony-project.org/schema/dic/doctrine http://www.symfony-project.org/schema/dic/doctrine/doctrine-1.0.xsd"> | ||
|
|
||
| <doctrine:dbal> | ||
| <doctrine:connections> | ||
| <doctrine:connection | ||
| name="mysql" | ||
| dbname="mysql_db" | ||
| user="mysql_user" | ||
| password="mysql_s3cr3t" | ||
| unix-socket="/path/to/mysqld.sock" /><!-- --> | ||
| <doctrine:connection | ||
| name="sqlite" | ||
| driver="pdo_sqlite" | ||
| dbname="sqlite_db" | ||
| user="sqlite_user" | ||
| password="sqlite_s3cr3t" | ||
| memory="true" /> | ||
| <doctrine:connection | ||
| name="oci" | ||
| driver="oci8" | ||
| dbname="oracle_db" | ||
| user="oracle_user" | ||
| password="oracle_s3cr3t" | ||
| charset="utf8" /> | ||
| </doctrine:connections> | ||
| </doctrine:dbal> | ||
| </container> | ||
| <config> | ||
| <dbal> | ||
| <connections> | ||
| <connection | ||
| name="mysql" | ||
| dbname="mysql_db" | ||
| user="mysql_user" | ||
| password="mysql_s3cr3t" | ||
| unix-socket="/path/to/mysqld.sock" /><!-- --> | ||
| <connection | ||
| name="sqlite" | ||
| driver="pdo_sqlite" | ||
| dbname="sqlite_db" | ||
| user="sqlite_user" | ||
| password="sqlite_s3cr3t" | ||
| memory="true" /> | ||
| <connection | ||
| name="oci" | ||
| driver="oci8" | ||
| dbname="oracle_db" | ||
| user="oracle_user" | ||
| password="oracle_s3cr3t" | ||
| charset="utf8" /> | ||
| </connections> | ||
| </dbal> | ||
| </config> | ||
| </srv:container> |
Oops, something went wrong.