symfony/symfony-docsPublic

NotificationsYou must be signed in to change notification settings
Fork5.3k
Star2.3k

Commitc53d9d6

committed

Merge branch '2.5'

* 2.5: (39 commits) use relative path to page fix xml to specify a method replaced old way of specifying http method by the new one Fixing a mistake Fix use mistakes. [#3944] Tiny addition to mention multiple connections Update dbal.rst [#3888] Changing base template title back [Components] consistent & complete config examples Check for api_key in request Update api_key_authentication.rst - POST Method Fixed typos Fixed typos Added link to JSFiddle example some minor improvements describe the usage of the RegisterListenersPass Update deployment-tools.rst Rewrote Extension & Configuration docs add order of translation formats Fix class name in ConsoleTerminateListener example ...

2 parentse2f13a4 +bb39863 commitc53d9d6Copy full SHA for c53d9d6

File tree

56 files changed

+1973

-1244

lines changed

book
components
- config
  - definition.rst
- console
  - introduction.rst
- dependency_injection
- event_dispatcher
  - introduction.rst
- expression_language
  - extending.rst
- http_foundation
  - session_configuration.rst
  - sessions.rst
- routing
  - hostname_pattern.rst
- templating
  - helpers
    - assetshelper.rst
  - introduction.rst
- translation
  - usage.rst
contributing
- code
  - core_team.rst
  - standards.rst
- documentation
  - standards.rst
cookbook
- assetic
  - asset_management.rst
  - uglifyjs.rst
- bundles
- configuration
  - configuration_organization.rst
  - index.rst
- console
  - logging.rst
- deployment
  - tools.rst
- doctrine
  - dbal.rst
- form
  - form_collections.rst
- logging
  - monolog_email.rst
- map.rst.inc
- routing
  - redirect_trailing_slash.rst
- security
  - api_key_authentication.rst
  - named_encoders.rst
reference
- constraints
  - Valid.rst
- forms/types
  - choice.rst

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1973

-1244

lines changed

`‎book/controller.rst‎`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -170,10 +170,16 @@ to the controller:`
`170`	`170`	`..code-block::php`
`171`	`171`
`172`	`172`	`// app/config/routing.php`
	`173`	`+ use Symfony\Component\Routing\Route;`
	`174`	`+ use Symfony\Component\Routing\RouteCollection;`
	`175`	`+`
	`176`	`+ $collection = new RouteCollection();`
`173`	`177`	`$collection->add('hello', new Route('/hello/{name}', array(`
`174`	`178`	`'_controller' => 'AcmeHelloBundle:Hello:index',`
`175`	`179`	`)));`
`176`	`180`
	`181`	`+ return $collection;`
	`182`	`+`
`177`	`183`	Going to ``/hello/ryan`` now executes the ``HelloController::indexAction()``
`178`	`184`	controller and passes in ``ryan`` for the ``$name`` variable. Creating a
`179`	`185`	`"page" means simply creating a controller method and associated route.`
`@@ -257,11 +263,17 @@ example:`
`257`	`263`	`..code-block::php`
`258`	`264`
`259`	`265`	`// app/config/routing.php`
	`266`	`+ use Symfony\Component\Routing\Route;`
	`267`	`+ use Symfony\Component\Routing\RouteCollection;`
	`268`	`+`
	`269`	`+ $collection = new RouteCollection();`
`260`	`270`	`$collection->add('hello', new Route('/hello/{firstName}/{lastName}', array(`
`261`	`271`	`'_controller' => 'AcmeHelloBundle:Hello:index',`
`262`	`272`	`'color' => 'green',`
`263`	`273`	`)));`
`264`	`274`
	`275`	`+ return $collection;`
	`276`	`+`
`265`	`277`	`The controller for this can take several arguments::`
`266`	`278`
`267`	`279`	`public function indexAction($firstName, $lastName, $color)`

`‎book/doctrine.rst‎`

Lines changed: 45 additions & 46 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,18 +85,16 @@ information. By convention, this information is usually configured in an`
`85`	`85`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`86`	`86`	`xmlns:doctrine="http://symfony.com/schema/dic/doctrine"`
`87`	`87`	`xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd`
`88`		`-http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">`
	`88`	`+ http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">`
`89`	`89`
`90`	`90`	`<doctrine:config>`
`91`	`91`	`<doctrine:dbal`
`92`	`92`	`driver="%database_driver%"`
`93`	`93`	`host="%database_host%"`
`94`	`94`	`dbname="%database_name%"`
`95`	`95`	`user="%database_user%"`
`96`		`-password="%database_password%"`
`97`		`- />`
	`96`	`+password="%database_password%" />`
`98`	`97`	`</doctrine:config>`
`99`		`-`
`100`	`98`	`</container>`
`101`	`99`
`102`	`100`	`..code-block::php`
`@@ -175,16 +173,14 @@ for you:`
`175`	`173`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`176`	`174`	`xmlns:doctrine="http://symfony.com/schema/dic/doctrine"`
`177`	`175`	`xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd`
`178`		`- http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">`
`179`		`-`
`180`		`- <doctrine:config`
`181`		`-driver="pdo_sqlite"`
`182`		`-path="%kernel.root_dir%/sqlite.db"`
`183`		`-charset="UTF-8"`
`184`		`- >`
`185`		`-<!-- ...-->`
`186`		`- </doctrine:config>`
	`176`	`+ http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">`
`187`	`177`
	`178`	`+ <doctrine:config>`
	`179`	`+ <doctrine:dbal`
	`180`	`+driver="pdo_sqlite"`
	`181`	`+path="%kernel.root_dir%/sqlite.db"`
	`182`	`+charset="UTF-8" />`
	`183`	`+ </doctrine:config>`
`188`	`184`	`</container>`
`189`	`185`
`190`	`186`	`..code-block::php`
`@@ -319,17 +315,17 @@ in a number of different formats including YAML, XML or directly inside the`
`319`	`315`	`<!-- src/Acme/StoreBundle/Resources/config/doctrine/Product.orm.xml-->`
`320`	`316`	`<?xml version="1.0" encoding="UTF-8" ?>`
`321`	`317`	`<doctrine-mappingxmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"`
`322`		`-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`323`		`-xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping`
`324`		`-http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">`
	`318`	`+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
	`319`	`+xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping`
	`320`	`+ http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">`
`325`	`321`
`326`	`322`	`<entityname="Acme\StoreBundle\Entity\Product"table="product">`
`327`		`- <idname="id"type="integer"column="id">`
	`323`	`+ <idname="id"type="integer">`
`328`	`324`	`<generatorstrategy="AUTO" />`
`329`	`325`	`</id>`
`330`		`- <fieldname="name"column="name"type="string"length="100" />`
`331`		`- <fieldname="price"column="price"type="decimal"scale="2" />`
`332`		`- <fieldname="description"column="description"type="text" />`
	`326`	`+ <fieldname="name"type="string"length="100" />`
	`327`	`+ <fieldname="price"type="decimal"scale="2" />`
	`328`	`+ <fieldname="description"type="text" />`
`333`	`329`	`</entity>`
`334`	`330`	`</doctrine-mapping>`
`335`	`331`
`@@ -826,13 +822,15 @@ To do this, add the name of the repository class to your mapping definition:`
`826`	`822`	`<!-- src/Acme/StoreBundle/Resources/config/doctrine/Product.orm.xml-->`
`827`	`823`	`<?xml version="1.0" encoding="UTF-8" ?>`
`828`	`824`	`<doctrine-mappingxmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"`
`829`		`-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`830`		`-xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping`
`831`		`- http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">`
	`825`	`+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
	`826`	`+xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping`
	`827`	`+ http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">`
	`828`	`+`
	`829`	`+ <entity`
	`830`	`+name="Acme\StoreBundle\Entity\Product"`
	`831`	`+repository-class="Acme\StoreBundle\Entity\ProductRepository">`
`832`	`832`
`833`		`- <entityname="Acme\StoreBundle\Entity\Product"`
`834`		`-repository-class="Acme\StoreBundle\Entity\ProductRepository">`
`835`		`-<!-- ...-->`
	`833`	`+<!-- ...-->`
`836`	`834`	`</entity>`
`837`	`835`	`</doctrine-mapping>`
`838`	`836`
@@ -945,17 +943,18 @@ To relate the ``Category`` and ``Product`` entities, start by creating a
`945`	`943`	`..code-block::xml`
`946`	`944`
`947`	`945`	`<!-- src/Acme/StoreBundle/Resources/config/doctrine/Category.orm.xml-->`
	`946`	`+ <?xml version="1.0" encoding="UTF-8" ?>`
`948`	`947`	`<doctrine-mappingxmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"`
`949`	`948`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`950`	`949`	`xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping`
`951`		`-http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">`
	`950`	`+ http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">`
`952`	`951`
`953`	`952`	`<entityname="Acme\StoreBundle\Entity\Category">`
`954`	`953`	`<!-- ...-->`
`955`		`- <one-to-manyfield="products"`
	`954`	`+ <one-to-many`
	`955`	`+field="products"`
`956`	`956`	`target-entity="Product"`
`957`		`-mapped-by="category"`
`958`		`- />`
	`957`	`+mapped-by="category" />`
`959`	`958`
`960`	`959`	`<!--`
`961`	`960`	`don't forget to init the collection in`
@@ -1023,22 +1022,21 @@ object, you'll want to add a ``$category`` property to the ``Product`` class:
`1023`	`1022`	`..code-block::xml`
`1024`	`1023`
`1025`	`1024`	`<!-- src/Acme/StoreBundle/Resources/config/doctrine/Product.orm.xml-->`
	`1025`	`+ <?xml version="1.0" encoding="UTF-8" ?>`
`1026`	`1026`	`<doctrine-mappingxmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"`
`1027`	`1027`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`1028`	`1028`	`xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping`
`1029`		`-http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">`
	`1029`	`+ http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">`
`1030`	`1030`
`1031`	`1031`	`<entityname="Acme\StoreBundle\Entity\Product">`
`1032`	`1032`	`<!-- ...-->`
`1033`		`- <many-to-onefield="category"`
	`1033`	`+ <many-to-one`
	`1034`	`+field="category"`
`1034`	`1035`	`target-entity="Category"`
`1035`	`1036`	`inversed-by="products"`
`1036`		`-join-column="category"`
`1037`		`- >`
`1038`		`- <join-column`
`1039`		`-name="category_id"`
`1040`		`-referenced-column-name="id"`
`1041`		`- />`
	`1037`	`+join-column="category">`
	`1038`	`+`
	`1039`	`+ <join-columnname="category_id"referenced-column-name="id" />`
`1042`	`1040`	`</many-to-one>`
`1043`	`1041`	`</entity>`
`1044`	`1042`	`</doctrine-mapping>`
`@@ -1306,6 +1304,8 @@ the current date, only when the entity is first persisted (i.e. inserted):`
`1306`	`1304`
`1307`	`1305`	`..code-block::php-annotations`
`1308`	`1306`
	`1307`	`+ // src/Acme/StoreBundle/Entity/Product.php`
	`1308`	`+`
`1309`	`1309`	`/**`
`1310`	`1310`	`* @ORM\PrePersist`
`1311`	`1311`	`*/`
`@@ -1328,16 +1328,15 @@ the current date, only when the entity is first persisted (i.e. inserted):`
`1328`	`1328`	`<!-- src/Acme/StoreBundle/Resources/config/doctrine/Product.orm.xml-->`
`1329`	`1329`	`<?xml version="1.0" encoding="UTF-8" ?>`
`1330`	`1330`	`<doctrine-mappingxmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"`
`1331`		`-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`1332`		`-xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping`
`1333`		`-http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">`
	`1331`	`+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
	`1332`	`+xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping`
	`1333`	`+ http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">`
`1334`	`1334`
`1335`	`1335`	`<entityname="Acme\StoreBundle\Entity\Product">`
`1336`		`-<!-- ...-->`
`1337`		`- <lifecycle-callbacks>`
`1338`		`- <lifecycle-callbacktype="prePersist"`
`1339`		`-method="setCreatedAtValue" />`
`1340`		`- </lifecycle-callbacks>`
	`1336`	`+<!-- ...-->`
	`1337`	`+ <lifecycle-callbacks>`
	`1338`	`+ <lifecycle-callbacktype="prePersist"method="setCreatedAtValue" />`
	`1339`	`+ </lifecycle-callbacks>`
`1341`	`1340`	`</entity>`
`1342`	`1341`	`</doctrine-mapping>`
`1343`	`1342`

`‎book/forms.rst‎`

Lines changed: 15 additions & 14 deletions

Original file line number	Diff line number	Diff line change
@@ -129,7 +129,7 @@ corresponding to the ``task`` and ``dueDate`` properties of the ``Task`` class.
`129`	`129`	You've also assigned each a "type" (e.g. ``text``, ``date``), which, among
`130`	`130`	`other things, determines which HTML form tag(s) is rendered for that field.`
`131`	`131`
`132`		`-Finally, you added a submit button with a custom label for submitting the form to`
	`132`	`+Finally, you added a submit button with a custom label for submitting the form to`
`133`	`133`	`the server.`
`134`	`134`
`135`	`135`	`..versionadded::2.3`
`@@ -1126,20 +1126,21 @@ easy to use in your application.`
`1126`	`1126`	`<?xml version="1.0" encoding="UTF-8" ?>`
`1127`	`1127`	`<containerxmlns="http://symfony.com/schema/dic/services"`
`1128`	`1128`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`1129`		`-xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd>`
	`1129`	`+xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">`
	`1130`	`+`
`1130`	`1131`	`<services>`
`1131`		`- <service id="acme_demo.form.type.task"`
`1132`		`- class="Acme\TaskBundle\Form\Type\TaskType">`
`1133`		`- <tag name="form.type" alias="task" />`
`1134`		`- </service>`
	`1132`	`+ <service`
	`1133`	`+id="acme_demo.form.type.task"`
	`1134`	`+class="Acme\TaskBundle\Form\Type\TaskType">`
	`1135`	`+`
	`1136`	`+ <tagname="form.type"alias="task" />`
	`1137`	`+ </service>`
`1135`	`1138`	`</services>`
`1136`	`1139`	`</container>`
`1137`	`1140`
`1138`	`1141`	`..code-block::php`
`1139`	`1142`
`1140`	`1143`	`// src/Acme/TaskBundle/Resources/config/services.php`
`1141`		`- use Symfony\Component\DependencyInjection\Definition;`
`1142`		`-`
`1143`	`1144`	`$container`
`1144`	`1145`	`->register(`
`1145`	`1146`	`'acme_demo.form.type.task',`
`@@ -1590,13 +1591,13 @@ file:`
`1590`	`1591`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`1591`	`1592`	`xmlns:twig="http://symfony.com/schema/dic/twig"`
`1592`	`1593`	`xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd`
`1593`		`-http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">`
	`1594`	`+ http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">`
`1594`	`1595`
`1595`	`1596`	`<twig:config>`
`1596`		`-<twig:form>`
`1597`		`-<twig:resource>AcmeTaskBundle:Form:fields.html.twig</twig:resource>`
`1598`		`-</twig:form>`
`1599`		`-<!-- ... -->`
	`1597`	`+ <twig:form>`
	`1598`	`+ <twig:resource>AcmeTaskBundle:Form:fields.html.twig</twig:resource>`
	`1599`	`+ </twig:form>`
	`1600`	`+<!-- ...-->`
`1600`	`1601`	`</twig:config>`
`1601`	`1602`	`</container>`
`1602`	`1603`
`@@ -1676,7 +1677,7 @@ file:`
`1676`	`1677`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`1677`	`1678`	`xmlns:framework="http://symfony.com/schema/dic/symfony"`
`1678`	`1679`	`xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd`
`1679`		`-http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">`
	`1680`	`+ http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">`
`1680`	`1681`
`1681`	`1682`	`<framework:config>`
`1682`	`1683`	`<framework:templating>`

`‎book/http_cache.rst‎`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -763,6 +763,12 @@ both worlds. In other words, by using both expiration and validation, you`
`763`	`763`	`can instruct the cache to serve the cached content, while checking back`
`764`	`764`	`at some interval (the expiration) to verify that the content is still valid.`
`765`	`765`
	`766`	`+..tip::`
	`767`	`+`
	`768`	`+ You can also define HTTP caching headers for expiration and validation by using`
	`769`	`+ annotations. See the`
	`770`	+:doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/cache>`.
	`771`	`+`
`766`	`772`	`..index::`
`767`	`773`	`pair: Cache; Configuration`
`768`	`774`
`@@ -866,8 +872,7 @@ First, to use ESI, be sure to enable it in your application configuration:`
`866`	`872`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`867`	`873`	`xmlns:framework="http://symfony.com/schema/dic/symfony"`
`868`	`874`	`xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd`
`869`		`- http://symfony.com/schema/dic/symfony`
`870`		`- http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">`
	`875`	`+ http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">`
`871`	`876`
`872`	`877`	`<framework:config>`
`873`	`878`	`<!-- ...-->`
`@@ -880,7 +885,7 @@ First, to use ESI, be sure to enable it in your application configuration:`
`880`	`885`	`// app/config/config.php`
`881`	`886`	`$container->loadFromExtension('framework', array(`
`882`	`887`	`// ...`
`883`		`- 'esi'=> array('enabled' => true),`
	`888`	`+ 'esi' => array('enabled' => true),`
`884`	`889`	`));`
`885`	`890`
`886`	`891`	`Now, suppose you have a page that is relatively static, except for a news`
`@@ -988,8 +993,9 @@ that must be enabled in your configuration:`
`988`	`993`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`989`	`994`	`xmlns:doctrine="http://symfony.com/schema/dic/framework"`
`990`	`995`	`xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd`
`991`		`-http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">`
	`996`	`+ http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">`
`992`	`997`
	`998`	`+<!-- ...-->`
`993`	`999`	`<framework:config>`
`994`	`1000`	`<framework:fragmentspath="/_fragment" />`
`995`	`1001`	`</framework:config>`

`‎book/http_fundamentals.rst‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -433,6 +433,7 @@ by adding an entry for ``/contact`` to your routing configuration file:
`433`	`433`
`434`	`434`	`..code-block::xml`
`435`	`435`
	`436`	`+<!-- app/config/config.xml-->`
`436`	`437`	`<?xml version="1.0" encoding="UTF-8" ?>`
`437`	`438`	`<routesxmlns="http://symfony.com/schema/routing"`
`438`	`439`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
@@ -447,8 +448,8 @@ by adding an entry for ``/contact`` to your routing configuration file:
`447`	`448`	`..code-block::php`
`448`	`449`
`449`	`450`	`// app/config/routing.php`
`450`		`- use Symfony\Component\Routing\RouteCollection;`
`451`	`451`	`use Symfony\Component\Routing\Route;`
	`452`	`+ use Symfony\Component\Routing\RouteCollection;`
`452`	`453`
`453`	`454`	`$collection = new RouteCollection();`
`454`	`455`	`$collection->add('contact', new Route('/contact', array(`

`‎book/internals.rst‎`

Lines changed: 10 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ the configuration for the development environment:`
`601`	`601`	`xmlns:framework="http://symfony.com/schema/dic/symfony"`
`602`	`602`	`xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd`
`603`	`603`	`http://symfony.com/schema/dic/webprofiler http://symfony.com/schema/dic/webprofiler/webprofiler-1.0.xsd`
`604`		`-http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">`
	`604`	`+ http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">`
`605`	`605`
`606`	`606`	`<!-- load the profiler-->`
`607`	`607`	`<framework:config>`
`@@ -611,9 +611,7 @@ the configuration for the development environment:`
`611`	`611`	`<!-- enable the web profiler-->`
`612`	`612`	`<webprofiler:config`
`613`	`613`	`toolbar="true"`
`614`		`-intercept-redirects="true"`
`615`		`-verbose="true"`
`616`		`- />`
	`614`	`+intercept-redirects="true" />`
`617`	`615`	`</container>`
`618`	`616`
`619`	`617`	`..code-block::php`
`@@ -627,7 +625,6 @@ the configuration for the development environment:`
`627`	`625`	`$container->loadFromExtension('web_profiler', array(`
`628`	`626`	`'toolbar' => true,`
`629`	`627`	`'intercept_redirects' => true,`
`630`		`- 'verbose' => true,`
`631`	`628`	`));`
`632`	`629`
`633`	`630`	When ``only_exceptions`` is set to ``true``, the profiler only collects data
`@@ -657,18 +654,18 @@ If you enable the web profiler, you also need to mount the profiler routes:`
`657`	`654`
`658`	`655`	`<import`
`659`	`656`	`resource="@WebProfilerBundle/Resources/config/routing/profiler.xml"`
`660`		`-prefix="/_profiler"`
`661`		`- />`
	`657`	`+prefix="/_profiler" />`
`662`	`658`	`</routes>`
`663`	`659`
`664`	`660`	`..code-block::php`
`665`	`661`
`666`		`- $collection->addCollection(`
`667`		`- $loader->import(`
`668`		`- "@WebProfilerBundle/Resources/config/routing/profiler.xml"`
`669`		`- ),`
`670`		`- '/_profiler'`
`671`		`- );`
	`662`	`+ use Symfony\Component\Routing\RouteCollection;`
	`663`	`+`
	`664`	`+ $profiler = $loader->import('@WebProfilerBundle/Resources/config/routing/profiler.xml');`
	`665`	`+ $profiler->addPrefix('/_profiler');`
	`666`	`+`
	`667`	`+ $collection = new RouteCollection();`
	`668`	`+ $collection->addCollection($profiler);`
`672`	`669`
`673`	`670`	`As the profiler adds some overhead, you might want to enable it only under`
`674`	`671`	certain circumstances in the production environment. The ``only_exceptions``

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitc53d9d6

File tree

56 files changed

Some content is hidden

56 files changed

`‎book/controller.rst‎`

`‎book/doctrine.rst‎`

`‎book/forms.rst‎`

`‎book/http_cache.rst‎`

`‎book/http_fundamentals.rst‎`

`‎book/internals.rst‎`

0 commit comments