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

Commit2b027a9

Browse files
committed
Merge branch '3.1'
Conflicts:reference/configuration/framework.rst
2 parentsc5328d7 +4240817 commit2b027a9

File tree

20 files changed

+102
-66
lines changed

20 files changed

+102
-66
lines changed

‎best_practices/business-logic.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Inside here, you can create whatever directories you want to organize things:
1515

1616
..code-block::text
1717
18-
symfony2-project/
18+
symfony-project/
1919
├─ app/
2020
├─ src/
2121
│ └─ AppBundle/
@@ -35,7 +35,7 @@ and put things there:
3535

3636
..code-block::text
3737
38-
symfony2-project/
38+
symfony-project/
3939
├─ app/
4040
├─ src/
4141
│ ├─ Acme/
@@ -180,7 +180,7 @@ The three entities defined by our sample blog application are a good example:
180180

181181
..code-block::text
182182
183-
symfony2-project/
183+
symfony-project/
184184
├─ ...
185185
└─ src/
186186
└─ AppBundle/

‎best_practices/controllers.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ it more difficult to know which template is being rendered. It also makes
8585
it less obvious to beginners that a controller should always return a Response
8686
object (unless you're using a view layer).
8787

88-
Howthe ControllerLooks
89-
------------------------
88+
What doesthe Controllerlook like
89+
----------------------------------
9090

91-
Considering all this, here is an example ofhow the controller should look
91+
Considering all this, here is an example ofwhat the controller should look like
9292
for the homepage of our app:
9393

9494
..code-block::php

‎components/cache/cache_pools.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ is ``getItem($key)``, which returns the cache item identified by the given key::
169169

170170
use Symfony\Component\Cache\Adapter\FilesystemAdapter;
171171

172-
$cache = new FilesystemAdapter('app.cache')
172+
$cache = new FilesystemAdapter('app.cache');
173173
$latestNews = $cache->getItem('latest_news');
174174

175175
If no item is defined for the given key, the method doesn't return a ``null``

‎components/expression_language.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ How can the Expression Engine Help Me?
2121
--------------------------------------
2222

2323
The purpose of the component is to allow users to use expressions inside
24-
configuration for more complex logic. For some examples, theSymfony2 Framework
24+
configuration for more complex logic. For some examples, theSymfony Framework
2525
uses expressions in security, for validation rules and in route matching.
2626

2727
Besides using the component in the framework itself, the ExpressionLanguage

‎components/filesystem.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ On POSIX filesystems, directories are created with a default mode value
6060
You can pass an array or any:phpclass:`Traversable` object as the first
6161
argument.
6262

63+
..note::
64+
65+
This function ignores already existing directories.
66+
6367
exists
6468
~~~~~~
6569

‎components/yaml/yaml_format.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ YAML uses the ISO-8601 standard to express dates:
158158

159159
..code-block::yaml
160160
161-
2001-12-14t21:59:43.10-05:00
161+
2001-12-14T21:59:43.10-05:00
162162
163163
..code-block::yaml
164164

‎configuration.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@ There are *two* ways to know *what* keys you can configure:
112112

113113
#. Use the:doc:`Reference Section</reference/index>`;
114114

115-
#. Use the ``config:dump`` command;
115+
#. Use the ``config:dump-reference`` command.
116116

117117
For example, if you want to configure something in Twig, you can see an example
118118
dump of all available configuration options by running:
119119

120120
..code-block::terminal
121121
122-
$ php bin/console config:dump twig
122+
$ php bin/console config:dump-reference twig
123123
124124
..index::
125125
single: Environments; Introduction
@@ -183,7 +183,7 @@ can also load XML files or PHP files.
183183

184184
.. _config-parameter-intro:
185185

186-
The parameterskey: Parameters (Variables)
186+
The parametersKey: Parameters (Variables)
187187
------------------------------------------
188188

189189
Another special key is called ``parameters``: it's used to define *variables* that

‎configuration/micro_kernel_trait.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,13 @@ to hold the kernel. Now it looks like this::
199199
// optional, to use the standard Symfony cache directory
200200
public function getCacheDir()
201201
{
202-
returndirname(__DIR__).'/var/cache/'.$this->getEnvironment();
202+
return __DIR__.'/../var/cache/'.$this->getEnvironment();
203203
}
204204

205205
// optional, to use the standard Symfony logs directory
206206
public function getLogDir()
207207
{
208-
returndirname(__DIR__).'/var/logs';
208+
return __DIR__.'/../var/logs';
209209
}
210210
}
211211

‎controller.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ object. To get it in your controller, just add it as an argument and
320320

321321
use Symfony\Component\HttpFoundation\Request;
322322

323-
public function indexAction($firstName, $lastName, Request $request)
323+
public function indexAction(Request $request, $firstName, $lastName)
324324
{
325325
$page = $request->query->get('page', 1);
326326

‎form/form_dependencies.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ Next, register this as a service and tag it with ``form.type``:
101101
services:
102102
app.form.type.task:
103103
class:AppBundle\Form\TaskType
104+
arguments:['@doctrine.orm.entity_manager']
104105
tags:
105106
-{ name: form.type }
106107
@@ -114,6 +115,7 @@ Next, register this as a service and tag it with ``form.type``:
114115
115116
<services>
116117
<serviceid="app.form.type.task"class="AppBundle\Form\TaskType">
118+
<argumenttype="service"id="doctrine.orm.entity_manager"/>
117119
<tagname="form.type" />
118120
</service>
119121
</services>
@@ -127,6 +129,7 @@ Next, register this as a service and tag it with ``form.type``:
127129
'app.form.type.task',
128130
'AppBundle\Form\TaskType'
129131
)
132+
->addArgument('@doctrine.orm.entity_manager')
130133
->addTag('form.type')
131134
;
132135

0 commit comments

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