Skip to content

Commit 0dd3276

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Fixed all permanently redirected and broken URLs
2 parents 3421b1d + 45effbc commit 0dd3276

File tree

111 files changed

+357
-240
lines changed

Some content is hidden

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

111 files changed

+357
-240
lines changed

best_practices.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ You can even ignore them completely and continue using your own best practices
1010
and methodologies. Symfony is flexible enough to adapt to your needs.
1111

1212
This article assumes that you already have experience developing Symfony
13-
applications. If you don't, read first the rest of the `Symfony documentation`_.
13+
applications. If you don't, read first the :doc:`Getting Started </setup>`
14+
section of the documentation.
1415

1516
.. tip::
1617

@@ -440,7 +441,6 @@ That's why it's recommended to use raw URLs in tests instead of generating them
440441
from routes. Whenever a route changes, tests will break and you'll know that
441442
you must set up a redirection.
442443

443-
.. _`Symfony documentation`: https://symfony.com/doc
444444
.. _`Symfony Demo`: https://github.com/symfony/demo
445445
.. _`download Symfony`: https://symfony.com/download
446446
.. _`Composer`: https://getcomposer.org/

bundles/override.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,4 +180,4 @@ For example, to override the translations defined in the
180180
``Resources/translations/FOSUserBundle.es.yml`` file of the FOSUserBundle,
181181
create a ``<your-project>/translations/FOSUserBundle.es.yml`` file.
182182

183-
.. _`the Doctrine documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/inheritance-mapping.html#overrides
183+
.. _`the Doctrine documentation`: https://www.doctrine-project.org/projects/doctrine-orm/en/current/reference/inheritance-mapping.html#overrides

components/cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Advanced Usage
201201

202202
cache/*
203203

204-
.. _`PSR-6`: http://www.php-fig.org/psr/psr-6/
204+
.. _`PSR-6`: https://www.php-fig.org/psr/psr-6/
205205
.. _`Cache Contracts`: https://github.com/symfony/contracts/blob/master/Cache/CacheInterface.php
206206
.. _`Stampede prevention`: https://en.wikipedia.org/wiki/Cache_stampede
207207
.. _Probabilistic early expiration: https://en.wikipedia.org/wiki/Cache_stampede#Probabilistic_early_expiration

components/cache/adapters/memcached_adapter.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ Available Options
292292
.. _`User Datagram Protocol (UDP)`: https://en.wikipedia.org/wiki/User_Datagram_Protocol
293293
.. _`no-delay`: https://en.wikipedia.org/wiki/TCP_NODELAY
294294
.. _`keep-alive`: https://en.wikipedia.org/wiki/Keepalive
295-
.. _`Memcached PHP extension`: http://php.net/manual/en/book.memcached.php
296-
.. _`predefined constants`: http://php.net/manual/en/memcached.constants.php
295+
.. _`Memcached PHP extension`: https://www.php.net/manual/en/book.memcached.php
296+
.. _`predefined constants`: https://www.php.net/manual/en/memcached.constants.php
297297
.. _`Memcached server`: https://memcached.org/
298-
.. _`Memcached`: http://php.net/manual/en/class.memcached.php
298+
.. _`Memcached`: https://www.php.net/manual/en/class.memcached.php
299299
.. _`Data Source Name (DSN)`: https://en.wikipedia.org/wiki/Data_source_name

components/cache/adapters/pdo_doctrine_dbal_adapter.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
PDO & Doctrine DBAL Cache Adapter
88
=================================
99

10-
This adapter stores the cache items in an SQL database. It requires a `PDO`_,
10+
This adapter stores the cache items in an SQL database. It requires a :phpclass:`PDO`,
1111
`Doctrine DBAL Connection`_, or `Data Source Name (DSN)`_ as its first parameter, and
1212
optionally a namespace, default cache lifetime, and options array as its second,
1313
third, and forth parameters::
@@ -48,6 +48,5 @@ your code.
4848
allowing for manual :ref:`pruning of expired cache entries <component-cache-cache-pool-prune>` by
4949
calling its ``prune()`` method.
5050

51-
.. _`PDO`: http://php.net/manual/en/class.pdo.php
5251
.. _`Doctrine DBAL Connection`: https://github.com/doctrine/dbal/blob/master/lib/Doctrine/DBAL/Connection.php
5352
.. _`Data Source Name (DSN)`: https://en.wikipedia.org/wiki/Data_source_name

components/cache/adapters/php_files_adapter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ directory path as constructor arguments::
6767
allowing for manual :ref:`pruning of expired cache entries <component-cache-cache-pool-prune>` by
6868
calling its ``prune()`` method.
6969

70-
.. _`OPcache`: http://php.net/manual/en/book.opcache.php
70+
.. _`OPcache`: https://www.php.net/manual/en/book.opcache.php

components/cache/adapters/proxy_adapter.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ and optionally a namespace and default cache lifetime as its second and third pa
3636
$defaultLifetime = 0
3737
);
3838

39-
.. _`PSR-6`: http://www.php-fig.org/psr/psr-6/
40-
.. _`cache item pool interface`: http://www.php-fig.org/psr/psr-6/#cacheitempoolinterface
39+
.. _`PSR-6`: https://www.php-fig.org/psr/psr-6/
40+
.. _`cache item pool interface`: https://www.php-fig.org/psr/psr-6/#cacheitempoolinterface

components/cache/psr6_psr16_adapters.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,4 @@ this use-case::
8383
// now use this wherever you want
8484
$githubApiClient = new GitHubApiClient($psr16Cache);
8585

86-
.. _`PSR-16`: http://www.php-fig.org/psr/psr-16/
86+
.. _`PSR-16`: https://www.php-fig.org/psr/psr-16/

components/dependency_injection.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,4 +318,4 @@ Learn More
318318
/components/dependency_injection/*
319319
/service_container/*
320320

321-
.. _`PSR-11`: http://www.php-fig.org/psr/psr-11/
321+
.. _`PSR-11`: https://www.php-fig.org/psr/psr-11/

components/dotenv.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,4 @@ Embed commands via ``$()`` (not supported on Windows):
162162

163163
Note that using ``$()`` might not work depending on your shell.
164164

165-
.. _twelve-factor applications: http://www.12factor.net/
165+
.. _twelve-factor applications: https://12factor.net/

0 commit comments

Comments
 (0)