Merge branch '4.1'

* 4.1:
  Remove references to Silex
  Removing outdated note: AJAX requests are not set to target path
  Fixed some minor issues
  server fails to run on this tutorial
  fix XML attribute name
  fix cache option data type

Author: javiereguiluz

create_framework/dependency_injection.rst

@@ -250,11 +250,7 @@ in great details, but hopefully it gives you enough information to get started
 on your own and to better understand how the Symfony framework works
 internally.
 
-If you want to learn more, read the source code of the `Silex`_
-micro-framework, and especially its `Application`_ class.
-
 Have fun!
 
 .. _`Pimple`: https://github.com/silexphp/Pimple
-.. _`Silex`: http://silex.sensiolabs.org/
 .. _`Application`: https://github.com/silexphp/Silex/blob/master/src/Silex/Application.php

create_framework/http_foundation.rst

@@ -285,18 +285,18 @@ the wheel.
 
 I've almost forgot to talk about one added benefit: using the HttpFoundation
 component is the start of better interoperability between all frameworks and
-applications using it (like `Symfony`_, `Drupal 8`_, `phpBB 3`_, `ezPublish
-5`_, `Laravel`_, `Silex`_ and `more`_).
+`applications using it`_ (like `Symfony`_, `Drupal 8`_, `phpBB 3`_, `ezPublish
+5`_, `Laravel`_ and `more`_).
 
 .. _`Twig`: https://twig.symfony.com/
 .. _`HTTP specification`: https://tools.ietf.org/wg/httpbis/
 .. _`audited`: https://symfony.com/blog/symfony2-security-audit
+.. _`applications using it`: https://symfony.com/components/HttpFoundation
 .. _`Symfony`: https://symfony.com/
 .. _`Drupal 8`: https://drupal.org/
 .. _`phpBB 3`: https://www.phpbb.com/
 .. _`ezPublish 5`: https://ez.no/
 .. _`Laravel`: https://laravel.com/
-.. _`Silex`: https://silex.sensiolabs.org/
 .. _`Midgard CMS`: http://www.midgard-project.org/
 .. _`Zikula`: https://zikula.org/
 .. _`autoloaded`: https://php.net/autoload

create_framework/http_kernel_httpkernel_class.rst

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

create_framework/introduction.rst

@@ -41,13 +41,6 @@ a fully-featured full-stack web framework.
 And of course, each step will be the occasion to learn more about some of the
 Symfony Components.
 
-.. tip::
-
-    If you don't have time to read the whole book, or if you want to get
-    started fast, you can also have a look at `Silex`_, a micro-framework
-    based on the Symfony Components. The code is rather slim and it leverages
-    many aspects of the Symfony Components.
-
 Many modern web frameworks advertize themselves as being MVC frameworks. This
 tutorial won't talk about the MVC pattern, as the Symfony Components are able to
 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
 introduce the HttpFoundation Component and see what it brings us.
 
 .. _`Symfony`: https://symfony.com/
-.. _`Silex`: http://silex.sensiolabs.org/
 .. _`Composer`: http://packagist.org/about-composer

reference/configuration/twig.rst

@@ -121,7 +121,7 @@ application harder to maintain.
 cache
 ~~~~~
 
-**type**: ``string`` | ``false`` | ``Twig\Cache\CacheInterface`` **default**: ``'%kernel.cache_dir%/twig'``
+**type**: ``string`` | ``false`` **default**: ``'%kernel.cache_dir%/twig'``
 
 Before using the Twig templates to render some contents, they are compiled into
 regular PHP code. Compilation is a costly process, so the result is cached in

security/custom_authentication_provider.rst

@@ -322,7 +322,7 @@ create a class which implements
             $providerId = 'security.authentication.provider.wsse.'.$id;
             $container
                 ->setDefinition($providerId, new ChildDefinition(WsseProvider::class))
-                ->replaceArgument(0, new Reference($userProvider))
+                ->setArgument(0, new Reference($userProvider))
             ;
 
             $listenerId = 'security.authentication.listener.wsse.'.$id;
@@ -575,8 +575,8 @@ in order to put it to use::
             $providerId = 'security.authentication.provider.wsse.'.$id;
             $container
                 ->setDefinition($providerId, new ChildDefinition(WsseProvider::class))
-                ->replaceArgument(0, new Reference($userProvider))
-                ->replaceArgument(2, $config['lifetime']);
+                ->setArgument(0, new Reference($userProvider))
+                ->setArgument(2, $config['lifetime']);
             // ...
         }
 

security/form_login.rst

@@ -24,13 +24,6 @@ in the session (perhaps the user went directly to the login page), then the user
 is redirected to ``/`` (i.e. the homepage). You can change this behavior in
 several ways.
 
-.. note::
-
-    Sometimes, redirecting to the originally requested page can cause problems,
-    like if a background Ajax request "appears" to be the last visited URL,
-    causing the user to be redirected there. For information on controlling this
-    behavior, see :doc:`/security`.
-
 Changing the default Page
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 

workflow/usage.rst

@@ -78,7 +78,7 @@ like this:
 
             <framework:config>
                 <framework:workflow name="blog_publishing" type="workflow">
-                    <framework:audit_trail enabled="true" />
+                    <framework:audit-trail enabled="true" />
 
                     <framework:marking-store type="single_state">
                       <framework:argument>currentPlace</framework:argument>