Movatterモバイル変換

Skip to content

symfony/symfony-docsPublic

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

Commit463f9db

xabbuh

committed

Merge branch '3.1'

* 3.1: Several typo fixes Several typo fixes Several typo fixes Update console.rst [#6917] some tweaks after review [Finder] document array use for locations

2 parents09975d7 +d0a0a04 commit463f9dbCopy full SHA for 463f9db

File tree

17 files changed

+25

-21

lines changed

components
- console/helpers
  - table.rst
- finder.rst
console.rst
controller
- argument_value_resolver.rst
deployment
- fortrabbit.rst
doctrine.rst
doctrine
- associations.rst
form
- data_transformers.rst
- direct_submit.rst
reference
- configuration
  - framework.rst
- forms/types
  - entity.rst
security
- ldap.rst
serializer
- custom_encoders.rst
service_container
- definitions.rst
- service_decoration.rst
setup
- web_server_configuration.rst
templating.rst

17 files changed

+25

-21

lines changed

`‎components/console/helpers/table.rst‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ This results in:`
`222`	`222`	`..tip::`
`223`	`223`
`224`	`224`	`You can create a multiple-line page title using a header cell that spans`
`225`		`- theenire table width::`
	`225`	`+ theentire table width::`
`226`	`226`
`227`	`227`	`$table->setHeaders(array(`
`228`	`228`	`array(new TableCell('Main table title', array('colspan' => 3))),`

`‎components/finder.rst‎`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,11 @@ directory to use for the search::`
`82`	`82`	`Search in several locations by chaining calls to`
`83`	`83`	:method:`Symfony\\Component\\Finder\\Finder::in`::
`84`	`84`
`85`		`- $finder->files()->in(__DIR__)->in('/elsewhere');`
	`85`	`+ // search inside both directories`
	`86`	`+ $finder->files()->in(array(__DIR__, '/elsewhere'));`
	`87`	`+`
	`88`	`+ // same as above`
	`89`	`+ $finder->in(__DIR__)->in('/elsewhere');`
`86`	`90`
`87`	`91`	`Use wildcard characters to search in the directories matching a pattern::`
`88`	`92`

`‎console.rst‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ instead::`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`Now, once you created the required services and logic, the command will execute`
`180`		-the ``generate()`` method of the ``app.user_manager`` service and the user will
	`180`	+the ``create()`` method of the ``app.user_manager`` service and the user will
`181`	`181`	`be created.`
`182`	`182`
`183`	`183`	`Command Lifecycle`

`‎controller/argument_value_resolver.rst‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ and adding a priority.`
`172`	`172`	`// app/config/services.php`
`173`	`173`	`use Symfony\Component\DependencyInjection\Definition;`
`174`	`174`
`175`		`- $defintion = new Definition(`
	`175`	`+ $definition = new Definition(`
`176`	`176`	`'AppBundle\ArgumentResolver\UserValueResolver',`
`177`	`177`	`array(new Reference('security.token_storage'))`
`178`	`178`	`);`

`‎deployment/fortrabbit.rst‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ Configuring the Environment in the Dashboard`
`175`	`175`	`PHP Settings`
`176`	`176`	`~~~~~~~~~~~~`
`177`	`177`
`178`		`-The PHP version and enabled extensions areconfiguable under the PHP settings`
	`178`	`+The PHP version and enabled extensions areconfigurable under the PHP settings`
`179`	`179`	`of your App within the fortrabbit Dashboard.`
`180`	`180`
`181`	`181`	`Environment Variables`
`@@ -187,7 +187,7 @@ config files get loaded. ENV vars are configuable in fortrabbit Dashboard as wel`
`187`	`187`	`Document Root`
`188`	`188`	`~~~~~~~~~~~~~`
`189`	`189`
`190`		`-The document root isconfiguable for every custom domain you setup for your App.`
	`190`	`+The document root isconfigurable for every custom domain you setup for your App.`
`191`	`191`	The default is ``/htdocs``, but for Symfony you probably want to change it to
`192`	`192`	``/htdocs/web``. You also do so in the fortrabbit Dashboard under ``Domain`` settings.
`193`	`193`

`‎doctrine.rst‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,7 @@ Doctrine allows you to use any PHP object to hold your data and relies on`
`887`	`887`	`mapping metadata information to map an object's data to a particular database`
`888`	`888`	`table.`
`889`	`889`
`890`		`-Doctrine has a lot more complex features to learn, likerelationshps, complex queries,`
	`890`	`+Doctrine has a lot more complex features to learn, likerelationships, complex queries,`
`891`	`891`	`and event listeners.`
`892`	`892`
`893`	`893`	`Learn more`

`‎doctrine/associations.rst‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ to hold those associated objects.`
`162`	`162`
`163`	`163`	`While the many-to-one mapping shown earlier was mandatory, this one-to-many`
`164`	`164`	`mapping is optional. It is included here to help demonstrate Doctrine's range`
`165`		`-of relationship managementcapabailties. Plus, in the context of this application,`
	`165`	`+of relationship managementcapabilities. Plus, in the context of this application,`
`166`	`166`	it will likely be convenient for each ``Category`` object to automatically
`167`	`167`	own a collection of its related ``Product`` objects.
`168`	`168`

`‎form/data_transformers.rst‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -49,7 +49,7 @@ Suppose you have a Task form with a tags ``text`` type::
`49`	`49`	`}`
`50`	`50`
`51`	`51`	Internally the ``tags`` are stored as an array, but displayed to the user as a
`52`		`-simple commaseperated string to make them easier to edit.`
	`52`	`+simple commaseparated string to make them easier to edit.`
`53`	`53`
`54`	`54`	This is a perfect time to attach a custom data transformer to the ``tags``
`55`	`55`	field. The easiest way to do this is with the:class:`Symfony\\Component\\Form\\CallbackTransformer`

`‎form/direct_submit.rst‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -82,4 +82,4 @@ method, pass the submitted data directly to`
`82`	`82`	`When submitting a form via a "PATCH" request, you may want to update only a few`
`83`	`83`	`submitted fields. To achieve this, you may pass an optional second boolean`
`84`	`84`	parameter to ``submit()``. Passing ``false`` will remove any missing fields
`85`		- within the form object. Otherwise, themising fields will be set to ``null``.
	`85`	+ within the form object. Otherwise, themissing fields will be set to ``null``.

`‎reference/configuration/framework.rst‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ trusted_hosts`
`311`	`311`
`312`	`312`	`A lot of different attacks have been discovered relying on inconsistencies`
`313`	`313`	in handling the ``Host`` header by various software (web servers, reverse
`314`		`-proxies, web frameworks, etc.). Basically,everytime the framework is`
	`314`	`+proxies, web frameworks, etc.). Basically,every time the framework is`
`315`	`315`	`generating an absolute URL (when sending an email to reset a password for`
`316`	`316`	`instance), the host might have been manipulated by an attacker.`
`317`	`317`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp