Commitd994766

committed

Merge branch '4.4' into 5.0

* 4.4: Update testing.rst Update database.rst Update upload_file.rst Update sessions.rst

2 parentsd2c63d4 +14e7dae commitd994766Copy full SHA for d994766

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,9 @@ the following API which is intended mainly for internal purposes:`
`151`	`151`	:method:`Symfony\\Component\\HttpFoundation\\Session\\SessionBagInterface::getName`
`152`	`152`	`Returns the name of the session bag.`
`153`	`153`
	`154`	+:method:`Symfony\\Component\\HttpFoundation\\Session\\SessionBagInterface::clear`
	`155`	`+ Clears out data from bag.`
	`156`	`+`
`154`	`157`	`.. _attribute-bag-interface:`
`155`	`158`
`156`	`159`	`Attributes`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ Then, define a service for this class:`
`309`	`309`	`https://symfony.com/schema/dic/services/services-1.0.xsd">`
`310`	`310`	`<!-- ...-->`
`311`	`311`
`312`		`- <serviceid="App\FileUploader">`
	`312`	`+ <serviceid="App\Service\FileUploader">`
`313`	`313`	`<argument>%brochures_directory%</argument>`
`314`	`314`	`</service>`
`315`	`315`	`</container>`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ first register a new handler service with your database credentials:`
`204`	`204`
`205`	`205`	`<services>`
`206`	`206`	`<serviceid="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler"public="false">`
`207`		`- <argument>env(DATABASE_URL)</argument>`
	`207`	`+ <argument>%env(DATABASE_URL)%</argument>`
`208`	`208`
`209`	`209`	`<!-- you can also use PDO configuration, but requires passing two arguments:-->`
`210`	`210`	`<!-- <argument>mysql:dbname=mydatabase, host=myhost</argument>`
@@ -296,7 +296,7 @@ passed to the ``PdoSessionHandler`` service:
`296`	`296`
`297`	`297`	`<services>`
`298`	`298`	`<serviceid="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler"public="false">`
`299`		`- <argument>env(DATABASE_URL)</argument>`
	`299`	`+ <argument>%env(DATABASE_URL)%</argument>`
`300`	`300`	`<argumenttype="collection">`
`301`	`301`	`<argumentkey="db_table">customer_session</argument>`
`302`	`302`	`<argumentkey="db_id_col">guid</argument>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ of your application::`
`100`	`100`	`..note::`
`101`	`101`
`102`	`102`	By convention, the ``tests/`` directory should replicate the directory
`103`		`- of yourbundle for unit tests. So, if you're testing a class in the`
	`103`	`+ of yourapplication for unit tests. So, if you're testing a class in the`
`104`	`104`	``src/Util/`` directory, put the test in the ``tests/Util/``
`105`	`105`	`directory.`
`106`	`106`

Comments

(0)