Skip to content

Commit e08724e

Browse files
committed
Merge branch '2.8'
* 2.8: [#5423] Minor tweaks to new voter update Added a link to the AbstractVoter cookbook Fixed some typos Removed the abstract_voter.rst.inc file add fixes to abstract_voter include file fix problems pointed out by @javiereguiluz and @cordoval add & update doc entries on AbstractVoter implementation use HTTPS for links to symfony.com data transformers cookbook service definition typo 5370 simplify original sentence fixing standard and fixing missing argument in php+xml formats Updating for AppBundle and purposefully *not* doing work on configure 5370 rewrite sentence about fingers crossed handler action level
2 parents 0ef7e1a + 273cab9 commit e08724e

28 files changed

+211
-160
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ Contributing
22
------------
33

44
We love contributors! For more information on how you can contribute to the
5-
Symfony documentation, please read [Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html)
6-
and notice the [Pull Request Format](http://symfony.com/doc/current/contributing/documentation/overview.html#pull-request-format)
5+
Symfony documentation, please read [Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)
6+
and notice the [Pull Request Format](https://symfony.com/doc/current/contributing/documentation/overview.html#pull-request-format)
77
that helps us merge your pull requests faster!

README.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
Symfony Documentation
22
=====================
33

4-
This documentation is rendered online at http://symfony.com/doc/current/
4+
This documentation is rendered online at https://symfony.com/doc/current/
55

66
Contributing
77
------------
88

99
>**Note**
10-
>Unless you're documenting a feature that was introduced *after* Symfony 2.3
10+
>Unless you're documenting a feature that was introduced *after* Symfony 2.3
1111
>(e.g. in Symfony 2.4), all pull requests must be based off of the **2.3** branch,
1212
>**not** the master or older branches.
1313
1414
We love contributors! For more information on how you can contribute to the
1515
Symfony documentation, please read
16-
[Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html)
16+
[Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)

best_practices/business-logic.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ coding standards of an entire codebase in a matter of seconds.
335335

336336
.. _`full definition`: http://en.wikipedia.org/wiki/Business_logic
337337
.. _`Doctrine project`: http://www.doctrine-project.org/
338-
.. _`fixture class`: http://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html#writing-simple-fixtures
338+
.. _`fixture class`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html#writing-simple-fixtures
339339
.. _`PSR-1`: http://www.php-fig.org/psr/psr-1/
340340
.. _`PSR-2`: http://www.php-fig.org/psr/psr-2/
341341
.. _`PHP-CS-Fixer`: https://github.com/FriendsOfPHP/PHP-CS-Fixer

best_practices/controllers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,4 @@ If you need to execute some code before or after the execution of your controlle
210210
you can use the EventDispatcher component to
211211
:doc:`set up before and after filters </cookbook/event_dispatcher/before_after_filters>`.
212212

213-
.. _`ParamConverter`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
213+
.. _`ParamConverter`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html

best_practices/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@ practices**. The reasons for not doing it are various:
103103
your tests or adding features that provide real value to the end users.
104104

105105
.. _`Fabien Potencier`: https://connect.sensiolabs.com/profile/fabpot
106-
.. _`download and install`: http://symfony.com/download
106+
.. _`download and install`: https://symfony.com/download

book/doctrine.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ mapping information) of a bundle or an entire namespace:
435435
436436
# generates all entities in the AppBundle
437437
$ php app/console doctrine:generate:entities AppBundle
438-
438+
439439
# generates all entities of bundles in the Acme namespace
440440
$ php app/console doctrine:generate:entities Acme
441441
@@ -651,7 +651,7 @@ to easily fetch objects based on multiple conditions::
651651

652652
If you click the icon, the profiler will open, showing you the exact
653653
queries that were made.
654-
654+
655655
The icon will turn yellow if there were more than 50 queries on the
656656
page. This could indicate that something is not correct.
657657

@@ -1429,8 +1429,8 @@ For more information about Doctrine, see the *Doctrine* section of the
14291429
.. _`Lifecycle Events documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html#lifecycle-events
14301430
.. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#quoting-reserved-words
14311431
.. _`Persistent classes`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#persistent-classes
1432-
.. _`DoctrineMongoDBBundle`: http://symfony.com/doc/current/bundles/DoctrineMongoDBBundle/index.html
1433-
.. _`migrations`: http://symfony.com/doc/current/bundles/DoctrineMigrationsBundle/index.html
1434-
.. _`DoctrineFixturesBundle`: http://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
1435-
.. _`FrameworkExtraBundle documentation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
1432+
.. _`DoctrineMongoDBBundle`: https://symfony.com/doc/current/bundles/DoctrineMongoDBBundle/index.html
1433+
.. _`migrations`: https://symfony.com/doc/current/bundles/DoctrineMigrationsBundle/index.html
1434+
.. _`DoctrineFixturesBundle`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
1435+
.. _`FrameworkExtraBundle documentation`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
14361436
.. _`newer utf8mb4 character set`: https://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html

book/http_cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1254,6 +1254,6 @@ Learn more from the Cookbook
12541254
.. _`HTTP Bis`: http://tools.ietf.org/wg/httpbis/
12551255
.. _`P4 - Conditional Requests`: http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional
12561256
.. _`P6 - Caching: Browser and intermediary caches`: http://tools.ietf.org/html/draft-ietf-httpbis-p6-cache
1257-
.. _`FrameworkExtraBundle documentation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/cache.html
1257+
.. _`FrameworkExtraBundle documentation`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/cache.html
12581258
.. _`ESI`: http://www.w3.org/TR/esi-lang
12591259
.. _`FOSHttpCacheBundle`: http://foshttpcachebundle.readthedocs.org/

book/security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1384,6 +1384,6 @@ Learn More from the Cookbook
13841384
* :doc:`/cookbook/security/multiple_user_providers`
13851385

13861386
.. _`online tool`: https://www.dailycred.com/blog/12/bcrypt-calculator
1387-
.. _`frameworkextrabundle documentation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
1387+
.. _`frameworkextrabundle documentation`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
13881388
.. _`security advisories database`: https://github.com/FriendsOfPHP/security-advisories
13891389
.. _`HWIOAuthBundle`: https://github.com/hwi/HWIOAuthBundle

components/http_kernel/introduction.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ look like this::
709709
.. _FOSRestBundle: https://github.com/friendsofsymfony/FOSRestBundle
710710
.. _`Create your own framework... on top of the Symfony2 Components`: http://fabien.potencier.org/article/50/create-your-own-framework-on-top-of-the-symfony2-components-part-1
711711
.. _`PHP FPM`: http://php.net/manual/en/install.fpm.php
712-
.. _`SensioFrameworkExtraBundle`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
713-
.. _`@ParamConverter`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
714-
.. _`@Template`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/view.html
712+
.. _`SensioFrameworkExtraBundle`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
713+
.. _`@ParamConverter`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
714+
.. _`@Template`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/view.html
715715
.. _`EmailSenderListener`: https://github.com/symfony/SwiftmailerBundle/blob/master/EventListener/EmailSenderListener.php

components/security/authentication.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,4 +274,5 @@ in) is correct, you can use::
274274
$user->getSalt()
275275
);
276276

277-
.. _`CVE-2013-5750`: http://symfony.com/blog/cve-2013-5750-security-issue-in-fosuserbundle-login-form
277+
.. _`CVE-2013-5750`: https://symfony.com/blog/cve-2013-5750-security-issue-in-fosuserbundle-login-form
278+
.. _`BasePasswordEncoder::checkPasswordLength`: https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php

0 commit comments

Comments
 (0)