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

Commit7e40a29

Browse files
committed
Merge branch '2.3' into 2.4
Conflicts:book/security.rstbook/service_container.rst
2 parents70a3893 +1a6f730 commit7e40a29

File tree

59 files changed

+278
-353
lines changed

Some content is hidden

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

59 files changed

+278
-353
lines changed

‎.gitignore‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
_exts
1+
/_build
2+
/bundles/DoctrineFixturesBundle
3+
/bundles/DoctrineMigrationsBundle
4+
/bundles/DoctrineMongoDBBundle
5+
/bundles/SensioFrameworkExtraBundle
6+
/bundles/SensioGeneratorBundle
7+
/cmf
8+
/_exts

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@ qthelp:
7777
@echo
7878
@echo"Build finished; now you can run"qcollectiongenerator" with the"\
7979
".qhcp project file in$(BUILDDIR)/qthelp, like this:"
80-
@echo"# qcollectiongenerator$(BUILDDIR)/qthelp/SymfonyCMF.qhcp"
80+
@echo"# qcollectiongenerator$(BUILDDIR)/qthelp/Symfony.qhcp"
8181
@echo"To view the help file:"
82-
@echo"# assistant -collectionFile$(BUILDDIR)/qthelp/SymfonyCMF.qhc"
82+
@echo"# assistant -collectionFile$(BUILDDIR)/qthelp/Symfony.qhc"
8383

8484
devhelp:
8585
$(SPHINXBUILD) -b devhelp$(ALLSPHINXOPTS)$(BUILDDIR)/devhelp
8686
@echo
8787
@echo"Build finished."
8888
@echo"To view the help file:"
89-
@echo"# mkdir -p$$HOME/.local/share/devhelp/SymfonyCMF"
90-
@echo"# ln -s$(BUILDDIR)/devhelp$$HOME/.local/share/devhelp/SymfonyCMF"
89+
@echo"# mkdir -p$$HOME/.local/share/devhelp/Symfony"
90+
@echo"# ln -s$(BUILDDIR)/devhelp$$HOME/.local/share/devhelp/Symfony"
9191
@echo"# devhelp"
9292

9393
epub:

‎book/doctrine.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The easiest way to understand how Doctrine works is to see it in action.
3030
In this section, you'll configure your database, create a ``Product`` object,
3131
persist it to the database and fetch it back out.
3232

33-
..sidebar::Code along with theexample
33+
..sidebar::Code along with theExample
3434

3535
If you want to follow along with the example in this chapter, create
3636
an ``AcmeStoreBundle`` via:
@@ -125,7 +125,7 @@ for you:
125125
126126
$ php app/console doctrine:database:create
127127
128-
..sidebar::SettingUp The Database to be UTF8
128+
..sidebar::Settingup the Database to be UTF8
129129

130130
One mistake even seasoned developers make when starting a Symfony2 project
131131
is forgetting to setup default charset and collation on their database,
@@ -1392,7 +1392,7 @@ powerful, allowing you to create complex queries and subscribe to events
13921392
that allow you to take different actions as objects go through their persistence
13931393
lifecycle.
13941394

1395-
LearnMore
1395+
Learnmore
13961396
~~~~~~~~~~
13971397

13981398
For more information about Doctrine, see the *Doctrine* section of the

‎book/forms.rst‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ Each field type has a number of different options that can be passed to it.
618618
Many of these are specific to the field type and details can be found in
619619
the documentation for each type.
620620

621-
..sidebar::The ``required``option
621+
..sidebar::The ``required``Option
622622

623623
The most common option is the ``required`` option, which can be applied to
624624
any field. By default, the ``required`` option is set to ``true``, meaning
@@ -636,7 +636,7 @@ the documentation for each type.
636636
In other words, the ``required`` option is "nice", but true server-side
637637
validation should *always* be used.
638638

639-
..sidebar::The ``label``option
639+
..sidebar::The ``label``Option
640640

641641
The label for the form field can be set using the ``label`` option,
642642
which can be applied to any field::
@@ -1101,6 +1101,12 @@ Defining your Forms as Services
11011101
Defining your form type as a service is a good practice and makes it really
11021102
easy to use in your application.
11031103

1104+
..note::
1105+
1106+
Services and the service container will be handled
1107+
:doc:`later on in this book</book/service_container>`. Things will be
1108+
more clear after reading that chapter.
1109+
11041110
..configuration-block::
11051111

11061112
..code-block::yaml

‎book/from_flat_php_to_symfony2.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ to where it is now.
1616
By the end, you'll see how Symfony2 can rescue you from mundane tasks and
1717
let you take back control of your code.
1818

19-
Asimple Blog inflat PHP
19+
ASimple Blog inFlat PHP
2020
-------------------------
2121

2222
In this chapter, you'll build the token blog application using only flat PHP.
@@ -701,7 +701,7 @@ And perhaps best of all, by using Symfony2, you now have access to a whole
701701
set of **high-quality open source tools developed by the Symfony2 community**!
702702
A good selection of Symfony2 community tools can be found on `KnpBundles.com`_.
703703

704-
Bettertemplates
704+
BetterTemplates
705705
----------------
706706

707707
If you choose to use it, Symfony2 comes standard with a templating engine

‎book/http_cache.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ If ``debug`` is ``true``, Symfony2 automatically adds a ``X-Symfony-Cache``
234234
header to the response containing useful information about cache hits and
235235
misses.
236236

237-
..sidebar::Changing from one Reverse Proxy toAnother
237+
..sidebar::Changing from one Reverse Proxy toanother
238238

239239
The Symfony2 reverse proxy is a great tool to use when developing your
240240
website or when you deploy your website to a shared host where you cannot
@@ -327,7 +327,7 @@ its creation more manageable::
327327
// set a custom Cache-Control directive
328328
$response->headers->addCacheControlDirective('must-revalidate', true);
329329

330-
Public vsPrivate Responses
330+
Public vsprivate Responses
331331
~~~~~~~~~~~~~~~~~~~~~~~~~~~
332332

333333
Both gateway and proxy caches are considered "shared" caches as the cached

‎book/http_fundamentals.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ how to master it.
4242
..index::
4343
single: HTTP; Request-response paradigm
4444

45-
Step1: The Clientsends a Request
45+
Step1: The ClientSends a Request
4646
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4747

4848
Every conversation on the web starts with a *request*. The request is a text
@@ -105,7 +105,7 @@ the client accepts (``Accept``) and the application the client is using to
105105
make the request (``User-Agent``). Many other headers exist and can be found
106106
on Wikipedia's `List of HTTP header fields`_ article.
107107

108-
Step 2: The Serverreturns a Response
108+
Step 2: The ServerReturns a Response
109109
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
110110

111111
Once a server has received the request, it knows exactly which resource the
@@ -248,7 +248,7 @@ you'll never need to worry about. For example, the ``isSecure()`` method
248248
checks the *three* different values in PHP that can indicate whether or not
249249
the user is connecting via a secured connection (i.e. HTTPS).
250250

251-
..sidebar::ParameterBags and Requestattributes
251+
..sidebar::ParameterBags and RequestAttributes
252252

253253
As seen above, the ``$_GET`` and ``$_POST`` variables are accessible via
254254
the public ``query`` and ``request`` properties respectively. Each of

‎book/internals.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ method returns an array of arguments to pass to the Controller callable. The
127127
default implementation automatically resolves the method arguments, based on
128128
the Request attributes.
129129

130-
..sidebar::Matching Controllermethod arguments from Requestattributes
130+
..sidebar::Matching ControllerMethod Arguments from RequestAttributes
131131

132132
For each method argument, Symfony2 tries to get the value of a Request
133133
attribute with the same name. If it is not defined, the argument default
@@ -505,7 +505,7 @@ token link (a string made of 13 random characters) to access the Web Profiler.
505505
If the token is not clickable, it means that the profiler routes are not
506506
registered (see below for configuration information).
507507

508-
Analyzing Profilingdata with the Web Profiler
508+
Analyzing ProfilingData with the Web Profiler
509509
..............................................
510510

511511
The Web Profiler is a visualization tool for profiling data that you can use

‎book/propel.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ A Simple Example: A Product
1515
In this section, you'll configure your database, create a ``Product`` object,
1616
persist it to the database and fetch it back out.
1717

18-
..sidebar::Code along with theexample
18+
..sidebar::Code along with theExample
1919

2020
If you want to follow along with the example in this chapter, create an
2121
``AcmeStoreBundle`` via:
@@ -425,7 +425,7 @@ before. First, fetch a ``$product`` object and then access its related
425425

426426
Note, in the above example, only one query was made.
427427

428-
Moreinformation on Associations
428+
MoreInformation on Associations
429429
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
430430

431431
You will find more information on relations by reading the dedicated chapter on

‎book/routing.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ routing system can be:
868868
869869
$collection = new RouteCollection();
870870
$collection->add(
871-
'homepage',
871+
'article_show',
872872
new Route('/articles/{culture}/{year}/{title}.{_format}', array(
873873
'_controller' => 'AcmeDemoBundle:Article:show',
874874
'_format' => 'html',
@@ -1161,7 +1161,7 @@ from the new routing resource.
11611161
:doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/routing>`
11621162
to see how.
11631163

1164-
Adding a Hostrequirement to Imported Routes
1164+
Adding a HostRequirement to Imported Routes
11651165
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
11661166

11671167
..versionadded::2.2
@@ -1343,8 +1343,8 @@ method::
13431343
$this->generateUrl('blog_show', array('slug' => 'my-blog-post'), true);
13441344
// http://www.example.com/blog/my-blog-post
13451345

1346-
From a template, in Twig, simply use the ``url()`` function (which generates an absolute URL)
1347-
rather than the ``path()`` function (which generates a relative URL). In PHP, pass ``true``
1346+
From a template, in Twig, simply use the ``url()`` function (which generates an absolute URL)
1347+
rather than the ``path()`` function (which generates a relative URL). In PHP, pass ``true``
13481348
to ``generateUrl()``:
13491349

13501350
..configuration-block::

0 commit comments

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