Skip to content

Commit d86bec8

Browse files
committed
Merge branch '2.7' into 2.8
2 parents a677694 + ac3e2c9 commit d86bec8

File tree

74 files changed

+195
-155
lines changed

Some content is hidden

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

74 files changed

+195
-155
lines changed

best_practices/business-logic.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ were defined by the PHP community. You can learn more about
333333
use the `PHP-CS-Fixer`_, which is a command-line utility that can fix the
334334
coding standards of an entire codebase in a matter of seconds.
335335

336-
.. _`full definition`: http://en.wikipedia.org/wiki/Business_logic
336+
.. _`full definition`: https://en.wikipedia.org/wiki/Business_logic
337337
.. _`Doctrine project`: http://www.doctrine-project.org/
338338
.. _`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/

best_practices/configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,5 +180,5 @@ that you store them outside the Symfony project and make them available
180180
through environment variables. Learn how to do it in the following article:
181181
:doc:`/cookbook/configuration/external_parameters`
182182

183-
.. _`feature toggles`: http://en.wikipedia.org/wiki/Feature_toggle
183+
.. _`feature toggles`: https://en.wikipedia.org/wiki/Feature_toggle
184184
.. _`constant() function`: http://twig.sensiolabs.org/doc/functions/constant.html

best_practices/creating-the-project.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,4 @@ the Symfony directory structure.
177177
.. _`Get Started`: https://getcomposer.org/doc/00-intro.md
178178
.. _`Composer download page`: https://getcomposer.org/download/
179179
.. _`public checksums repository`: https://github.com/sensiolabs/checksums
180-
.. _`these steps`: http://fabien.potencier.org/article/73/signing-project-releases
180+
.. _`these steps`: http://fabien.potencier.org/signing-project-releases.html

best_practices/tests.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,4 @@ for your test fixtures.
121121
.. _`PhpUnit`: https://phpunit.de/
122122
.. _`PhpSpec`: http://www.phpspec.net/
123123
.. _`Mink`: http://mink.behat.org
124-
.. _`smoke testing`: http://en.wikipedia.org/wiki/Smoke_testing_(software)
124+
.. _`smoke testing`: https://en.wikipedia.org/wiki/Smoke_testing_(software)

book/doctrine.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ see the :ref:`book-doctrine-field-types` section.
362362
`Reserved SQL keywords documentation`_ on how to properly escape these
363363
names. Alternatively, if you're free to choose your database schema,
364364
simply map to a different table name or column name. See Doctrine's
365-
`Persistent classes`_ and `Property Mapping`_ documentation.
365+
`Creating Classes for the Database`_ and `Property Mapping`_ documentation.
366366

367367
.. note::
368368

@@ -1421,7 +1421,7 @@ For more information about Doctrine, see the *Doctrine* section of the
14211421
* `DoctrineMongoDBBundle`_
14221422

14231423
.. _`Doctrine`: http://www.doctrine-project.org/
1424-
.. _`MongoDB`: http://www.mongodb.org/
1424+
.. _`MongoDB`: https://www.mongodb.org/
14251425
.. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html
14261426
.. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/query-builder.html
14271427
.. _`Doctrine Query Language`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/dql-doctrine-query-language.html
@@ -1430,7 +1430,7 @@ For more information about Doctrine, see the *Doctrine* section of the
14301430
.. _`Property Mapping`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#property-mapping
14311431
.. _`Lifecycle Events documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html#lifecycle-events
14321432
.. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#quoting-reserved-words
1433-
.. _`Persistent classes`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#persistent-classes
1433+
.. _`Creating Classes for the Database`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#creating-classes-for-the-database
14341434
.. _`DoctrineMongoDBBundle`: https://symfony.com/doc/current/bundles/DoctrineMongoDBBundle/index.html
14351435
.. _`migrations`: https://symfony.com/doc/current/bundles/DoctrineMigrationsBundle/index.html
14361436
.. _`DoctrineFixturesBundle`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html

book/from_flat_php_to_symfony2.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,8 @@ As it stands now, that code would need to be added to every controller file.
320320
If you forget to include something in one file, hopefully it doesn't relate
321321
to security...
322322

323+
.. _book-from_flat_php-front-controller:
324+
323325
A "Front Controller" to the Rescue
324326
----------------------------------
325327

book/http_cache.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ doing so much work.
627627

628628
Symfony also supports weak ETags by passing ``true`` as the second
629629
argument to the
630-
:method:`Symfony\\Component\\HttpFoundation\\Response::setETag` method.
630+
:method:`Symfony\\Component\\HttpFoundation\\Response::setEtag` method.
631631

632632
.. index::
633633
single: Cache; Last-Modified header
@@ -1244,7 +1244,7 @@ Learn more from the Cookbook
12441244

12451245
* :doc:`/cookbook/cache/varnish`
12461246

1247-
.. _`Things Caches Do`: http://tomayko.com/writings/things-caches-do
1247+
.. _`Things Caches Do`: http://2ndscale.com/writings/things-caches-do
12481248
.. _`Cache Tutorial`: http://www.mnot.net/cache_docs/
12491249
.. _`Varnish`: https://www.varnish-cache.org/
12501250
.. _`Squid in reverse proxy mode`: http://wiki.squid-cache.org/SquidFaq/ReverseProxy

book/http_fundamentals.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,8 @@ sensible defaults. For more advanced users, the sky is the limit.
576576
.. _`HTTP 1.1 RFC`: http://www.w3.org/Protocols/rfc2616/rfc2616.html
577577
.. _`HTTP Bis`: http://datatracker.ietf.org/wg/httpbis/
578578
.. _`Live HTTP Headers`: https://addons.mozilla.org/en-US/firefox/addon/live-http-headers/
579-
.. _`List of HTTP status codes`: http://en.wikipedia.org/wiki/List_of_HTTP_status_codes
580-
.. _`List of HTTP header fields`: http://en.wikipedia.org/wiki/List_of_HTTP_header_fields
581-
.. _`List of common media types`: http://en.wikipedia.org/wiki/Internet_media_type#List_of_common_media_types
579+
.. _`List of HTTP status codes`: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
580+
.. _`List of HTTP header fields`: https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
581+
.. _`List of common media types`: https://www.iana.org/assignments/media-types/media-types.xhtml
582582
.. _`Validator`: https://github.com/symfony/Validator
583583
.. _`Swift Mailer`: http://swiftmailer.org/

book/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ need in your new application.
406406
Be sure to also check out the :doc:`Cookbook </cookbook/index>`, which contains
407407
a wide variety of articles about solving specific problems with Symfony.
408408

409-
.. _`explained in this post`: http://fabien.potencier.org/article/73/signing-project-releases
409+
.. _`explained in this post`: http://fabien.potencier.org/signing-project-releases.html
410410
.. _`Composer`: https://getcomposer.org/
411411
.. _`Composer download page`: https://getcomposer.org/download/
412412
.. _`Apache`: http://httpd.apache.org/docs/current/mod/core.html#documentroot

book/performance.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ file since there will be fewer files to monitor for changes. Of course if this
139139
feature is disabled in the byte code cache (e.g. ``apc.stat=0`` in APC), there
140140
is no longer a reason to use a bootstrap file.
141141

142-
.. _`byte code caches`: http://en.wikipedia.org/wiki/List_of_PHP_accelerators
142+
.. _`byte code caches`: https://en.wikipedia.org/wiki/List_of_PHP_accelerators
143143
.. _`OPcache`: http://php.net/manual/en/book.opcache.php
144144
.. _`APC`: http://php.net/manual/en/book.apc.php
145145
.. _`autoload.php`: https://github.com/symfony/symfony-standard/blob/master/app/autoload.php
146-
.. _`bootstrap file`: https://github.com/sensio/SensioDistributionBundle/blob/master/Composer/ScriptHandler.php
146+
.. _`bootstrap file`: https://github.com/sensiolabs/SensioDistributionBundle/blob/master/Composer/ScriptHandler.php

0 commit comments

Comments
 (0)