Skip to content

Commit 7455557

Browse files
committed
Merge branch '2.8' into 3.4
* 2.8: Use the proper path of version 2.x Added some minor explanation about 308 code Use 308 to ensure http method is preserved Fixed a minor error in form collections example fix(Extractor): ExtractorInterface called Update finder.rst Use HTTPS instead of HTTP outside XML
2 parents 0cde555 + f70883a commit 7455557

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+126
-129
lines changed

best_practices/business-logic.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,6 @@ Next: :doc:`/best_practices/controllers`
366366
.. _`full definition`: https://en.wikipedia.org/wiki/Business_logic
367367
.. _`Doctrine project`: http://www.doctrine-project.org/
368368
.. _`fixture class`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html#writing-simple-fixtures
369-
.. _`PSR-1`: http://www.php-fig.org/psr/psr-1/
370-
.. _`PSR-2`: http://www.php-fig.org/psr/psr-2/
369+
.. _`PSR-1`: https://www.php-fig.org/psr/psr-1/
370+
.. _`PSR-2`: https://www.php-fig.org/psr/psr-2/
371371
.. _`PHP-CS-Fixer`: https://github.com/FriendsOfPHP/PHP-CS-Fixer

best_practices/creating-the-project.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,6 @@ structure of Symfony, you can
173173
Next: :doc:`/best_practices/configuration`
174174

175175
.. _`Composer`: https://getcomposer.org/
176-
.. _`Phar extension`: http://php.net/manual/en/intro.phar.php
176+
.. _`Phar extension`: https://php.net/manual/en/intro.phar.php
177177
.. _`public checksums repository`: https://github.com/sensiolabs/checksums
178178
.. _`these steps`: http://fabien.potencier.org/signing-project-releases.html

bundles/best_practices.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,9 @@ Learn more
450450
* :doc:`/bundles/extension`
451451
* :doc:`/bundles/configuration`
452452

453-
.. _`PSR-0`: http://www.php-fig.org/psr/psr-0/
454-
.. _`PSR-4`: http://www.php-fig.org/psr/psr-4/
455-
.. _`Semantic Versioning Standard`: http://semver.org/
453+
.. _`PSR-0`: https://www.php-fig.org/psr/psr-0/
454+
.. _`PSR-4`: https://www.php-fig.org/psr/psr-4/
455+
.. _`Semantic Versioning Standard`: https://semver.org/
456456
.. _`Packagist`: https://packagist.org/
457-
.. _`choose any license`: http://choosealicense.com/
457+
.. _`choose any license`: https://choosealicense.com/
458458
.. _`valid license identifier`: https://spdx.org/licenses/

components/class_loader.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ Learn More
6868

6969
class_loader/cache_class_loader
7070

71-
.. _PSR-0: http://www.php-fig.org/psr/psr-0/
72-
.. _PSR-4: http://www.php-fig.org/psr/psr-4/
73-
.. _`autoloading mechanism`: http://php.net/manual/en/language.oop5.autoload.php
71+
.. _PSR-0: https://www.php-fig.org/psr/psr-0/
72+
.. _PSR-4: https://www.php-fig.org/psr/psr-4/
73+
.. _`autoloading mechanism`: https://php.net/manual/en/language.oop5.autoload.php
7474
.. _Packagist: https://packagist.org/packages/symfony/class-loader
7575
.. _`class loading optimizations`: https://getcomposer.org/doc/articles/autoloader-optimization.md

components/class_loader/class_loader.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ the ``doctrine-common`` directory. If not found, it will then fallback to
7171
the default ``Doctrine`` directory (the last one configured) before giving
7272
up. The order of the prefix registrations is significant in this case.
7373

74-
.. _PEAR: http://pear.php.net/manual/en/standards.naming.php
75-
.. _PSR-0: http://www.php-fig.org/psr/psr-0/
74+
.. _PEAR: https://pear.php.net/manual/en/standards.naming.php
75+
.. _PSR-0: https://www.php-fig.org/psr/psr-0/

components/class_loader/class_map_generator.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,6 @@ is the same as in the example above)::
123123
__DIR__.'/class_map.php'
124124
);
125125

126-
.. _`PSR-0`: http://www.php-fig.org/psr/psr-0
127-
.. _`PSR-4`: http://www.php-fig.org/psr/psr-4
126+
.. _`PSR-0`: https://www.php-fig.org/psr/psr-0
127+
.. _`PSR-4`: https://www.php-fig.org/psr/psr-4
128128
.. _`Composer`: https://getcomposer.org

components/class_loader/map_class_loader.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ an instance of the ``MapClassLoader`` class::
3838

3939
$loader->register();
4040

41-
.. _PSR-0: http://www.php-fig.org/psr/psr-0/
41+
.. _PSR-0: https://www.php-fig.org/psr/psr-0/

components/class_loader/psr4_class_loader.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ tell the class loader where to look for classes with the
5858
``Symfony\Component\Yaml\`` namespace prefix. After registering the autoloader,
5959
the Yaml component is ready to be used.
6060

61-
.. _PSR-4: http://www.php-fig.org/psr/psr-4/
61+
.. _PSR-4: https://www.php-fig.org/psr/psr-4/

components/console/logger.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,4 @@ soon as any error message has been logged during the execution of the command.
114114
This is useful to decide which status code to return as the result of executing
115115
the command.
116116

117-
.. _PSR-3: http://www.php-fig.org/psr/psr-3/
117+
.. _PSR-3: https://www.php-fig.org/psr/psr-3/

components/event_dispatcher.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,6 @@ Learn More
513513
* :ref:`The kernel.event_subscriber tag <dic-tags-kernel-event-subscriber>`
514514

515515
.. _Mediator: https://en.wikipedia.org/wiki/Mediator_pattern
516-
.. _Closures: http://php.net/manual/en/functions.anonymous.php
517-
.. _PHP callable: http://www.php.net/manual/en/language.pseudo-types.php#language.types.callback
516+
.. _Closures: https://php.net/manual/en/functions.anonymous.php
517+
.. _PHP callable: https://php.net/manual/en/language.pseudo-types.php#language.types.callback
518518
.. _Packagist: https://packagist.org/packages/symfony/event-dispatcher

0 commit comments

Comments
 (0)