Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitceb257f

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: Expanded the explanation and updated the example Update doctrine.rst Update console.rst [#7452] remove trailing whitespaces Added filename references to examples Fix Typo $response->setEtag(..) Fixed typo Replace array with null Added a note about the usual cURL certificate problem Fixed code syntax issues Replaced tabs with white spaces Replace "chapter" by "article" where appropriate Minor tweak Use statement for InputOption added to example Use HTTPS to link to symfony.com when possible fixed Backward Compatibility typo
2 parents4a77589 +52072d1 commitceb257f

File tree

66 files changed

+202
-175
lines changed

Some content is hidden

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

66 files changed

+202
-175
lines changed

‎_build/_theme/_templates/layout.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{% extends '!layout.html' %}
22

3-
{% set css_files = ['http://symfony.com/css/compiled/v5/all.css?v=4'] %}
3+
{% set css_files = ['https://symfony.com/css/compiled/v5/all.css?v=4'] %}
44
{# make sure the Sphinx stylesheet isn't loaded #}
55
{% set style = '' %}
66
{% set isIndex = pagename is index %}
77

88
{% block extrahead %}
99
{# add JS to support tabs #}
10-
<scriptsrc="http://symfony.com/js/v5/all.js?v=4"></script>
10+
<scriptsrc="https://symfony.com/js/v5/all.js?v=4"></script>
1111

1212
{# pygment's styles are still loaded, undo some unwanted styles #}
1313
<style>
@@ -48,7 +48,7 @@ <h4>Pull request build</h4>
4848
<p>Each pull request of the Symfony Documentation is automatically deployed and hosted on<ahref="https://platform.sh">Platform.sh</a>.<br>
4949
View this page on<ahref="https://symfony.com/doc/current/{{ pagename }}">symfony.com</a>.</p>
5050
</div>
51-
51+
5252
{%- include "globaltoc.html" %}
5353

5454
{% if not isIndex %}
@@ -81,7 +81,7 @@ <h1 class="content_title">{{ title }}</h1>
8181
<ahref="{{ next.link|e }}">{{ next.title|striptags|e }} »</a>
8282
</div>
8383
{% endif %}
84-
84+
8585
<divid="license">
8686
<p>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported<arel="license"href="http://creativecommons.org/licenses/by-sa/3.0/">License</a>.</p>
8787
</div>

‎best_practices/security.rst‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -235,16 +235,15 @@ more advanced use-case, you can always do the same security check in PHP:
235235
236236
if (!$post->isAuthor($this->getUser())) {
237237
$this->denyAccessUnlessGranted('edit', $post);
238-
239-
// or without the shortcut:
240-
//
241-
// use Symfony\Component\Security\Core\Exception\AccessDeniedException;
242-
// ...
243-
//
244-
// if (!$this->get('security.authorization_checker')->isGranted('edit', $post)) {
245-
// throw $this->createAccessDeniedException();
246-
// }
247238
}
239+
// equivalent code without using the "denyAccessUnlessGranted()" shortcut:
240+
//
241+
// use Symfony\Component\Security\Core\Exception\AccessDeniedException;
242+
// ...
243+
//
244+
// if (!$this->get('security.authorization_checker')->isGranted('edit', $post)) {
245+
// throw $this->createAccessDeniedException();
246+
// }
248247
249248
// ...
250249
}
@@ -399,6 +398,6 @@ If your company uses a user login method not supported by Symfony, you can
399398
develop:doc:`your own user provider</security/custom_provider>` and
400399
:doc:`your own authentication provider</security/custom_authentication_provider>`.
401400

402-
.. _`ParamConverter`:http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
403-
.. _`@Security annotation`:http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html
401+
.. _`ParamConverter`:https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
402+
.. _`@Security annotation`:https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html
404403
.. _`FOSUserBundle`:https://github.com/FriendsOfSymfony/FOSUserBundle

‎components/browser_kit.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ into the client constructor::
187187
$cookieJar = new Cookie('flavor', 'chocolate', strtotime('+1 day'));
188188

189189
// create a client and set the cookies
190-
$client = new Client(array(),array(), $cookieJar);
190+
$client = new Client(array(),null, $cookieJar);
191191
// ...
192192

193193
History

‎components/http_foundation.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ the
237237
method tells you if the request contains a session which was started in one of
238238
the previous requests.
239239

240-
Accessing `Accept-*` Headers Data
241-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
240+
Accessing ``Accept-*`` Headers Data
241+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
242242

243243
You can easily access basic data extracted from ``Accept-*`` headers
244244
by using the following methods:

‎components/options_resolver.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ the ``Mailer`` class makes a mistake?
9090
..code-block::php
9191
9292
$mailer = new Mailer(array(
93-
'usernme' => 'johndoe', // usernAme misspelled
93+
'usernme' => 'johndoe', // usernAme misspelled
9494
));
9595
9696
No error will be shown. In the best case, the bug will appear during testing,
@@ -376,7 +376,7 @@ is thrown::
376376
For options with more complicated validation schemes, pass a closure which
377377
returns ``true`` for acceptable values and ``false`` for invalid values::
378378

379-
379+
380380
// ...
381381
$resolver->setAllowedValues('transport', function ($value) {
382382
// return true or false
@@ -685,4 +685,4 @@ options in your code.
685685

686686
.. _Packagist:https://packagist.org/packages/symfony/options-resolver
687687
.. _CHANGELOG:https://github.com/symfony/symfony/blob/master/src/Symfony/Component/OptionsResolver/CHANGELOG.md#260
688-
.. _`read the Symfony 2.5 documentation`:http://symfony.com/doc/2.5/components/options_resolver.html
688+
.. _`read the Symfony 2.5 documentation`:https://symfony.com/doc/2.5/components/options_resolver.html

‎components/yaml/yaml_format.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ According to the official `YAML`_ website, YAML is "a human friendly data
88
serialization standard for all programming languages".
99

1010
Even if the YAML format can describe complex nested data structure, this
11-
chapter only describes the minimum set of features needed to use YAML as a
11+
article only describes the minimum set of features needed to use YAML as a
1212
configuration file format.
1313

1414
YAML is a simple language that describes data. As PHP, it has a syntax for

‎configuration.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ specific bundle (i.e. ``FrameworkBundle`` and ``TwigBundle``).
9595

9696
..sidebar::Configuration Formats
9797

98-
Throughout thechapters, all configuration examples will be shown in
98+
Throughout thedocumentation, all configuration examples will be shown in
9999
three formats (YAML, XML and PHP). YAML is used by default, but you can
100100
choose whatever you like best. There is no performance difference:
101101

‎configuration/external_parameters.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
How to Set external Parameters in the Service Container
55
=======================================================
66

7-
In thechapter:doc:`/configuration`, you learned how to manage your application
8-
configuration. At times, it may benefit your application
9-
to store certaincredentials outside of your project code. Database configuration
10-
is one suchexample. The flexibility of the Symfony service container allows
11-
you to easilydo this.
7+
In thearticle:doc:`/configuration`, you learned how to manage your application
8+
configuration. At times, it may benefit your application to store certain
9+
credentials outside of your project code. Database configuration is one such
10+
example. The flexibility of the Symfony service container allows you to easily
11+
do this.
1212

1313
Environment Variables
1414
---------------------

‎configuration/front_controllers_and_kernel.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ This method is responsible for loading the application's
144144
configuration from the right *environment*.
145145

146146
Environments have been covered extensively
147-
:doc:`in the previouschapter</configuration/environments>`,
147+
:doc:`in the previousarticle</configuration/environments>`,
148148
and you probably remember that the Symfony Standard Edition comes with three
149149
of them - ``dev``, ``prod`` and ``test``.
150150

‎console.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ method. Then you can optionally define a help message and the
5757

5858
// the full command description shown when running the command with
5959
// the "--help" option
60-
->setHelp("This command allows you to create users...")
60+
->setHelp('This command allows you to create users...')
6161
;
6262
}
6363

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp