Skip to content

Commit a465d06

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: (31 commits) Adding details about the Symfony framework as comments Adjust Application use statement replacing with index, otherwise these documents are not included in *any* index Error in CSRF example code snippet Added missing reference Update serializer.rst Adding missing link reference for #6877, because someone must have been in a hurry :) Remove additional backslash Add a class specificity for SplFileInfo Update Reference to Service Container Tags Remove extra quotes from ExprBuilder::thenInvalid() usage Update PropertyAccess Component Path Fix Incorrect Indent Suggested Changes Add PropertyInfo Component Documentation missing "`" added lyrixx to the core team Remove redundant verb Removed the "Learn more" section Created a "Platform as a Service" section ...
2 parents 1a3614c + bc00741 commit a465d06

File tree

16 files changed

+694
-259
lines changed

16 files changed

+694
-259
lines changed

_build/redirection_map

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,4 +328,5 @@
328328
/components/var_dumper/index /components/var_dumper
329329
/components/yaml/introduction /components/yaml
330330
/components/yaml/index /components/yaml
331+
/deployment/tools /deployment
331332
/install/bundles /setup/bundles

components/config/definition.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ The builder is used for adding advanced validation rules to node definitions, li
722722
->isRequired()
723723
->validate()
724724
->ifNotInArray(array('mysql', 'sqlite', 'mssql'))
725-
->thenInvalid('Invalid database driver "%s"')
725+
->thenInvalid('Invalid database driver %s')
726726
->end()
727727
->end()
728728
->end()

components/finder.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ directories::
4141
}
4242

4343
The ``$file`` is an instance of :class:`Symfony\\Component\\Finder\\SplFileInfo`
44-
which extends :phpclass:`SplFileInfo` to provide methods to work with relative
44+
which extends PHP's own :phpclass:`SplFileInfo` to provide methods to work with relative
4545
paths.
4646

4747
The above code prints the names of all the files in the current directory

components/form.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ The following snippet adds CSRF protection to the form factory::
134134

135135
$formFactory = Forms::createFormFactoryBuilder()
136136
// ...
137-
->addExtension(new CsrfExtension($csrfStorage))
137+
->addExtension(new CsrfExtension($csrfManager))
138138
->getFormFactory();
139139

140140
Internally, this extension will automatically add a hidden field to every

0 commit comments

Comments
 (0)