8000 Merge branch '2.7' · symfony/symfony-docs@2d1c336 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2d1c336

Browse files
weaverryanweaverryan
committed
Merge branch '2.7'
* 2.7: [#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 [OptionsResolver] Fix Namespace link filesystem headlines match method names Change refering block name from content to body Update pdo_session_storage.rst 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
2 parents d30dc9e + fc3e50b commit 2d1c336

File tree

7 files changed

+59
-53
lines changed

7 files changed

+59
-53
lines changed

‎components/console/console_arguments.rst

Lines 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

Lines 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

‎components/options_resolver.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ Sometimes, option values need to be normalized before you can use them. For
427427
instance, assume that the ``host`` should always start with ``http://``. To do
428428
that, you can write normalizers. Normalizers are executed after validating an
429429
option. You can configure a normalizer by calling
430-
:method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::setNormalizer`::
430+
:method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setNormalizer`::
431431

432432
// ...
433433
class Mailer
@@ -449,9 +449,9 @@ option. You can configure a normalizer by calling
449449
}
450450

451451
.. versionadded:: 2.6
452-
The method :method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::setNormalizer`
452+
The method :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setNormalizer`
453453
was introduced in Symfony 2.6. Before, you had to use
454-
:method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::setNormalizers`.
454+
:method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setNormalizers`.
455455

456456
The normalizer receives the actual ``$value`` and returns the normalized form.
457457
You see that the closure also takes an ``$options`` parameter. This is useful
@@ -588,9 +588,9 @@ comes from the default::
588588
}
589589

590590
.. versionadded:: 2.6
591-
The method :method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::setDefined`
591+
The method :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setDefined`
592592
was introduced in Symfony 2.6. Before, you had to use
593-
:method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::setOptional`.
593+
:method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setOptional`.
594594

595595
You can use :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setDefined`
596596
to define an option without setting a default value. Then the option will only
@@ -644,8 +644,8 @@ options in one go::
644644
}
645645

646646
.. versionadded:: 2.6
647-
The method :method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::isDefined`
648-
and :method:`Symfony\\Components\\OptionsResolver\\OptionsResolver::getDefinedOptions`
647+
The method :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::isDefined`
648+
and :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::getDefinedOptions`
649649
were introduced in Symfony 2.6.
650650

651651
The methods :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::isDefined`

‎contributing/code/tests.rst

Lines 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

Lines 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

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ configuration format of your choice):
2626
2727
parameters:
2828
pdo.db_options:
29-
db_table: session
30-
db_id_col: session_id
31-
db_data_col: session_value
32-
db_time_col: session_time
29+
db_table: session
30+
db_id_col: session_id
31+
db_data_col: session_data
32+
db_time_col: session_time
33+
db_lifetime_col: session_lifetime
3334
3435
services:
3536
pdo:
@@ -56,8 +57,9 @@ configuration format of your choice):
5657
<parameter key="pdo.db_options" type="collection">
5758
<parameter key="db_table">session</parameter>
5859
<parameter key="db_id_col">session_id</parameter>
59-
<parameter key="db_data_col">session_value</parameter>
60+
<parameter key="db_data_col">session_data</parameter>
6061
<parameter key="db_time_col">session_time</parameter>
62+
<parameter key="db_lifetime_col">session_lifetime</parameter>
6163
</parameter>
6264
</parameters>
6365
@@ -93,10 +95,11 @@ configuration format of your choice):
9395
));
9496
9597
$container->setParameter('pdo.db_options', array(
96-
'db_table' => 'session',
97-
'db_id_col' => 'session_id',
98-
'db_data_col' => 'session_value',
99-
'db_time_col' => 'session_time',
98+
'db_table' => 'session',
99+
'db_id_col' => 'session_id',
100+
'db_data_col' => 'session_data',
101+
'db_time_col' => 'session_time',
102+
'db_lifetime_col' => 'session_lifetime',
100103
));
101104
102105
$pdoDefinition = new Definition('PDO', array(
@@ -114,9 +117,10 @@ configuration format of your choice):
114117
$container->setDefinition('session.handler.pdo', $storageDefinition);
115118
116119
* ``db_table``: The name of the session table in your database
117-
* ``db_id_col``: The name of the id column in your session table (VARCHAR(255) or larger)
118-
* ``db_data_col``: The name of the value column in your session table (TEXT or CLOB)
120+
* ``db_id_col``: The name of the id column in your session table (VARCHAR(128))
121+
* ``db_data_col``: The name of the value column in your session table (BLOB)
119122
* ``db_time_col``: The name of the time column in your session table (INTEGER)
123+
* ``db_lifetime_col``: The name of the lifetime column in your session table (INTEGER)
120124

121125
Sharing your Database Connection Information
122126
--------------------------------------------
@@ -133,12 +137,13 @@ of your project's data, you can use the connection settings from the
133137

134138
.. code-block:: yaml
135139
136-
pdo:
137-
class: PDO
138-
arguments:
139-
- "mysql:host=%database_host%;port=%database_port%;dbname=%database_name%"
140-
- "%database_user%"
141-
- "%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%"
142147
143148
.. code-block:: xml
144149
@@ -168,11 +173,11 @@ following (MySQL):
168173
.. code-block:: sql
169174
170175
CREATE TABLE `session` (
171-
`session_id` varchar(255) NOT NULL,
172-
`session_value` text NOT NULL,
173-
`session_time` int(11) NOT NULL,
174-
PRIMARY KEY (`session_id`)
175-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
176+
`session_id` VARBINARY(128) NOT NULL PRIMARY KEY,
177+
`session_data` BLOB NOT NULL,
178+
`session_time` INTEGER UNSIGNED NOT NULL,
179+
`session_lifetime` MEDIUMINT NOT NULL
180+
) COLLATE utf8_bin, ENGINE = InnoDB;
176181
177182
PostgreSQL
178183
~~~~~~~~~~
@@ -182,10 +187,10 @@ For PostgreSQL, the statement should look like this:
182187
.. code-block:: sql
183188
184189
CREATE TABLE session (
185-
session_id character varying(255) NOT NULL,
186-
session_value text NOT NULL,
187-
session_time integer NOT NULL,
188-
CONSTRAINT session_pkey PRIMARY KEY (session_id)
190+
session_id VARCHAR(128) NOT NULL PRIMARY KEY,
191+
session_data BYTEA NOT NULL,
192+
session_time INTEGER NOT NULL,
193+
session_lifetime INTEGER NOT NULL
189194
);
190195
191196
Microsoft SQL Server
@@ -197,8 +202,9 @@ For MSSQL, the statement might look like the following:
197202
198203
CREATE TABLE [dbo].[session](
199204
[session_id] [nvarchar](255) NOT NULL,
200-
[session_value] [ntext] NOT NULL,
205+
[session_data] [ntext] NOT NULL,
201206
[session_time] [int] NOT NULL,
207+
[session_lifetime] [int] NOT NULL,
202208
PRIMARY KEY CLUSTERED(
203209
[session_id] ASC
204210
) WITH (

‎quick_tour/the_view.rst

Lines 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