Skip to content

Commit 07f528f

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: Fix PHP-CS link Typo added a note about testing newer versions of Symfony
2 parents e69c1a5 + 0255293 commit 07f528f

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ and use that when configuring the pool.
321321
factory: ['Symfony\Component\Cache\Adapter\RedisAdapter', 'createConnection']
322322
arguments:
323323
- 'redis://localhost'
324-
- [ retry_interval: 2, timeout: 10 ]
324+
- { retry_interval: 2, timeout: 10 }
325325
326326
.. code-block:: xml
327327

contributing/code/standards.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ License
276276
* Symfony is released under the MIT license, and the license block has to be
277277
present at the top of every PHP file, before the namespace.
278278

279-
.. _`PHP CS Fixer tool`: http://cs.sensiolabs.org/
279+
.. _`PHP CS Fixer tool`: https://cs.symfony.com/
280280
.. _`PSR-0`: https://www.php-fig.org/psr/psr-0/
281281
.. _`PSR-1`: https://www.php-fig.org/psr/psr-1/
282282
.. _`PSR-2`: https://www.php-fig.org/psr/psr-2/

setup/symfony_server.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,17 @@ commands from the Symfony server:
348348
# creates a new project based on the Symfony Demo application
349349
$ symfony new --demo my_project_name
350350
351+
You can create a project depending on a **development** version as well (note
352+
that Composer will also set the stability to ``dev`` for all root dependencies):
353+
354+
.. code-block:: terminal
355+
356+
# creates a new project based on Symfony's master branch
357+
$ symfony new --version=dev-master my_project_name
358+
359+
# creates a new project based on Symfony's 4.3 dev branch
360+
$ symfony new --version=4.3.x-dev my_project_name
361+
351362
.. _`symfony.com/download`: https://symfony.com/download
352363
.. _`different ways of installing Symfony`: https://symfony.com/download
353364
.. _`Docker`: https://en.wikipedia.org/wiki/Docker_(software)

0 commit comments

Comments
 (0)