NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit2b7e0f6

committed

minorsymfony#3497 Fix highlighting (WouterJ)

This PR was merged into the 2.3 branch.Discussion----------Fix highlightingInitial idea was to fix the highlighting. While doing that, others thingsalso got a fix:* indenting* missing formats* some `...` in XML elements* missing comments in other formats| Q | A| --- | ---| Doc fix? | yes| New docs? | no| Applies to | all| Fixed tickets | partiallysymfony#1886Commits-------7c0cf89 Fixed (mostly) yaml code blocks2a43a97 Fixed YAML code blocks in the book

2 parents30f94a6 +7c0cf89 commit2b7e0f6Copy full SHA for 2b7e0f6

File tree

39 files changed

+185

-138

lines changed

book
components
- config
  - definition.rst
- dependency_injection
cookbook
- assetic
  - apply_to_option.rst
  - uglifyjs.rst
- bundles
  - override.rst
  - prepend_extension.rst
- configuration
- controller
  - service.rst
- doctrine
- email
  - dev_environment.rst
  - gmail.rst
- form
  - dynamic_form_modification.rst
  - form_customization.rst
- logging
  - channels_handlers.rst
- profiler
  - matchers.rst
- request
  - mime_type.rst
- routing
  - redirect_trailing_slash.rst
  - slash_in_parameter.rst
- security
- serializer.rst
- service_container
  - scopes.rst
- session
  - php_bridge.rst
  - sessions_directory.rst
- symfony1.rst
- templating
  - PHP.rst
  - render_without_controller.rst
- testing
  - database.rst

39 files changed

+185

-138

lines changed

`‎book/propel.rst`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -55,10 +55,10 @@ configuration file (``config.yml``):
`55`	`55`
`56`	`56`	`propel:`
`57`	`57`	`dbal:`
`58`		`-driver:"%database_driver%"`
`59`		`-user:"%database_user%"`
`60`		`-password:"%database_password%"`
`61`		`-dsn:"%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"`
	`58`	`+driver:"%database_driver%"`
	`59`	`+user:"%database_user%"`
	`60`	`+password:"%database_password%"`
	`61`	`+dsn:"%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"`
`62`	`62`
`63`	`63`	`Now that Propel knows about your database, Symfony2 can create the database for`
`64`	`64`	`you:`

`‎book/security.rst`

Lines changed: 11 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ authentication (i.e. the old-school username/password box):`
`45`	`45`	`security:`
`46`	`46`	`firewalls:`
`47`	`47`	`secured_area:`
`48`		`-pattern:^/`
	`48`	`+pattern:^/`
`49`	`49`	`anonymous:~`
`50`	`50`	`http_basic:`
`51`	`51`	`realm:"Secured Demo Area"`
`@@ -300,11 +300,11 @@ First, enable form login under your firewall:`
`300`	`300`	`security:`
`301`	`301`	`firewalls:`
`302`	`302`	`secured_area:`
`303`		`-pattern:^/`
	`303`	`+pattern:^/`
`304`	`304`	`anonymous:~`
`305`	`305`	`form_login:`
`306`		`-login_path:login`
`307`		`-check_path:login_check`
	`306`	`+login_path:login`
	`307`	`+check_path:login_check`
`308`	`308`
`309`	`309`	`..code-block::xml`
`310`	`310`
@@ -373,10 +373,10 @@ submission (i.e. ``/login_check``):
`373`	`373`
`374`	`374`	`# app/config/routing.yml`
`375`	`375`	`login:`
`376`		`-path:/login`
`377`		`-defaults:{ _controller: AcmeSecurityBundle:Security:login }`
	`376`	`+path:/login`
	`377`	`+defaults:{ _controller: AcmeSecurityBundle:Security:login }`
`378`	`378`	`login_check:`
`379`		`-path:/login_check`
	`379`	`+path:/login_check`
`380`	`380`
`381`	`381`	`..code-block::xml`
`382`	`382`
@@ -637,8 +637,8 @@ see :doc:`/cookbook/security/form_login`.
`637`	`637`
`638`	`638`	`firewalls:`
`639`	`639`	`login_firewall:`
`640`		`-pattern:^/login$`
`641`		`-anonymous:~`
	`640`	`+pattern:^/login$`
	`641`	`+anonymous:~`
`642`	`642`	`secured_area:`
`643`	`643`	`pattern:^/`
`644`	`644`	`form_login:~`
`@@ -1094,13 +1094,14 @@ aren't stored anywhere in a database. The actual user object is provided`
`1094`	`1094`	by Symfony (:class:`Symfony\\Component\\Security\\Core\\User\\User`).
`1095`	`1095`
`1096`	`1096`	`..tip::`
	`1097`	`+`
`1097`	`1098`	`Any user provider can load users directly from configuration by specifying`
`1098`	`1099`	the ``users`` configuration parameter and listing the users beneath it.
`1099`	`1100`
`1100`	`1101`	`..caution::`
`1101`	`1102`
`1102`	`1103`	If your username is completely numeric (e.g. ``77``) or contains a dash
`1103`		- (e.g. ``user-name``), you should usethat alternative syntax when specifying
	`1104`	+ (e.g. ``user-name``), you should usean alternative syntax when specifying
`1104`	`1105`	`users in YAML:`
`1105`	`1106`
`1106`	`1107`	`..code-block::yaml`

`‎book/translation.rst`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -452,8 +452,8 @@ by the routing system using the special ``_locale`` parameter:
`452`	`452`	`..code-block::yaml`
`453`	`453`
`454`	`454`	`contact:`
`455`		`-path:/{_locale}/contact`
`456`		`-defaults:{ _controller: AcmeDemoBundle:Contact:index, _locale: en }`
	`455`	`+path:/{_locale}/contact`
	`456`	`+defaults:{ _controller: AcmeDemoBundle:Contact:index, _locale: en }`
`457`	`457`	`requirements:`
`458`	`458`	`_locale:en\|fr\|de`
`459`	`459`

`‎components/config/definition.rst`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
@@ -21,14 +21,14 @@ applied to it (like: "the value for ``auto_connect`` must be a boolean value"):
`21`	`21`	`default_connection:mysql`
`22`	`22`	`connections:`
`23`	`23`	`mysql:`
`24`		`-host:localhost`
`25`		`-driver:mysql`
	`24`	`+host:localhost`
	`25`	`+driver:mysql`
`26`	`26`	`username:user`
`27`	`27`	`password:pass`
`28`	`28`	`sqlite:`
`29`		`-host:localhost`
`30`		`-driver:sqlite`
`31`		`-memory:true`
	`29`	`+host:localhost`
	`30`	`+driver:sqlite`
	`31`	`+memory:true`
`32`	`32`	`username:user`
`33`	`33`	`password:pass`
`34`	`34`
`@@ -473,9 +473,9 @@ in this config:`
`473`	`473`	`..code-block::yaml`
`474`	`474`
`475`	`475`	`connection:`
`476`		`-name:my_mysql_connection`
`477`		`-host:localhost`
`478`		`-driver:mysql`
	`476`	`+name:my_mysql_connection`
	`477`	`+host:localhost`
	`478`	`+driver:mysql`
`479`	`479`	`username:user`
`480`	`480`	`password:pass`
`481`	`481`

`‎components/dependency_injection/parameters.rst`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,8 @@ making the class of a service a parameter:`
`134`	`134`
`135`	`135`	`services:`
`136`	`136`	`mailer:`
`137`		`-class:'%mailer.class%'`
`138`		`-arguments:['%mailer.transport%']`
	`137`	`+class:"%mailer.class%"`
	`138`	`+arguments:["%mailer.transport%"]`
`139`	`139`
`140`	`140`	`..code-block::xml`
`141`	`141`

`‎components/dependency_injection/parentservices.rst`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ The service config for these classes would look something like this:`
`62`	`62`	`my_email_formatter:`
`63`	`63`	`# ...`
`64`	`64`	`newsletter_manager:`
`65`		`-class:"%newsletter_manager.class%"`
	`65`	`+class:"%newsletter_manager.class%"`
`66`	`66`	`calls:`
`67`	`67`	`-[setMailer, ["@my_mailer"]]`
`68`	`68`	`-[setEmailFormatter, ["@my_email_formatter"]]`
`@@ -196,7 +196,7 @@ a parent for a service.`
`196`	`196`	`-[setEmailFormatter, ["@my_email_formatter"]]`
`197`	`197`
`198`	`198`	`newsletter_manager:`
`199`		`-class:"%newsletter_manager.class%"`
	`199`	`+class:"%newsletter_manager.class%"`
`200`	`200`	`parent:mail_manager`
`201`	`201`
`202`	`202`	`greeting_card_manager:`
@@ -321,13 +321,13 @@ to the ``NewsletterManager`` class, the config would look like this:
`321`	`321`	`-[setEmailFormatter, ["@my_email_formatter"]]`
`322`	`322`
`323`	`323`	`newsletter_manager:`
`324`		`-class:"%newsletter_manager.class%"`
	`324`	`+class:"%newsletter_manager.class%"`
`325`	`325`	`parent:mail_manager`
`326`	`326`	`calls:`
`327`	`327`	`-[setMailer, ["@my_alternative_mailer"]]`
`328`	`328`
`329`	`329`	`greeting_card_manager:`
`330`		`-class:"%greeting_card_manager.class%"`
	`330`	`+class:"%greeting_card_manager.class%"`
`331`	`331`	`parent:mail_manager`
`332`	`332`
`333`	`333`	`..code-block::xml`

`‎components/dependency_injection/types.rst`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ Another possibility is just setting public fields of the class directly::`
`184`	`184`	`my_mailer:`
`185`	`185`	`# ...`
`186`	`186`	`newsletter_manager:`
`187`		`-class:NewsletterManager`
	`187`	`+class:NewsletterManager`
`188`	`188`	`properties:`
`189`	`189`	`mailer:"@my_mailer"`
`190`	`190`

`‎cookbook/assetic/apply_to_option.rst`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ An example configuration might look like this:`
`20`	`20`	`assetic:`
`21`	`21`	`filters:`
`22`	`22`	`coffee:`
`23`		`-bin:/usr/bin/coffee`
`24`		`-node:/usr/bin/node`
`25`		`-node_paths:[/usr/lib/node_modules/]`
	`23`	`+bin:/usr/bin/coffee`
	`24`	`+node:/usr/bin/node`
	`25`	`+node_paths:[/usr/lib/node_modules/]`
`26`	`26`
`27`	`27`	`..code-block::xml`
`28`	`28`
@@ -130,10 +130,10 @@ applied to all ``.coffee`` files:
`130`	`130`	`assetic:`
`131`	`131`	`filters:`
`132`	`132`	`coffee:`
`133`		`-bin:/usr/bin/coffee`
`134`		`-node:/usr/bin/node`
`135`		`-node_paths:[/usr/lib/node_modules/]`
`136`		`-apply_to:"\.coffee$"`
	`133`	`+bin:/usr/bin/coffee`
	`134`	`+node:/usr/bin/node`
	`135`	`+node_paths:[/usr/lib/node_modules/]`
	`136`	`+apply_to:"\.coffee$"`
`137`	`137`
`138`	`138`	`..code-block::xml`
`139`	`139`

`‎cookbook/assetic/uglifyjs.rst`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ your JavaScripts:`
`75`	`75`
`76`	`76`	`<!-- app/config/config.xml-->`
`77`	`77`	`<assetic:config>`
	`78`	`+<!-- bin: the path to the uglifyjs executable-->`
`78`	`79`	`<assetic:filter`
`79`	`80`	`name="uglifyjs2"`
`80`	`81`	`bin="/usr/local/bin/uglifyjs" />`
`@@ -86,6 +87,7 @@ your JavaScripts:`
`86`	`87`	`$container->loadFromExtension('assetic', array(`
`87`	`88`	`'filters' => array(`
`88`	`89`	`'uglifyjs2' => array(`
	`90`	`+ // the path to the uglifyjs executable`
`89`	`91`	`'bin' => '/usr/local/bin/uglifyjs',`
`90`	`92`	`),`
`91`	`93`	`),`

`‎cookbook/bundles/override.rst`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ in the core FrameworkBundle:`
`53`	`53`
`54`	`54`	`# app/config/config.yml`
`55`	`55`	`parameters:`
`56`		`-translator.class:Acme\HelloBundle\Translation\Translator`
	`56`	`+translator.class:Acme\HelloBundle\Translation\Translator`
`57`	`57`
`58`	`58`	`..code-block::xml`
`59`	`59`

`‎cookbook/bundles/prepend_extension.rst`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -99,7 +99,6 @@ for ``acme_hello`` is set to ``non_default``:
`99`	`99`	`..code-block::yaml`
`100`	`100`
`101`	`101`	`# app/config/config.yml`
`102`		`-`
`103`	`102`	`acme_something:`
`104`	`103`	`# ...`
`105`	`104`	`use_acme_goodbye:false`
@@ -112,7 +111,6 @@ for ``acme_hello`` is set to ``non_default``:
`112`	`111`	`..code-block::xml`
`113`	`112`
`114`	`113`	`<!-- app/config/config.xml-->`
`115`		`-`
`116`	`114`	`<acme-something:configuse-acme-goodbye="false">`
`117`	`115`	`<acme-something:entity-manager-name>non_default</acme-something:entity-manager-name>`
`118`	`116`	`</acme-something:config>`
@@ -122,7 +120,6 @@ for ``acme_hello`` is set to ``non_default``:
`122`	`120`	`..code-block::php`
`123`	`121`
`124`	`122`	`// app/config/config.php`
`125`		`-`
`126`	`123`	`$container->loadFromExtension('acme_something', array(`
`127`	`124`	`...,`
`128`	`125`	`'use_acme_goodbye' => false,`

`‎cookbook/configuration/apache_router.rst`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ To test that it's working, let's create a very basic route for the AcmeDemoBundl`
`60`	`60`
`61`	`61`	`# app/config/routing.yml`
`62`	`62`	`hello:`
`63`		`-path:/hello/{name}`
	`63`	`+path:/hello/{name}`
`64`	`64`	`defaults:{ _controller: AcmeDemoBundle:Demo:hello }`
`65`	`65`
`66`	`66`	`..code-block::xml`

`‎cookbook/configuration/environments.rst`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,18 +64,21 @@ easily and transparently:`
`64`	`64`
`65`	`65`	`imports:`
`66`	`66`	`-{ resource: config.yml }`
	`67`	`+`
`67`	`68`	`# ...`
`68`	`69`
`69`	`70`	`..code-block::xml`
`70`	`71`
`71`	`72`	`<imports>`
`72`	`73`	`<importresource="config.xml" />`
`73`	`74`	`</imports>`
	`75`	`+`
`74`	`76`	`<!-- ...-->`
`75`	`77`
`76`	`78`	`..code-block::php`
`77`	`79`
`78`	`80`	`$loader->import('config.php');`
	`81`	`+`
`79`	`82`	`// ...`
`80`	`83`
`81`	`84`	`To share common configuration, each environment's configuration file`
`@@ -188,12 +191,12 @@ environment by using this code and changing the environment string.`
`188`	`191`
`189`	`192`	`doctrine:`
`190`	`193`	`dbal:`
`191`		`-logging:"%kernel.debug%"`
	`194`	`+logging:"%kernel.debug%"`
`192`	`195`	`# ...`
`193`	`196`
`194`	`197`	`..code-block::xml`
`195`	`198`
`196`		`- <doctrine:dballogging="%kernel.debug%".../>`
	`199`	`+ <doctrine:dballogging="%kernel.debug%" />`
`197`	`200`
`198`	`201`	`..code-block::php`
`199`	`202`

`‎cookbook/configuration/pdo_session_storage.rst`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ configuration format of your choice):`
`29`	`29`	`framework:`
`30`	`30`	`session:`
`31`	`31`	`# ...`
`32`		`-handler_id:session.handler.pdo`
	`32`	`+handler_id:session.handler.pdo`
`33`	`33`
`34`	`34`	`parameters:`
`35`	`35`	`pdo.db_options:`

`‎cookbook/controller/service.rst`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ Then you can define it as a service as follows:`
`60`	`60`
`61`	`61`	`services:`
`62`	`62`	`acme.hello.controller:`
`63`		`-class:"%acme.controller.hello.class%"`
	`63`	`+class:"%acme.controller.hello.class%"`
`64`	`64`
`65`	`65`	`..code-block::xml`
`66`	`66`
@@ -112,8 +112,8 @@ the route ``_controller`` value:
`112`	`112`
`113`	`113`	`# app/config/routing.yml`
`114`	`114`	`hello:`
`115`		`-path:/hello`
`116`		`-defaults:{ _controller: acme.hello.controller:indexAction }`
	`115`	`+path:/hello`
	`116`	`+defaults:{ _controller: acme.hello.controller:indexAction }`
`117`	`117`
`118`	`118`	`..code-block::xml`
`119`	`119`

`‎cookbook/doctrine/dbal.rst`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -92,7 +92,7 @@ mapping types, read Doctrine's `Custom Mapping Types`_ section of their document
`92`	`92`	`doctrine:`
`93`	`93`	`dbal:`
`94`	`94`	`types:`
`95`		`-custom_first:Acme\HelloBundle\Type\CustomFirst`
	`95`	`+custom_first:Acme\HelloBundle\Type\CustomFirst`
`96`	`96`	`custom_second:Acme\HelloBundle\Type\CustomSecond`
`97`	`97`
`98`	`98`	`..code-block::xml`
`@@ -143,7 +143,7 @@ mapping type:`
`143`	`143`	`dbal:`
`144`	`144`	`connections:`
`145`	`145`	`default:`
`146`		`-// Other connections parameters`
	`146`	`+# other connections parameters`
`147`	`147`	`mapping_types:`
`148`	`148`	`enum:string`
`149`	`149`
`@@ -160,6 +160,7 @@ mapping type:`
`160`	`160`	`<doctrine:dbal>`
`161`	`161`	`<doctrine:dbaldefault-connection="default">`
`162`	`162`	`<doctrine:connection>`
	`163`	`+<!-- other connections parameters-->`
`163`	`164`	`<doctrine:mapping-typename="enum">string</doctrine:mapping-type>`
`164`	`165`	`</doctrine:connection>`
`165`	`166`	`</doctrine:dbal>`
`@@ -173,6 +174,7 @@ mapping type:`
`173`	`174`	`'dbal' => array(`
`174`	`175`	`'connections' => array(`
`175`	`176`	`'default' => array(`
	`177`	`+ // other connection parameers`
`176`	`178`	`'mapping_types' => array(`
`177`	`179`	`'enum' => 'string',`
`178`	`180`	`),`

`‎cookbook/doctrine/multiple_entity_managers.rst`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ The following configuration code shows how you can configure two entity managers`
`24`	`24`
`25`	`25`	`doctrine:`
`26`	`26`	`dbal:`
`27`		`-default_connection:default`
	`27`	`+default_connection:default`
`28`	`28`	`connections:`
`29`	`29`	`default:`
`30`	`30`	`driver:"%database_driver%"`
`@@ -44,22 +44,21 @@ The following configuration code shows how you can configure two entity managers`
`44`	`44`	`charset:UTF8`
`45`	`45`
`46`	`46`	`orm:`
`47`		`-default_entity_manager:default`
	`47`	`+default_entity_manager:default`
`48`	`48`	`entity_managers:`
`49`	`49`	`default:`
`50`		`-connection:default`
	`50`	`+connection:default`
`51`	`51`	`mappings:`
`52`		`-AcmeDemoBundle:~`
	`52`	`+AcmeDemoBundle:~`
`53`	`53`	`AcmeStoreBundle:~`
`54`	`54`	`customer:`
`55`		`-connection:customer`
	`55`	`+connection:customer`
`56`	`56`	`mappings:`
`57`	`57`	`AcmeCustomerBundle:~`
`58`	`58`
`59`	`59`	`..code-block::xml`
`60`	`60`
`61`	`61`	`<?xml version="1.0" encoding="UTF-8"?>`
`62`		`-`
`63`	`62`	`<srv:containerxmlns="http://symfony.com/schema/dic/doctrine"`
`64`	`63`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`65`	`64`	`xmlns:srv="http://symfony.com/schema/dic/services"`

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!

Commit2b7e0f6

File tree

39 files changed

39 files changed

`‎book/propel.rst`

`‎book/security.rst`

`‎book/translation.rst`

`‎components/config/definition.rst`

`‎components/dependency_injection/parameters.rst`

`‎components/dependency_injection/parentservices.rst`

`‎components/dependency_injection/types.rst`

`‎cookbook/assetic/apply_to_option.rst`

`‎cookbook/assetic/uglifyjs.rst`

`‎cookbook/bundles/override.rst`

`‎cookbook/bundles/prepend_extension.rst`

`‎cookbook/configuration/apache_router.rst`

`‎cookbook/configuration/environments.rst`

`‎cookbook/configuration/pdo_session_storage.rst`

`‎cookbook/controller/service.rst`

`‎cookbook/doctrine/dbal.rst`

`‎cookbook/doctrine/multiple_entity_managers.rst`

0 commit comments