Skip to content

Commit 0d92394

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [#6228] backport to the 2.3 branch Replace references of PSR-0 with PSR-4 Update testing.rst Typo in default session save_path [book] fixes typo about redirect status codes in the controller chapter. Update major_version.rst Conflicts: cookbook/security/entity_provider.rst
2 parents 8e8144f + 129d853 commit 0d92394

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

book/controller.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ If you want to redirect the user to another page, use the ``redirectToRoute()``
438438
return $this->redirectToRoute('homepage');
439439

440440
// redirectToRoute is equivalent to using redirect() and generateUrl() together:
441-
// return $this->redirect($this->generateUrl('homepage'), 301);
441+
// return $this->redirect($this->generateUrl('homepage'));
442442
}
443443

444444
Or, if you want to redirect externally, just use ``redirect()`` and pass it the URL::

book/testing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ section:
866866
Learn more
867867
----------
868868

869-
* The :doc:`chapter about tests in the Symfony Framework Best Practices </best_practices/tests>`
869+
* :doc:`The chapter about tests in the Symfony Framework Best Practices </best_practices/tests>`
870870
* :doc:`/components/dom_crawler`
871871
* :doc:`/components/css_selector`
872872
* :doc:`/cookbook/testing/http_authentication`

cookbook/upgrade/major_version.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Next, use Composer to download new versions of the libraries:
134134

135135
.. code-block:: bash
136136
137-
$ composer update --with-dependencies symfony/symfony
137+
$ composer update symfony/symfony
138138
139139
.. include:: /cookbook/upgrade/_update_dep_errors.rst.inc
140140

create_framework/http_foundation.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ version may vary).
138138
``vendor/autoload.php`` file that allows any class to be easily
139139
`autoloaded`_. Without autoloading, you would need to require the file
140140
where a class is defined before being able to use it. But thanks to
141-
`PSR-0`_, we can just let Composer and PHP do the hard work for us.
141+
`PSR-4`_, we can just let Composer and PHP do the hard work for us.
142142

143143
Now, let's rewrite our application by using the ``Request`` and the
144144
``Response`` classes::
@@ -309,5 +309,5 @@ applications using it (like `Symfony`_, `Drupal 8`_, `phpBB 4`_, `ezPublish
309309
.. _`Midgard CMS`: http://www.midgard-project.org/
310310
.. _`Zikula`: http://zikula.org/
311311
.. _`autoloaded`: http://php.net/autoload
312-
.. _`PSR-0`: https://github.com./php-fig/fig-standards/blob/master/accepted/PSR-0.md
312+
.. _`PSR-4`: http://www.php-fig.org/psr/psr-4/
313313
.. _`more`: http://symfony.com/components/HttpFoundation

reference/configuration/framework.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ start and depends on `gc_divisor`_ and `gc_probability`_.
808808
save_path
809809
.........
810810

811-
**type**: ``string`` **default**: ``%kernel.cache.dir%/sessions``
811+
**type**: ``string`` **default**: ``%kernel.cache_dir%/sessions``
812812

813813
This determines the argument to be passed to the save handler. If you choose
814814
the default file handler, this is the path where the session files are created.

0 commit comments

Comments
 (0)