Skip to content

Commit d994766

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Update testing.rst Update database.rst Update upload_file.rst Update sessions.rst
2 parents d2c63d4 + 14e7dae commit d994766

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

components/http_foundation/sessions.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ the following API which is intended mainly for internal purposes:
151151
:method:`Symfony\\Component\\HttpFoundation\\Session\\SessionBagInterface::getName`
152152
Returns the name of the session bag.
153153

154+
:method:`Symfony\\Component\\HttpFoundation\\Session\\SessionBagInterface::clear`
155+
Clears out data from bag.
156+
154157
.. _attribute-bag-interface:
155158

156159
Attributes

controller/upload_file.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ Then, define a service for this class:
309309
https://symfony.com/schema/dic/services/services-1.0.xsd">
310310
<!-- ... -->
311311
312-
<service id="App\FileUploader">
312+
<service id="App\Service\FileUploader">
313313
<argument>%brochures_directory%</argument>
314314
</service>
315315
</container>

session/database.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ first register a new handler service with your database credentials:
204204
205205
<services>
206206
<service id="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" public="false">
207-
<argument>env(DATABASE_URL)</argument>
207+
<argument>%env(DATABASE_URL)%</argument>
208208
209209
<!-- you can also use PDO configuration, but requires passing two arguments: -->
210210
<!-- <argument>mysql:dbname=mydatabase, host=myhost</argument>
@@ -296,7 +296,7 @@ passed to the ``PdoSessionHandler`` service:
296296
297297
<services>
298298
<service id="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" public="false">
299-
<argument>env(DATABASE_URL)</argument>
299+
<argument>%env(DATABASE_URL)%</argument>
300300
<argument type="collection">
301301
<argument key="db_table">customer_session</argument>
302302
<argument key="db_id_col">guid</argument>

testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ of your application::
100100
.. note::
101101

102102
By convention, the ``tests/`` directory should replicate the directory
103-
of your bundle for unit tests. So, if you're testing a class in the
103+
of your application for unit tests. So, if you're testing a class in the
104104
``src/Util/`` directory, put the test in the ``tests/Util/``
105105
directory.
106106

0 commit comments

Comments
 (0)