Commit9358703

committed

Merge branch '3.2' into 3.3

* 3.2: Fixing build Fixing build

2 parentsc831050 +c5dcca2 commit9358703Copy full SHA for 9358703

File tree

+14

-14

lines changed

+14

-14

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -947,7 +947,7 @@ Minor Documentation Changes`
`947`	`947`	* `#5911<https://github.com/symfony/symfony-docs/pull/5911>`_ Wrap all strings containing @ in quotes in Yaml (WouterJ)
`948`	`948`	* `#5889<https://github.com/symfony/symfony-docs/pull/5889>`_ Always use "main" as the default firewall name (to match Symfony Standard Edition) (javiereguiluz)
`949`	`949`	* `#5888<https://github.com/symfony/symfony-docs/pull/5888>`_ Removed the use of ContainerAware class (javiereguiluz)
`950`		-* `#5625<https://github.com/symfony/symfony-docs/pull/5625>`_ Tell about SYMFONY__TEMPLATING__HELPER__CODE__FILE_LINK_FORMAT (nicolas-grekas)
	`950`	+* `#5625<https://github.com/symfony/symfony-docs/pull/5625>`_ Tell about``SYMFONY__TEMPLATING__HELPER__CODE__FILE_LINK_FORMAT`` (nicolas-grekas)
`951`	`951`	* `#5896<https://github.com/symfony/symfony-docs/pull/5896>`_ [Book][Templating] Update absolute URL asset to match 2.7 (lemoinem)
`952`	`952`	* `#5828<https://github.com/symfony/symfony-docs/pull/5828>`_ move the getEntityManager, only get it if needed (OskarStark)
`953`	`953`	* `#5900<https://github.com/symfony/symfony-docs/pull/5900>`_ Added new security advisories to the docs (fabpot)

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,10 @@ Learn More`
`58`	`58`	`:maxdepth:1`
`59`	`59`
`60`	`60`	`class_loader/class_loader`
`61`		`-class_loader/class_map_generator.rst`
`62`		`-class_loader/debug_class_loader.rst`
`63`		`-class_loader/map_class_loader.rst`
`64`		`-class_loader/psr4_class_loader.rst`
	`61`	`+class_loader/class_map_generator`
	`62`	`+class_loader/debug_class_loader`
	`63`	`+class_loader/map_class_loader`
	`64`	`+class_loader/psr4_class_loader`
`65`	`65`
`66`	`66`	`..toctree::`
`67`	`67`	`:hidden:`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,10 +112,10 @@ option. Read more about this and other options in`
`112`	`112`
`113`	`113`	`If the dumped contents are complex, consider using the local search box to`
`114`	`114`	`look for specific variables or values. First, click anywhere on the dumped`
`115`		- contents and then press:kbd:`Ctrl.+F` or:kbd:`Cmd.+F` to make the local
	`115`	+ contents and then press``Ctrl. + F`` or``Cmd. + F`` to make the local
`116`	`116`	`search box appear. All the common shortcuts to navigate the search results`
`117`		- are supported (:kbd:`Ctrl.+G` or:kbd:`Cmd.+G`,:kbd:`F3`, etc.) When
`118`		- finished, press:kbd:`Esc.` to hide the box again.
	`117`	+ are supported (``Ctrl. + G`` or``Cmd. + G``, ``F3``, etc.) When
	`118`	+ finished, press``Esc.`` to hide the box again.
`119`	`119`
`120`	`120`	`Using the VarDumper Component in your PHPUnit Test Suite`
`121`	`121`	`--------------------------------------------------------`

Lines changed: 6 additions & 6 deletions

Comments

(0)