Skip to content

Commit 1fd33a1

Browse files
committed
Merge branch '3.3' into 3.4
* 3.3: tweaking language fix(syntax): added a space before has fix(tip): Add the tip block for realpth_cache_size [FIX](Realpath) Show controller tag for PHP configuration Change order of configuration types remove needless PHP version Update without_class.rst [#8767] fix list item termination character Typo added Tobias Nyholm in the core team
2 parents aa74eda + 7c1f1c2 commit 1fd33a1

File tree

6 files changed

+32
-30
lines changed

6 files changed

+32
-30
lines changed

contributing/code/core_team.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ Active Core Members
8181
components and the SecurityBundle_;
8282

8383
* **Maxime Steinhausser** (`ogizanagi`_) can merge into Config_, Console_,
84-
Form_, Serializer_, DependencyInjection_, and HttpKernel_ components.
84+
Form_, Serializer_, DependencyInjection_, and HttpKernel_ components;
85+
86+
* **Tobias Nyholm** (`Nyholm`) manages the official and contrib recipes
87+
repositories.
8588

8689
* **Deciders** (``@symfony/deciders`` on GitHub):
8790

@@ -223,4 +226,4 @@ discretion of the **Project Leader**.
223226
.. _`lyrixx`: https://github.com/lyrixx/
224227
.. _`chalasr`: https://github.com/chalasr/
225228
.. _`ogizanagi`: https://github.com/ogizanagi/
226-
.. _`csarrazi`: https://github.com/csarrazi/
229+
.. _`Nyholm`: https://github.com/Nyholm

form/without_class.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ an array.
6363
Adding Validation
6464
-----------------
6565

66-
The only missing piece is validation. Usually, when you call ``$form->isValid()``,
66+
The only missing piece is validation. Usually, when you call ``$form->handleRequest($request)``,
6767
the object is validated by reading the constraints that you applied to that
6868
class. If your form is mapped to an object (i.e. you're using the ``data_class``
6969
option or passing an object to your form), this is almost always the approach

performance.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,12 @@ real and absolute file system paths. This increases the performance for
7979
applications like Symfony that open many PHP files, especially on Windows
8080
systems.
8181

82-
By default, PHP sets a ``realpath_cache_size`` of ``16K`` which is too low for
83-
Symfony. Consider updating this value at least to ``4096K``. In addition, cached
84-
paths are only stored for ``120`` seconds by default. Consider updating this
85-
value too using the ``realpath_cache_ttl`` option:
82+
Consider increasing the ``realpath_cache_size`` and ``realpath_cache_ttl``:
8683

8784
.. code-block:: ini
8885
8986
; php.ini
87+
; 4096k is the default value in PHP 7.2
9088
realpath_cache_size=4096K
9189
realpath_cache_ttl=600
9290

reference/constraints/Expression.rst

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,6 @@ One way to accomplish this is with the Expression constraint:
6060

6161
.. configuration-block::
6262

63-
.. code-block:: yaml
64-
65-
# src/AppBundle/Resources/config/validation.yml
66-
AppBundle\Model\BlogPost:
67-
constraints:
68-
- Expression:
69-
expression: "this.getCategory() in ['php', 'symfony'] or !this.isTechnicalPost()"
70-
message: "If this is a tech post, the category should be either php or symfony!"
71-
7263
.. code-block:: php-annotations
7364
7465
// src/AppBundle/Model/BlogPost.php
@@ -87,6 +78,15 @@ One way to accomplish this is with the Expression constraint:
8778
// ...
8879
}
8980
81+
.. code-block:: yaml
82+
83+
# src/AppBundle/Resources/config/validation.yml
84+
AppBundle\Model\BlogPost:
85+
constraints:
86+
- Expression:
87+
expression: "this.getCategory() in ['php', 'symfony'] or !this.isTechnicalPost()"
88+
message: "If this is a tech post, the category should be either php or symfony!"
89+
9090
.. code-block:: xml
9191
9292
<!-- src/AppBundle/Resources/config/validation.xml -->
@@ -141,16 +141,6 @@ more about the expression language syntax, see
141141

142142
.. configuration-block::
143143

144-
.. code-block:: yaml
145-
146-
# src/AppBundle/Resources/config/validation.yml
147-
AppBundle\Model\BlogPost:
148-
properties:
149-
isTechnicalPost:
150-
- Expression:
151-
expression: "this.getCategory() in ['php', 'symfony'] or value == false"
152-
message: "If this is a tech post, the category should be either php or symfony!"
153-
154144
.. code-block:: php-annotations
155145
156146
// src/AppBundle/Model/BlogPost.php
@@ -173,6 +163,16 @@ more about the expression language syntax, see
173163
// ...
174164
}
175165
166+
.. code-block:: yaml
167+
168+
# src/AppBundle/Resources/config/validation.yml
169+
AppBundle\Model\BlogPost:
170+
properties:
171+
isTechnicalPost:
172+
- Expression:
173+
expression: "this.getCategory() in ['php', 'symfony'] or value == false"
174+
message: "If this is a tech post, the category should be either php or symfony!"
175+
176176
.. code-block:: xml
177177
178178
<!-- src/AppBundle/Resources/config/validation.xml -->

service_container/3.3-di-changes.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,8 @@ The third big change is that, in a new Symfony 3.3 project, your controllers are
373373
// app/config/services.php
374374
375375
// ...
376-
376+
377+
$definition->addTag('controller.service_arguments');
377378
$this->registerClasses($definition, 'AppBundle\\Controller\\', '../../src/AppBundle/Controller/*');
378379
379380
But, you might not even notice this. First, your controllers *can* still extend

setup.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ page.
129129
Creating Symfony Applications with Composer
130130
-------------------------------------------
131131

132-
If you still use PHP 5.3 or can't use the Symfony installer for any reason, you
133-
can create Symfony applications with `Composer`_, the dependency manager used by
134-
modern PHP applications.
132+
If you can't use the Symfony installer for any reason, you can create Symfony
133+
applications with `Composer`_, the dependency manager used by modern PHP
134+
applications.
135135

136136
If you don't have Composer installed in your computer, start by
137137
:doc:`installing Composer globally </setup/composer>`. Then, execute the

0 commit comments

Comments
 (0)