Skip to content

Commit e48c89b

Browse files
committed
Merge branch '2.8' into 3.4
* 2.8: Remove references to Silex Removing outdated note: AJAX requests are not set to target path fix cache option data type
2 parents 5603f60 + da438c0 commit e48c89b

File tree

6 files changed

+5
-24
lines changed

6 files changed

+5
-24
lines changed

create_framework/dependency_injection.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,7 @@ in great details, but hopefully it gives you enough information to get started
250250
on your own and to better understand how the Symfony framework works
251251
internally.
252252

253-
If you want to learn more, read the source code of the `Silex`_
254-
micro-framework, and especially its `Application`_ class.
255-
256253
Have fun!
257254

258255
.. _`Pimple`: https://github.com/silexphp/Pimple
259-
.. _`Silex`: http://silex.sensiolabs.org/
260256
.. _`Application`: https://github.com/silexphp/Silex/blob/master/src/Silex/Application.php

create_framework/http_foundation.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,18 +285,18 @@ the wheel.
285285

286286
I've almost forgot to talk about one added benefit: using the HttpFoundation
287287
component is the start of better interoperability between all frameworks and
288-
applications using it (like `Symfony`_, `Drupal 8`_, `phpBB 3`_, `ezPublish
289-
5`_, `Laravel`_, `Silex`_ and `more`_).
288+
`applications using it`_ (like `Symfony`_, `Drupal 8`_, `phpBB 3`_, `ezPublish
289+
5`_, `Laravel`_ and `more`_).
290290

291291
.. _`Twig`: https://twig.symfony.com/
292292
.. _`HTTP specification`: https://tools.ietf.org/wg/httpbis/
293293
.. _`audited`: https://symfony.com/blog/symfony2-security-audit
294+
.. _`applications using it`: https://symfony.com/components/HttpFoundation
294295
.. _`Symfony`: https://symfony.com/
295296
.. _`Drupal 8`: https://drupal.org/
296297
.. _`phpBB 3`: https://www.phpbb.com/
297298
.. _`ezPublish 5`: https://ez.no/
298299
.. _`Laravel`: https://laravel.com/
299-
.. _`Silex`: https://silex.sensiolabs.org/
300300
.. _`Midgard CMS`: http://www.midgard-project.org/
301301
.. _`Zikula`: https://zikula.org/
302302
.. _`autoloaded`: https://php.net/autoload

create_framework/http_kernel_httpkernel_class.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Hopefully, you now have a better understanding of why the simple looking
197197
``HttpKernelInterface`` is so powerful. Its default implementation,
198198
``HttpKernel``, gives you access to a lot of cool features, ready to be used
199199
out of the box, with no efforts. And because HttpKernel is actually the code
200-
that powers the Symfony and Silex frameworks, you have the best of both
200+
that powers the Symfony framework, you have the best of both
201201
worlds: a custom framework, tailored to your needs, but based on a rock-solid
202202
and well maintained low-level architecture that has been proven to work for
203203
many websites; a code that has been audited for security issues and that has

create_framework/introduction.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ a fully-featured full-stack web framework.
4141
And of course, each step will be the occasion to learn more about some of the
4242
Symfony Components.
4343

44-
.. tip::
45-
46-
If you don't have time to read the whole book, or if you want to get
47-
started fast, you can also have a look at `Silex`_, a micro-framework
48-
based on the Symfony Components. The code is rather slim and it leverages
49-
many aspects of the Symfony Components.
50-
5144
Many modern web frameworks advertize themselves as being MVC frameworks. This
5245
tutorial won't talk about the MVC pattern, as the Symfony Components are able to
5346
create any type of frameworks, not just the ones that follow the MVC
@@ -121,5 +114,4 @@ In the :doc:`next chapter </create_framework/http_foundation>`, we are going to
121114
introduce the HttpFoundation Component and see what it brings us.
122115

123116
.. _`Symfony`: https://symfony.com/
124-
.. _`Silex`: http://silex.sensiolabs.org/
125117
.. _`Composer`: http://packagist.org/about-composer

reference/configuration/twig.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ application harder to maintain.
121121
cache
122122
~~~~~
123123

124-
**type**: ``string`` | ``false`` | ``Twig\Cache\CacheInterface`` **default**: ``'%kernel.cache_dir%/twig'``
124+
**type**: ``string`` | ``false`` **default**: ``'%kernel.cache_dir%/twig'``
125125

126126
Before using the Twig templates to render some contents, they are compiled into
127127
regular PHP code. Compilation is a costly process, so the result is cached in

security/form_login.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ in the session (perhaps the user went directly to the login page), then the user
2424
is redirected to ``/`` (i.e. the homepage). You can change this behavior in
2525
several ways.
2626

27-
.. note::
28-
29-
Sometimes, redirecting to the originally requested page can cause problems,
30-
like if a background Ajax request "appears" to be the last visited URL,
31-
causing the user to be redirected there. For information on controlling this
32-
behavior, see :doc:`/security`.
33-
3427
Changing the default Page
3528
~~~~~~~~~~~~~~~~~~~~~~~~~
3629

0 commit comments

Comments
 (0)