Skip to content

Commit bf60675

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: Remove an outdated article about Composer
2 parents 4640576 + c71813b commit bf60675

File tree

6 files changed

+12
-23
lines changed

6 files changed

+12
-23
lines changed

_build/redirection_map

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,3 +423,4 @@
423423
/configuration/configuration_organization /configuration
424424
/contributing/community/other /contributing/community
425425
/profiler/storage /profiler
426+
/setup/composer /setup

contributing/code/tests.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Before Running the Tests
1818

1919
To run the Symfony test suite, install the external dependencies used during the
2020
tests, such as Doctrine, Twig and Monolog. To do so,
21-
:doc:`install Composer </setup/composer>` and execute the following:
21+
`install Composer`_ and execute the following:
2222

2323
.. code-block:: terminal
2424
@@ -54,6 +54,7 @@ what's going on and if the tests are broken because of the new code.
5454
On Windows, install the `Cmder`_, `ConEmu`_, `ANSICON`_ or `Mintty`_ free applications
5555
to see colored test results.
5656

57+
.. _`install Composer`: https://getcomposer.org/download/
5758
.. _Cmder: http://cmder.net/
5859
.. _ConEmu: https://conemu.github.io/
5960
.. _ANSICON: https://github.com/adoxa/ansicon/releases

create_framework/introduction.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Dependency Management
8787

8888
To install the Symfony Components that you need for your framework, you are going
8989
to use `Composer`_, a project dependency manager for PHP. If you don't have it
90-
yet, :doc:`download and install Composer </setup/composer>` now.
90+
yet, `download and install Composer`_ now.
9191

9292
Our Project
9393
-----------
@@ -114,3 +114,4 @@ introduce the HttpFoundation Component and see what it brings us.
114114

115115
.. _`Symfony`: https://symfony.com/
116116
.. _`Composer`: http://packagist.org/about-composer
117+
.. _`download and install Composer`: https://getcomposer.org/download/

setup.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ Installing & Setting up the Symfony Framework
1111
screencast series.
1212

1313
To create your new Symfony application, first make sure you're using PHP 7.1 or
14-
higher and have `Composer`_ installed. If you don't, start by
15-
:doc:`installing Composer globally </setup/composer>` on your system.
14+
higher and have `Composer`_ installed. If you don't, start by `installing Composer`_.
1615

1716
Create your new project by running:
1817

@@ -149,11 +148,11 @@ Go Deeper with Setup
149148
setup/homestead
150149
setup/built_in_web_server
151150
setup/web_server_configuration
152-
setup/composer
153151
setup/*
154152

155153
.. _`Stellar Development with Symfony`: http://symfonycasts.com/screencast/symfony
156154
.. _`Composer`: https://getcomposer.org/
155+
.. _`installing Composer`: https://getcomposer.org/download/
157156
.. _`the Security Checker`: https://github.com/sensiolabs/security-checker#integration
158157
.. _`The Symfony Demo application`: https://github.com/symfony/demo
159158
.. _`symfony/symfony-demo`: https://github.com/symfony/demo

setup/composer.rst

Lines changed: 0 additions & 16 deletions
This file was deleted.

setup/unstable_versions.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ they are released as stable versions.
77
Creating a New Project Based on an Unstable Symfony Version
88
-----------------------------------------------------------
99

10+
1011
Suppose that the Symfony 4.0 version hasn't been released yet and you want to create
11-
a new project to test its features. First, :doc:`install the Composer </setup/composer>`
12-
package manager. Then, open a command console, enter your project's directory and
12+
a new project to test its features. First, `install the Composer package manager`_.
13+
Then, open a command console, enter your project's directory and
1314
execute the following command:
1415

1516
.. code-block:: terminal
@@ -72,3 +73,5 @@ Symfony version has deprecated some of its features.
7273
# ... after testing the new Symfony version
7374
$ git checkout master
7475
$ git branch -D testing_new_symfony
76+
77+
.. _`install the Composer package manager`: https://getcomposer.org/download/

0 commit comments

Comments
 (0)