Merge branch '2.7' into reorder-doctrine-conf-ref-sections

Author: marcverney

.platform.app.yaml

@@ -57,4 +57,5 @@ hooks:
       export PIP_USER=
       pip install pip==9.0.1 wheel==0.29.0
       pip install -r _build/.requirements.txt
+      find .virtualenv -type f -name "*.rst" -delete
       make -C _build html

.travis.yml

@@ -6,9 +6,9 @@ sudo: false
 cache:
   directories: [$HOME/.cache/pip]
 
-install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
+install: pip install -r _build/.requirements.txt
 
-script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html
+script: make -C _build SPHINXOPTS=-nW html
 
 branches:
   except:

_build/.requirements.txt

@@ -1,14 +1,13 @@
-alabaster==0.7.9
-Babel==2.3.4
+alabaster==0.7.10
+Babel==2.4.0
 docutils==0.13.1
 imagesize==0.7.1
-Jinja2==2.9.4
-MarkupSafe==0.23
+Jinja2==2.9.6
+MarkupSafe==1.0
 Pygments==2.2.0
-pytz==2016.10
+pytz==2017.2
 requests==2.12.5
 six==1.10.0
 snowballstemmer==1.2.1
-Sphinx==1.5.2
+Sphinx==1.3.6
 git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php
-

_build/redirection_map

@@ -76,13 +76,20 @@
 /book/configuration /configuration
 /book/propel /propel/propel
 /book/performance /performance
-/cookbook/assetic/apply_to_option /assetic/apply_to_option
-/cookbook/assetic/asset_management /assetic/asset_management
-/cookbook/assetic/index /assetic
-/cookbook/assetic/jpeg_optimize /assetic/jpeg_optimize
-/cookbook/assetic/php /assetic/php
-/cookbook/assetic/uglifyjs /assetic/uglifyjs
-/cookbook/assetic/yuicompressor /assetic/yuicompressor
+/cookbook/assetic/apply_to_option /frontend/assetic/apply_to_option
+/cookbook/assetic/asset_management /frontend/assetic/asset_management
+/cookbook/assetic/index /frontend/assetic
+/cookbook/assetic/jpeg_optimize /frontend/assetic/jpeg_optimize
+/cookbook/assetic/php /frontend/assetic/php
+/cookbook/assetic/uglifyjs /frontend/assetic/uglifyjs
+/cookbook/assetic/yuicompressor /frontend/assetic/yuicompressor
+/assetic /frontend/assetic
+/assetic/apply_to_option /frontend/assetic/apply_to_option
+/assetic/asset_management /frontend/assetic/asset_management
+/assetic/jpeg_optimize /frontend/assetic/jpeg_optimize
+/assetic/php /frontend/assetic/php
+/assetic/uglifyjs /frontend/assetic/uglifyjs
+/assetic/yuicompressor /frontend/assetic/yuicompressor
 /cookbook/bundles/best_practices /bundles/best_practices
 /cookbook/bundles/configuration /bundles/configuration
 /cookbook/bundles/extension /bundles/extension
@@ -150,7 +157,8 @@
 /cookbook/event_dispatcher/event_listener /event_dispatcher
 /cookbook/event_dispatcher/index /event_dispatcher
 /cookbook/event_dispatcher/method_behavior /event_dispatcher/method_behavior
-/cookbook/expressions /expressions/expressions
+/cookbook/expressions /security/expressions
+/expressions /security/expressions
 /cookbook/form/create_custom_field_type /form/create_custom_field_type
 /cookbook/form/create_form_type_extension /form/create_form_type_extension
 /cookbook/form/data_transformers /form/data_transformers
@@ -162,7 +170,7 @@
 /cookbook/form/inherit_data_option /form/inherit_data_option
 /cookbook/form/unit_testing /form/unit_testing
 /cookbook/form/use_empty_data /form/use_empty_data
-/cookbook/frontend/bower /frontend/bower
+/cookbook/frontend/bower /frontend
 /cookbook/frontend/index /frontend
 /cookbook/install/unstable_versions /setup/unstable_versions
 /cookbook/install/bundles /setup/bundles
@@ -181,10 +189,10 @@
 /cookbook/profiler/matchers /profiler/matchers
 /cookbook/profiler/profiling_data /profiler/profiling_data
 /cookbook/profiler/storage /profiler/storage
-/cookbook/psr7 /request/psr7
+/cookbook/psr7 /components/psr7
 /cookbook/request/index /request
-/cookbook/request/load_balancer_reverse_proxy /request/load_balancer_reverse_proxy
-/cookbook/request/mime_type /request/mime_type
+/cookbook/request/load_balancer_reverse_proxy /deployment/proxies
+/cookbook/request/mime_type /reference/configuration/framework#formats
 /cookbook/routing/conditions /routing/conditions
 /cookbook/routing/custom_route_loader /routing/custom_route_loader
 /cookbook/routing/debug /routing/debug
@@ -255,7 +263,7 @@
 /cookbook/upgrade/minor_version /setup/upgrade_major
 /cookbook/upgrade/patch_version /upgrade/bundles
 /cookbook/validation/custom_constraint /validation/custom_constraint
-/cookbook/validation/group_service_resolver /validation/group_service_resolver
+/cookbook/validation/group_service_resolver /form/validation_group_service_resolver
 /cookbook/validation/index /validation
 /cookbook/validation/severity /validation/severity
 /cookbook/web_server/built_in /setup/built_in_web_server
@@ -303,6 +311,7 @@
 /components/form/type_guesser /form/type_guesser
 /components/http_foundation/index /components/http_foundation
 /components/http_foundation/introduction /components/http_foundation
+/components/http_foundation/trusting_proxies /deployment/proxies
 /components/http_kernel/introduction /components/http_kernel
 /components/http_kernel/index /components/http_kernel
 /components/property_access/introduction /components/property_access
@@ -326,3 +335,5 @@
 /install/bundles /setup/bundles
 /form /forms
 /testing/simulating_authentication /testing/http_authentication
+/validation/group_service_resolver /form/validation_group_service_resolver
+/request/load_balancer_reverse_proxy /deployment/proxies

_images/form/simple-form.png

@@ -95,6 +95,7 @@ for the homepage of our app:
 
     namespace AppBundle\Controller;
 
+    use AppBundle\Entity\Post;
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 
@@ -106,7 +107,7 @@ for the homepage of our app:
         public function indexAction()
         {
             $posts = $this->getDoctrine()
-                ->getRepository('AppBundle:Post')
+                ->getRepository(Post::class)
                 ->findLatest();
 
             return $this->render('default/index.html.twig', array(
@@ -170,7 +171,7 @@ manually. In our application, we have this situation in ``CommentController``:
     public function newAction(Request $request, $postSlug)
     {
         $post = $this->getDoctrine()
-            ->getRepository('AppBundle:Post')
+            ->getRepository(Post::class)
             ->findOneBy(array('slug' => $postSlug));
 
         if (!$post) {

best_practices/controllers.rst

@@ -226,7 +226,7 @@ more advanced use-case, you can always do the same security check in PHP:
      */
     public function editAction($id)
     {
-        $post = $this->getDoctrine()->getRepository('AppBundle:Post')
+        $post = $this->getDoctrine()->getRepository(Post::class)
             ->find($id);
 
         if (!$post) {

best_practices/security.rst

@@ -30,22 +30,20 @@ Template Locations
     Store all your application's templates in ``app/Resources/views/`` directory.
 
 Traditionally, Symfony developers stored the application templates in the
-``Resources/views/`` directory of each bundle. Then they used the logical name
-to refer to them (e.g. ``AcmeDemoBundle:Default:index.html.twig``).
+``Resources/views/`` directory of each bundle. Then they used the Twig namespaced
+path to refer to them (e.g. ``@AcmeDemo/Default/index.html.twig``).
 
 But for the templates used in your application, it's much more convenient
 to store them in the ``app/Resources/views/`` directory. For starters, this
 drastically simplifies their logical names:
 
-=================================================  ==================================
-Templates Stored inside Bundles                    Templates Stored in ``app/``
-=================================================  ==================================
-``AcmeDemoBundle:Default:index.html.twig``         ``default/index.html.twig``
-``::layout.html.twig``                             ``layout.html.twig``
-``AcmeDemoBundle::index.html.twig``                ``index.html.twig``
-``AcmeDemoBundle:Default:subdir/index.html.twig``  ``default/subdir/index.html.twig``
-``AcmeDemoBundle:Default/subdir:index.html.twig``  ``default/subdir/index.html.twig``
-=================================================  ==================================
+============================================  ==================================
+Templates Stored inside Bundles               Templates Stored in ``app/``
+============================================  ==================================
+``@AcmeDemo/index.html.twig``                 ``index.html.twig``
+``@AcmeDemo/Default/index.html.twig``         ``default/index.html.twig``
+``@AcmeDemo/Default/subdir/index.html.twig``  ``default/subdir/index.html.twig``
+============================================  ==================================
 
 Another advantage is that centralizing your templates simplifies the work
 of your designers. They don't need to look for templates in lots of directories
@@ -131,7 +129,7 @@ service in the constructor of the Twig extension:
                 new \Twig_SimpleFilter(
                     'md2html',
                     array($this, 'markdownToHtml'),
-                    array('is_safe' => array('html'))
+                    array('is_safe' => array('html'), 'pre_escape' => 'html')
                 ),
             );
         }

best_practices/templates.rst

@@ -49,7 +49,7 @@ tools like GruntJS.
     Use Assetic to compile, combine and minimize web assets, unless you're
     comfortable with frontend tools like GruntJS.
 
-:doc:`Assetic </assetic/asset_management>` is an asset manager capable
+:doc:`Assetic </frontend/assetic/asset_management>` is an asset manager capable
 of compiling assets developed with a lot of different frontend technologies
 like LESS, Sass and CoffeeScript. Combining all your assets with Assetic is a
 matter of wrapping all the assets with a single Twig tag:
@@ -87,8 +87,8 @@ Learn More about Assetic
 ------------------------
 
 Assetic can also minimize CSS and JavaScript assets
-:doc:`using UglifyCSS/UglifyJS </assetic/uglifyjs>` to speed up your
-websites. You can even :doc:`compress images </assetic/jpeg_optimize>`
+:doc:`using UglifyCSS/UglifyJS </frontend/assetic/uglifyjs>` to speed up your
+websites. You can even :doc:`compress images </frontend/assetic/jpeg_optimize>`
 with Assetic to reduce their size before serving them to the user. Check out
 the `official Assetic documentation`_ to learn more about all the available
 features.