Movatterモバイル変換

Skip to content

symfony/symfony-docsPublic

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

Commit0fe1050

wouterj

committed

Merge branch '2.7' into 2.8

2 parents9538919 +6d17756 commit0fe1050Copy full SHA for 0fe1050

File tree

31 files changed

+240

-12

lines changed

book
- security.rst
components
- class_loader
  - introduction.rst
- config
  - introduction.rst
- console
  - introduction.rst
- css_selector.rst
- debug
  - introduction.rst
- dependency_injection
  - introduction.rst
- dom_crawler.rst
- event_dispatcher
  - introduction.rst
- filesystem
  - introduction.rst
- finder.rst
- form
  - introduction.rst
- http_foundation
  - introduction.rst
- http_kernel
  - introduction.rst
- options_resolver.rst
- process.rst
- property_access
  - introduction.rst
- require_autoload.rst.inc
- routing
  - introduction.rst
- security
  - introduction.rst
- serializer.rst
- stopwatch.rst
- templating
  - introduction.rst
- translation
  - introduction.rst
- yaml
  - introduction.rst
  - yaml_format.rst
cookbook
- bundles
  - installation.rst
- controller
  - index.rst
  - upload_file.rst
- map.rst.inc
- validation
  - custom_constraint.rst

31 files changed

+240

-12

lines changed

`‎book/security.rst‎`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,9 @@ A) Configuring how your Users will Authenticate`
`128`	`128`	`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
`129`	`129`
`130`	`130`	`The main job of a firewall is to configure how your users will authenticate.`
`131`		`-Will they use a login form?Http Basic? An API token? All of the above?`
	`131`	`+Will they use a login form?HTTP basic authentication? An API token? All of the above?`
`132`	`132`
`133`		`-Let's start withHttp Basic(the old-schoolpop-up) and work up from there.`
	`133`	`+Let's start withHTTP basic authentication(the old-schoolprompt) and work up from there.`
`134`	`134`	To activate this, add the ``http_basic`` key under your firewall:
`135`	`135`
`136`	`136`	`..configuration-block::`
`@@ -265,7 +265,7 @@ user to be logged in to access this URL:`
`265`	`265`	You'll learn more about this ``ROLE_ADMIN`` thing and denying access
`266`	`266`	later in the:ref:`security-authorization` section.
`267`	`267`
`268`		-Great! Now, if you go to ``/admin``, you'll see the HTTPBasic popup:
	`268`	+Great! Now, if you go to ``/admin``, you'll see the HTTPbasic auth prompt:
`269`	`269`
`270`	`270`	`..image::/images/book/security_http_basic_popup.png`
`271`	`271`	`:align:center`
`@@ -376,7 +376,7 @@ probably only need one. If you do have multiple, you can configure which`
`376`	`376`	Try to login using username ``admin`` and password ``kitten``. You should
`377`	`377`	`see an error!`
`378`	`378`
`379`		`- No encoder has been configured for account "Symfony\Component\Security\Core\User\User"`
	`379`	`+ No encoder has been configured for account "Symfony\\Component\\Security\\Core\\User\\User"`
`380`	`380`
`381`	`381`	To fix this, add an ``encoders`` key:
`382`	`382`
`@@ -598,8 +598,8 @@ before inserting them into the database? Don't worry, see`
`598`	`598`	`D) Configuration Done!`
`599`	`599`	`~~~~~~~~~~~~~~~~~~~~~~`
`600`	`600`
`601`		`-Congratulations! You now have a working authentication system that usesHttp`
`602`		-Basic and loads users right from the ``security.yml`` file.
	`601`	`+Congratulations! You now have a working authentication system that usesHTTP`
	`602`	+basic auth and loads users right from the ``security.yml`` file.
`603`	`603`
`604`	`604`	`Your next steps depend on your setup:`
`605`	`605`

`‎components/class_loader/introduction.rst‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,7 @@ You can install the component in 2 different ways:`
`41`	`41`	on `Packagist`_);
`42`	`42`	`* Use the official Git repository (https://github.com/symfony/ClassLoader).`
`43`	`43`
	`44`	`+..include::/components/require_autoload.rst.inc`
	`45`	`+`
`44`	`46`	.. _`autoloading mechanism`:http://php.net/manual/en/language.oop5.autoload.php
`45`	`47`	`.. _Packagist:https://packagist.org/packages/symfony/class-loader`

`‎components/config/introduction.rst‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ You can install the component in 2 different ways:`
`17`	`17`	*:doc:`Install it via Composer</components/using_components>` (``symfony/config`` on `Packagist`_);
`18`	`18`	`* Use the official Git repository (https://github.com/symfony/Config).`
`19`	`19`
	`20`	`+..include::/components/require_autoload.rst.inc`
	`21`	`+`
`20`	`22`	`Sections`
`21`	`23`	`--------`
`22`	`24`

`‎components/console/introduction.rst‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ You can install the component in 2 different ways:`
`20`	`20`	*:doc:`Install it via Composer</components/using_components>` (``symfony/console`` on `Packagist`_);
`21`	`21`	`* Use the official Git repository (https://github.com/symfony/Console).`
`22`	`22`
	`23`	`+..include::/components/require_autoload.rst.inc`
	`24`	`+`
`23`	`25`	`Creating a basic Command`
`24`	`26`	`------------------------`
`25`	`27`

`‎components/css_selector.rst‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ You can install the component in 2 different ways:`
`15`	`15`	*:doc:`Install it via Composer</components/using_components>` (``symfony/css-selector`` on `Packagist`_);
`16`	`16`	`* Use the official Git repository (https://github.com/symfony/CssSelector).`
`17`	`17`
	`18`	`+..include::/components/require_autoload.rst.inc`
	`19`	`+`
`18`	`20`	`Usage`
`19`	`21`	`-----`
`20`	`22`

`‎components/debug/introduction.rst‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ You can install the component in many different ways:`
`19`	`19`	*:doc:`Install it via Composer</components/using_components>` (``symfony/debug`` on `Packagist`_);
`20`	`20`	`* Use the official Git repository (https://github.com/symfony/Debug).`
`21`	`21`
	`22`	`+..include::/components/require_autoload.rst.inc`
	`23`	`+`
`22`	`24`	`Usage`
`23`	`25`	`-----`
`24`	`26`

`‎components/dependency_injection/introduction.rst‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ You can install the component in 2 different ways:`
`19`	`19`	*:doc:`Install it via Composer</components/using_components>` (``symfony/dependency-injection`` on `Packagist`_);
`20`	`20`	`* Use the official Git repository (https://github.com/symfony/DependencyInjection).`
`21`	`21`
	`22`	`+..include::/components/require_autoload.rst.inc`
	`23`	`+`
`22`	`24`	`Basic Usage`
`23`	`25`	`-----------`
`24`	`26`

`‎components/dom_crawler.rst‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ You can install the component in 2 different ways:`
`20`	`20`	*:doc:`Install it via Composer</components/using_components>` (``symfony/dom-crawler`` on `Packagist`_);
`21`	`21`	`* Use the official Git repository (https://github.com/symfony/DomCrawler).`
`22`	`22`
	`23`	`+..include::/components/require_autoload.rst.inc`
	`24`	`+`
`23`	`25`	`Usage`
`24`	`26`	`-----`
`25`	`27`

`‎components/event_dispatcher/introduction.rst‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ You can install the component in 2 different ways:`
`56`	`56`	*:doc:`Install it via Composer</components/using_components>` (``symfony/event-dispatcher`` on `Packagist`_);
`57`	`57`	`* Use the official Git repository (https://github.com/symfony/EventDispatcher).`
`58`	`58`
	`59`	`+..include::/components/require_autoload.rst.inc`
	`60`	`+`
`59`	`61`	`Usage`
`60`	`62`	`-----`
`61`	`63`

`‎components/filesystem/introduction.rst‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ You can install the component in 2 different ways:`
`19`	`19`	*:doc:`Install it via Composer</components/using_components>` (``symfony/filesystem`` on `Packagist`_);
`20`	`20`	`* Use the official Git repository (https://github.com/symfony/Filesystem).`
`21`	`21`
	`22`	`+..include::/components/require_autoload.rst.inc`
	`23`	`+`
`22`	`24`	`Usage`
`23`	`25`	`-----`
`24`	`26`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp