Skip to content

Commit 79d08fd

Browse files
committed
Merge pull request #2444 from WouterJ/doctrine_add_note
Moved text into a note in book/doctrine
2 parents 6c083c8 + 496b910 commit 79d08fd

File tree

1 file changed

+31
-32
lines changed

1 file changed

+31
-32
lines changed

book/doctrine.rst

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -140,44 +140,43 @@ for you:
140140
collation-server = utf8_general_ci
141141
character-set-server = utf8
142142
143-
Using SQLite
144-
~~~~~~~~~~~~
143+
.. note::
145144

146-
If you want to use SQLite as your database, you need to set the path
147-
where your database file should be stored:
145+
If you want to use SQLite as your database, you need to set the path
146+
where your database file should be stored:
148147

149-
.. configuration-block::
148+
.. configuration-block::
150149

151-
.. code-block:: yaml
150+
.. code-block:: yaml
152151
153-
# app/config/config.yml
154-
doctrine:
155-
dbal:
156-
driver: pdo_sqlite
157-
path: "%kernel.root_dir%/sqlite.db"
158-
charset: UTF8
152+
# app/config/config.yml
153+
doctrine:
154+
dbal:
155+
driver: pdo_sqlite
156+
path: "%kernel.root_dir%/sqlite.db"
157+
charset: UTF8
159158
160-
.. code-block:: xml
159+
.. code-block:: xml
161160
162-
<!-- app/config/config.xml -->
163-
<doctrine:config
164-
driver="pdo_sqlite"
165-
path="%kernel.root_dir%/sqlite.db"
166-
charset="UTF-8"
167-
>
168-
<!-- ... -->
169-
</doctrine:config>
170-
171-
.. code-block:: php
172-
173-
// app/config/config.php
174-
$container->loadFromExtension('doctrine', array(
175-
'dbal' => array(
176-
'driver' => 'pdo_sqlite',
177-
'path' => '%kernel.root_dir%/sqlite.db',
178-
'charset' => 'UTF-8',
179-
),
180-
));
161+
<!-- app/config/config.xml -->
162+
<doctrine:config
163+
driver="pdo_sqlite"
164+
path="%kernel.root_dir%/sqlite.db"
165+
charset="UTF-8"
166+
>
167+
<!-- ... -->
168+
</doctrine:config>
169+
170+
.. code-block:: php
171+
172+
// app/config/config.php
173+
$container->loadFromExtension('doctrine', array(
174+
'dbal' => array(
175+
'driver' => 'pdo_sqlite',
176+
'path' => '%kernel.root_dir%/sqlite.db',
177+
'charset' => 'UTF-8',
178+
),
179+
));
181180
182181
Creating an Entity Class
183182
~~~~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)