File tree 2 files changed +0
-21
lines changed
Filter options
2 files changed +0
-21
lines changed
Original file line number Diff line number Diff line change @@ -84,23 +84,6 @@ readable. These are the main advantages and disadvantages of each format:
84
84
85
85
The automatic loading of PHP configuration files was introduced in Symfony 6.1.
86
86
87
- <<<<<<< HEAD
88
- =======
89
- There isn't any practical difference between formats. In fact, Symfony
90
- transforms and caches all of them into PHP before running the application, so
91
- there's not even any performance difference between them.
92
-
93
- YAML is used by default when installing packages because it's concise and very
94
- readable. These are the main advantages and disadvantages of each format:
95
-
96
- * **YAML **: simple, clean and readable, but not all IDEs support autocompletion
97
- and validation for it. :ref: `Learn the YAML syntax <yaml-format >`;
98
- * **XML **: autocompleted/validated by most IDEs and is parsed natively by PHP,
99
- but sometimes it generates configuration considered too verbose. `Learn the XML syntax `_;
100
- * **PHP **: very powerful and it allows you to create dynamic configuration with
101
- arrays or a :ref: `ConfigBuilder <config-config-builder >`.
102
-
103
- >>>>>>> 5.4
104
87
Importing Configuration Files
105
88
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
106
89
Original file line number Diff line number Diff line change @@ -505,11 +505,7 @@ PR. Before re-submitting the PR, rebase with ``upstream/6.x`` or
505
505
506
506
.. code-block :: terminal
507
507
508
- <<<<<<< HEAD
509
- $ git rebase -f upstream/6.1
510
- =======
511
508
$ git rebase -f upstream/6.x
512
- >>>>>>> 5.4
513
509
$ git push --force origin BRANCH_NAME
514
510
515
511
.. note ::
You can’t perform that action at this time.
0 commit comments