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
Appearance settings

Commit 40a1fa3

Browse filesBrowse files
weaverryanweaverryan
committed
Merge branch '2.0' into 2.1
Conflicts: components/map.rst.inc
2 parents e753faa + 3a35de8 commit 40a1fa3
Copy full SHA for 40a1fa3

File tree

Expand file treeCollapse file tree

5 files changed

+21
-18
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+21
-18
lines changed

‎book/controller.rst

Copy file name to clipboardExpand all lines: book/controller.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ a controller object. Controllers are also called *actions*.
117117

118118
This controller is pretty straightforward, but let's walk through it:
119119

120-
* *line 3*: Symfony2 takes advantage of PHP 5.3 namespace functionality to
120+
* *line 4*: Symfony2 takes advantage of PHP 5.3 namespace functionality to
121121
namespace the entire controller class. The ``use`` keyword imports the
122122
``Response`` class, which our controller must return.
123123

‎components/config/caching.rst

Copy file name to clipboardExpand all lines: components/config/caching.rst
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ the cache can tell if it is still fresh or that its contents should be regenerat
3737
$resources = array();
3838

3939
foreach ($yamlUserFiles as $yamlUserFile) {
40+
// see the previous article "Loading resources" to see where $delegatingLoader comes from
4041
$delegatingLoader->load($yamlUserFile);
4142
$resources[] = new FileResource($yamlUserFile);
4243
}

‎components/dependency_injection/compilation.rst

Copy file name to clipboardExpand all lines: components/dependency_injection/compilation.rst
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,8 @@ but getting an up to date configuration whilst developing your application::
365365

366366
// ...
367367

368-
// set $isDebug based on something in your project
368+
// based on something in your project
369+
$isDebug = ...;
369370

370371
$file = __DIR__ .'/cache/container.php';
371372

@@ -398,7 +399,8 @@ and use them as metadata for the cache::
398399

399400
// ...
400401

401-
// set $isDebug based on something in your project
402+
// based on something in your project
403+
$isDebug = ...;
402404

403405
$file = __DIR__ .'/cache/container.php';
404406
$containerConfigCache = new ConfigCache($file, $isDebug);

‎components/map.rst.inc

Copy file name to clipboardExpand all lines: components/map.rst.inc
+14-14Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* **The Class Loader Component**
1+
* **Class Loader**
22

33
* :doc:`/components/class_loader`
44

@@ -14,7 +14,7 @@
1414
* :doc:`/components/console/introduction`
1515
* :doc:`/components/console/usage`
1616

17-
* **The CSS Selector Component**
17+
* **CSS Selector**
1818

1919
* :doc:`/components/css_selector`
2020

@@ -29,21 +29,21 @@
2929
* :doc:`/components/dependency_injection/parentservices`
3030
* :doc:`/components/dependency_injection/advanced`
3131

32+
* **DOM Crawler**
33+
34+
* :doc:`/components/dom_crawler`
35+
3236
* :doc:`/components/event_dispatcher/index`
3337

3438
* :doc:`/components/event_dispatcher/introduction`
3539
* :doc:`/components/event_dispatcher/container_aware_dispatcher`
3640
* :doc:`/components/event_dispatcher/generic_event`
3741

38-
* **The DOM Crawler Component**
39-
40-
* :doc:`/components/dom_crawler`
41-
42-
* **The Filesystem Component**
42+
* **Filesystem**
4343

4444
* :doc:`/components/filesystem`
4545

46-
* **The Finder Component**
46+
* **Finder**
4747

4848
* :doc:`/components/finder`
4949

@@ -54,26 +54,26 @@
5454
* :doc:`/components/http_foundation/session_configuration`
5555
* :doc:`/components/http_foundation/session_testing`
5656

57-
* **The Locale Component**
57+
* **Locale**
5858

5959
* :doc:`/components/locale`
6060

61-
* **The Process Component**
61+
* **Process**
6262

6363
* :doc:`/components/process`
6464

65-
* **The Routing Component**
65+
* **Routing**
6666

6767
* :doc:`/components/routing`
6868

69-
* **The Serializer Component**
69+
* **Serializer**
7070

7171
* :doc:`/components/serializer`
7272

73-
* **The Templating Component**
73+
* **Templating**
7474

7575
* :doc:`/components/templating`
7676

77-
* **The YAML Component**
77+
* **YAML**
7878

7979
* :doc:`/components/yaml`

‎reference/forms/types/file.rst

Copy file name to clipboardExpand all lines: reference/forms/types/file.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The ``file`` type represents a file input in your form.
1414
| | - `read_only`_ |
1515
| | - `error_bubbling`_ |
1616
+-------------+---------------------------------------------------------------------+
17-
| Parent type | :doc:`form</reference/forms/types/form>` |
17+
| Parent type | :doc:`form</reference/forms/types/form>` |
1818
+-------------+---------------------------------------------------------------------+
1919
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\FileType` |
2020
+-------------+---------------------------------------------------------------------+

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.