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 fc3e50b

Browse filesBrowse files
weaverryanweaverryan
committed
Merge branch '2.5' into 2.6
* 2.5: [symfony#4625] Removing link added for BC, because this is the top of the page anyways Added '-ing' title ending to unify titles look [OptionsResolver] Fix Namespace link filesystem headlines match method names Change refering block name from content to body When explaining how to install dependencies for running unit tests, there are references to "--dev" composer parameter that is the current default value. Fixing missing services key readd mistakenly removed label fix feature freeze dates Conflicts: components/options_resolver.rst
2 parents 63be343 + c5d2eb8 commit fc3e50b
Copy full SHA for fc3e50b

File tree

Expand file treeCollapse file tree

6 files changed

+26
-25
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+26
-25
lines changed

‎components/console/console_arguments.rst

Copy file name to clipboardExpand all lines: components/console/console_arguments.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.. index::
22
single: Console; Console arguments
33

4-
Understand how Console Arguments are Handled
5-
============================================
4+
Understanding how Console Arguments Are Handled
5+
===============================================
66

77
It can be difficult to understand the way arguments are handled by the console application.
88
The Symfony Console application, like many other CLI utility tools, follows the behavior

‎components/filesystem/introduction.rst

Copy file name to clipboardExpand all lines: components/filesystem/introduction.rst
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ endpoint for filesystem operations::
5252
string, an array or any object implementing :phpclass:`Traversable` as
5353
the target argument.
5454

55-
Mkdir
55+
mkdir
5656
~~~~~
5757

5858
:method:`Symfony\\Component\\Filesystem\\Filesystem::mkdir` creates a directory.
@@ -66,7 +66,7 @@ On posix filesystems, directories are created with a default mode value
6666
You can pass an array or any :phpclass:`Traversable` object as the first
6767
argument.
6868

69-
Exists
69+
exists
7070
~~~~~~
7171

7272
:method:`Symfony\\Component\\Filesystem\\Filesystem::exists` checks for the
@@ -83,7 +83,7 @@ presence of all files or directories and returns ``false`` if a file is missing:
8383
You can pass an array or any :phpclass:`Traversable` object as the first
8484
argument.
8585

86-
Copy
86+
copy
8787
~~~~
8888

8989
:method:`Symfony\\Component\\Filesystem\\Filesystem::copy` is used to copy
@@ -97,7 +97,7 @@ the third boolean argument::
9797
// image.jpg will be overridden
9898
$fs->copy('image-ICC.jpg', 'image.jpg', true);
9999

100-
Touch
100+
touch
101101
~~~~~
102102

103103
:method:`Symfony\\Component\\Filesystem\\Filesystem::touch` sets access and
@@ -116,7 +116,7 @@ your own with the second argument. The third argument is the access time::
116116
You can pass an array or any :phpclass:`Traversable` object as the first
117117
argument.
118118

119-
Chown
119+
chown
120120
~~~~~
121121

122122
:method:`Symfony\\Component\\Filesystem\\Filesystem::chown` is used to change
@@ -132,7 +132,7 @@ the owner of a file. The third argument is a boolean recursive option::
132132
You can pass an array or any :phpclass:`Traversable` object as the first
133133
argument.
134134

135-
Chgrp
135+
chgrp
136136
~~~~~
137137

138138
:method:`Symfony\\Component\\Filesystem\\Filesystem::chgrp` is used to change
@@ -148,7 +148,7 @@ the group of a file. The third argument is a boolean recursive option::
148148
You can pass an array or any :phpclass:`Traversable` object as the first
149149
argument.
150150

151-
Chmod
151+
chmod
152152
~~~~~
153153

154154
:method:`Symfony\\Component\\Filesystem\\Filesystem::chmod` is used to change
@@ -164,7 +164,7 @@ the mode of a file. The fourth argument is a boolean recursive option::
164164
You can pass an array or any :phpclass:`Traversable` object as the first
165165
argument.
166166

167-
Remove
167+
remove
168168
~~~~~~
169169

170170
:method:`Symfony\\Component\\Filesystem\\Filesystem::remove` is used to remove
@@ -177,7 +177,7 @@ files, symlinks, directories easily::
177177
You can pass an array or any :phpclass:`Traversable` object as the first
178178
argument.
179179

180-
Rename
180+
rename
181181
~~~~~~
182182

183183
:method:`Symfony\\Component\\Filesystem\\Filesystem::rename` is used to rename

‎contributing/code/tests.rst

Copy file name to clipboardExpand all lines: contributing/code/tests.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Step 2: Install vendors
4141

4242
.. code-block:: bash
4343
44-
$ php composer.phar --dev install
44+
$ php composer.phar install
4545
4646
.. note::
4747

@@ -56,14 +56,14 @@ Step 2: Install vendors
5656
.. code-block:: bash
5757
5858
$ php installer
59-
$ php composer.phar --dev install
59+
$ php composer.phar install
6060
6161
After installation, you can update the vendors to their latest version with
6262
the follow command:
6363

6464
.. code-block:: bash
6565
66-
$ php composer.phar --dev update
66+
$ php composer.phar update
6767
6868
Running
6969
-------

‎contributing/community/releases.rst

Copy file name to clipboardExpand all lines: contributing/community/releases.rst
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ Version Feature Freeze Release End of Maintenance End of Life
9494
2.2 01/2013 03/2013 11/2013 (8 months) 05/2014
9595
**2.3** 03/2013 05/2013 05/2016 (36 months) 05/2017
9696
2.4 09/2013 11/2013 09/2014 (10 months [1]_) 01/2015
97-
2.5 02/2014 05/2014 01/2015 (8 months) 07/2015
97+
2.5 03/2014 05/2014 01/2015 (8 months) 07/2015
9898
2.6 09/2014 11/2014 07/2015 (8 months) 01/2016
99-
**2.7** 02/2015 05/2015 05/2018 (36 months [2]_) 05/2019
99+
**2.7** 03/2015 05/2015 05/2018 (36 months [2]_) 05/2019
100100
3.0 09/2015 11/2015 07/2016 (8 months) 01/2017
101-
3.1 02/2016 05/2016 01/2017 (8 months) 07/2017
101+
3.1 03/2016 05/2016 01/2017 (8 months) 07/2017
102102
3.2 09/2016 11/2016 07/2017 (8 months) 01/2018
103-
**3.3** 02/2017 05/2017 05/2020 (36 months) 05/2021
103+
**3.3** 03/2017 05/2017 05/2020 (36 months) 05/2021
104104
... ... ... ... ...
105105
======= ============== ======= ======================== ===========
106106

‎cookbook/configuration/pdo_session_storage.rst

Copy file name to clipboardExpand all lines: cookbook/configuration/pdo_session_storage.rst
+7-6Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,13 @@ of your project's data, you can use the connection settings from the
137137

138138
.. code-block:: yaml
139139
140-
pdo:
141-
class: PDO
142-
arguments:
143-
- "mysql:host=%database_host%;port=%database_port%;dbname=%database_name%"
144-
- "%database_user%"
145-
- "%database_password%"
140+
services:
141+
pdo:
142+
class: PDO
143+
arguments:
144+
- "mysql:host=%database_host%;port=%database_port%;dbname=%database_name%"
145+
- "%database_user%"
146+
- "%database_password%"
146147
147148
.. code-block:: xml
148149

‎quick_tour/the_view.rst

Copy file name to clipboardExpand all lines: quick_tour/the_view.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Open the ``app/Resources/views/base.html.twig`` file that corresponds to the
126126

127127
The ``{% block %}`` tags tell the template engine that a child template may
128128
override those portions of the template. In this example, the ``index.html.twig``
129-
template overrides the ``content`` block, but not the ``title`` block, which will
129+
template overrides the ``body`` block, but not the ``title`` block, which will
130130
display the default content defined in the ``base.html.twig`` template.
131131

132132
Using Tags, Filters, and Functions

0 commit comments

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