Javier Eguiluz
474966c8e0
Merge branch '6.4' into 7.3
...
* 6.4:
Simplify some wording to make docs more approachable
2026-01-09 16:59:58 +01:00
Javier Eguiluz
b30b6df87b
minor #21691 Simplify some wording to make docs more approachable (javiereguiluz)
...
This PR was squashed before being merged into the 6.4 branch.
Discussion
----------
Simplify some wording to make docs more approachable
This PR proposes to replace some words:
* `whilst` is British English and formal (we use American English in Symfony Docs)
* `hence`, `nonetheless`, and `thus` have simpler and more common alternatives
Commits
-------
6a4e9adf6 Simplify some wording to make docs more approachable
2026-01-09 16:59:47 +01:00
Javier Eguiluz
6a4e9adf62
Simplify some wording to make docs more approachable
2026-01-09 16:59:41 +01:00
Javier Eguiluz
bec5972711
minor #21686 Remove some outdated contents related to annotations (javiereguiluz)
...
This PR was merged into the 7.3 branch.
Discussion
----------
Remove some outdated contents related to annotations
Commits
-------
c1b6f0caf Remove some outdated contents related to annotations
2026-01-09 08:39:15 +01:00
Javier Eguiluz
ef9ad3a15d
Merge branch '6.4' into 7.3
...
* 6.4:
Fix some grammar issues
2026-01-08 16:44:18 +01:00
Javier Eguiluz
18ef54507f
Fix some grammar issues
2026-01-08 16:36:18 +01:00
Javier Eguiluz
c1b6f0cafa
Remove some outdated contents related to annotations
2026-01-07 15:53:26 +01:00
Oskar Stark
1839b6973c
Merge branch '6.4' into 7.3
...
* 6.4:
Update DOCtor-RST and enable new rules
2025-12-08 21:02:42 +01:00
Oskar Stark
e960b880e5
Update DOCtor-RST and enable new rules
2025-12-08 21:01:53 +01:00
Inwebo Veritas
e7aa288abf
Update prepend_extension.rst
...
Ensure the argument names are consistent and reflect the names of the interface's arguments.
2025-10-17 15:54:25 +02:00
Oskar Stark
ca60dca9b3
Merge branch '6.4' into 7.3
...
* 6.4:
Replace vague "it" with explicit file description for readability
2025-10-13 14:05:46 +02:00
llupa
3296cac878
Replace vague "it" with explicit file description for readability
2025-10-13 14:05:32 +02:00
Javier Eguiluz
ee511eaddc
Merge branch '6.4' into 7.3
...
* 6.4:
Updates related to the main PHPUnit configuration file
2025-08-11 08:53:56 +02:00
Javier Eguiluz
2b6d28bc50
Updates related to the main PHPUnit configuration file
2025-08-06 13:11:06 +02:00
Javier Eguiluz
28abbbac8f
Merge branch '6.4' into 7.2
...
* 6.4:
[Bundle] Best Practice: Add link for create ux-bundle
2025-06-02 08:29:50 +02:00
Jibé Barth
f237d96d2c
[Bundle] Best Practice: Add link for create ux-bundle
2025-06-01 13:45:32 +02:00
Javier Eguiluz
db23f1f95d
Update some Symfony versions in bundle's best practices article
2025-05-07 09:07:54 +02:00
Javier Eguiluz
b08f936a97
Merge branch '6.4' into 7.2
...
* 6.4:
Minor tweaks
remove reference to Travis CI (no longer free)
[Reference] Update the default values of some options
2025-05-07 09:07:22 +02:00
Javier Eguiluz
347989eaca
Minor tweaks
2025-05-07 09:01:01 +02:00
Tac Tacelosky
e66bd63201
remove reference to Travis CI (no longer free)
...
On a related note, the test matrix is old, referencing Symfony 4. But I'm not sure of the best way to rework this.
2025-05-07 08:57:11 +02:00
Javier Eguiluz
e276d417a1
Merge branch '6.4' into 7.2
...
* 6.4:
fix: Change translation domain name for bundle translation and add an example
2025-03-24 08:46:45 +01:00
Julien Bonnier
20929b4a57
fix: Change translation domain name for bundle translation and add an example
2025-03-22 15:47:08 -04:00
Oskar Stark
bceb5d8dab
Merge branch '6.4' into 7.2
...
* 6.4:
fix: Add missing ContainerBuilder use statement in Bundle documentation
2025-03-06 07:58:55 +01:00
Julien Bonnier
a207201813
fix: Add missing ContainerBuilder use statement in Bundle documentation
2025-03-05 18:38:05 -05:00
Wouter de Jong
84ead23b4f
Merge remote-tracking branch 'origin/6.4' into 7.1
...
* origin/6.4:
Replaced caution blocks with warning
2024-12-07 12:11:20 +01:00
Timo Bakx
3849004fcc
Replaced caution blocks with warning
...
Fixes #20371
Both blocks are currently rendered identically. Keeping only one of the two makes it easier to contribute.
Some blocks were elevated to danger.
2024-12-07 12:02:55 +01:00
Christian Flothmann
8dc3c89868
Merge branch '6.4' into 7.1
...
* 6.4:
Update configuration.rst
2024-07-29 15:37:55 +02:00
Dennis de Best
10abade6df
Update configuration.rst
...
Fix $containerConfigurator parameter name in loadExtension function
2024-07-29 15:36:54 +02:00
Javier Eguiluz
b7719c1108
Merge branch '7.0' into 7.1
...
* 7.0:
Extend AbstractBundle instead of Bundle
2024-05-13 12:47:16 +02:00
Javier Eguiluz
353f47a5ea
Merge branch '6.4' into 7.0
...
* 6.4:
Extend AbstractBundle instead of Bundle
2024-05-13 12:47:14 +02:00
Javier Eguiluz
a54a981302
Extend AbstractBundle instead of Bundle
2024-05-13 12:47:00 +02:00
Javier Eguiluz
f29795d1fc
Merge branch '7.0' into 7.1
...
* 7.0:
Fix group handler name
[Bundle] Fix Bundle configuration root key
2024-05-06 13:11:32 +02:00
Javier Eguiluz
d8b121062c
Merge branch '6.4' into 7.0
...
* 6.4:
Fix group handler name
[Bundle] Fix Bundle configuration root key
2024-05-06 13:11:29 +02:00
Simon André
778ffdf3f0
[Bundle] Fix Bundle configuration root key
...
It should be acme_social instead of acme.social
2024-05-05 23:54:24 +02:00
Javier Eguiluz
e0535ef3ea
Merge branch '7.0' into 7.1
...
* 7.0:
Update controller.rst
Fix typo in bundles/extension.rst
2024-05-03 17:45:50 +02:00
Javier Eguiluz
4d3a14c867
Merge branch '6.4' into 7.0
...
* 6.4:
Update controller.rst
Fix typo in bundles/extension.rst
2024-05-03 17:45:47 +02:00
Félix Fouillet
7cf7c66a26
Fix typo in bundles/extension.rst
2024-05-02 09:08:03 +02:00
Oskar Stark
1d96312317
Merge branch '7.0' into 7.1
...
* 7.0:
-
use option name as link label
2024-04-29 12:21:15 +02:00
Oskar Stark
11cd34d903
-
2024-04-29 12:21:09 +02:00
Javier Eguiluz
8ad1c2c2aa
Merge branch '7.0' into 7.1
...
* 7.0:
[Bundles] Promote the new bundle structure everywhere
2024-04-26 15:36:12 +02:00
Javier Eguiluz
17aeba4fac
Merge branch '6.4' into 7.0
...
* 6.4:
[Bundles] Promote the new bundle structure everywhere
2024-04-26 15:36:05 +02:00
Javier Eguiluz
ed767c9fa6
[Bundles] Promote the new bundle structure everywhere
2024-04-26 15:23:40 +02:00
Javier Eguiluz
4937afbab4
Minor reword
2024-04-15 17:57:32 +02:00
Yonel Ceruto
25c5adfcbb
Updating prepend extension capabilities
2024-04-15 10:10:08 -04:00
Javier Eguiluz
7b591e0d3a
Merge branch '7.0' into 7.1
...
* 7.0:
Discourage append config on prepend extension method
2024-04-15 09:29:02 +02:00
Javier Eguiluz
dee9ccc3af
Merge branch '6.4' into 7.0
...
* 6.4:
Discourage append config on prepend extension method
2024-04-15 09:28:51 +02:00
Yonel Ceruto
4e82adba79
Discourage append config on prepend extension method
2024-04-03 19:25:51 -04:00
Christian Flothmann
dd6e1c6be9
Merge branch '7.0' into 7.1
...
* 7.0:
restore code block for reStructured text
2024-02-08 20:15:28 +01:00
Christian Flothmann
3172768ecf
Merge branch '6.4' into 7.0
...
* 6.4:
restore code block for reStructured text
2024-02-08 20:15:14 +01:00
Christian Flothmann
7da27faa8f
restore code block for reStructured text
2024-02-08 20:13:08 +01:00