Skip to content

Commit be6c79d

Browse files
committed
Merge branch '2.4'
2 parents 69b52c7 + f1a79e2 commit be6c79d

File tree

8 files changed

+157
-6
lines changed

8 files changed

+157
-6
lines changed

book/doctrine.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,7 @@ For more information about Doctrine, see the *Doctrine* section of the
14091409
.. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/query-builder.html
14101410
.. _`Doctrine Query Language`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/dql-doctrine-query-language.html
14111411
.. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/association-mapping.html
1412-
.. _`Mapping Types Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#property-mappings
1412+
.. _`Mapping Types Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#property-mapping
14131413
.. _`Property Mapping`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#property-mapping
14141414
.. _`Lifecycle Events documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html#lifecycle-events
14151415
.. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#quoting-reserved-words

book/translation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ Translating Database Content
646646
----------------------------
647647

648648
The translation of database content should be handled by Doctrine through
649-
the `Translatable Extension`_ or the `Translatable Bahavior`_ (PHP 5.4+).
649+
the `Translatable Extension`_ or the `Translatable Behavior`_ (PHP 5.4+).
650650
For more information, see the documentation for thes libraries.
651651

652652
Debugging Translations
@@ -839,4 +839,4 @@ steps:
839839
.. _`ISO 3166-1 alpha-2`: http://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
840840
.. _`ISO 639-1`: http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
841841
.. _`Translatable Extension`: https://github.com/l3pp4rd/DoctrineExtensions
842-
.. _`Translatable Bahavior`: https://github.com/KnpLabs/DoctrineBehaviors
842+
.. _`Translatable Behavior`: https://github.com/KnpLabs/DoctrineBehaviors

contributing/code/core_team.rst

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
Symfony Core Team
2+
=================
3+
4+
This document states the rules that govern the Symfony Core group. These rules
5+
are effective upon publication of this document and all Symfony Core members
6+
must adhere to said rules and protocol.
7+
8+
Core Organization
9+
-----------------
10+
11+
Symfony Core members are divided into three groups. Each member can only belong
12+
to one group at a time. The privileges granted to a group are automatically
13+
granted to all higher priority groups.
14+
15+
The Symfony Core groups, in descending order of priority, are as follows:
16+
17+
1. **Project Leader**
18+
19+
* Elects members in any other group;
20+
* Merges pull requests in all Symfony repositories.
21+
22+
2. **Mergers**
23+
24+
* Merge pull requests for the component or components on which they have been
25+
granted privileges.
26+
27+
3. **Deciders**
28+
29+
* Decide to merge or reject a pull request.
30+
31+
Active Core Members
32+
~~~~~~~~~~~~~~~~~~~
33+
34+
.. role:: leader
35+
.. role:: merger
36+
.. role:: decider
37+
38+
* **Project Leader**:
39+
40+
* **Fabien Potencier** (:leader:`fabpot`).
41+
42+
* **Mergers**:
43+
44+
* **Bernhard Schussek** (:merger:`webmozart`) can merge into the Form_,
45+
Validator_, Icu_, Intl_, Locale_, OptionsResolver_ and PropertyAccess_
46+
components;
47+
48+
* **Tobias Schultze** (:merger:`Tobion`) can merge into the Routing_
49+
component;
50+
51+
* **Romain Neutron** (:merger:`romainneutron`) can merge into the
52+
Process_ component;
53+
54+
* **Nicolas Grekas** (:merger:`nicolas-grekas`) can merge into the Debug_
55+
component.
56+
57+
* **Deciders**:
58+
59+
* **Christophe Coevoet** (:decider:`stof`);
60+
* **Jakub Zalas** (:decider:`jakzal`);
61+
* **Jordi Boggiano** (:decider:`seldaek`);
62+
* **Lukas Kahwe Smith** (:decider:`lsmith77`).
63+
64+
Core Membership Application
65+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
66+
67+
At present, new Symfony Core membership applications are not accepted.
68+
69+
Core Membership Revocation
70+
~~~~~~~~~~~~~~~~~~~~~~~~~~
71+
72+
A Symfony Core membership can be revoked for any of the following reasons:
73+
74+
* Refusal to follow the rules and policies stated in this document;
75+
* Lack of activity for the past six months;
76+
* Willful negligence or intent to harm the Symfony project;
77+
* Upon decision of the **Project Leader**.
78+
79+
Should new Symfony Core memberships be accepted in the future, revoked
80+
members must wait at least 12 months before re-applying.
81+
82+
Code Development Rules
83+
----------------------
84+
85+
Symfony project development is based on pull requests proposed by any member
86+
of the Symfony community. Pull request acceptance or rejection is decided based
87+
on the votes cast by the Symfony Core members.
88+
89+
Pull Request Voting Policy
90+
~~~~~~~~~~~~~~~~~~~~~~~~~~
91+
92+
* ``-1`` votes must always be justified by technical and objective reasons;
93+
94+
* ``+1`` votes do not require justification, unless there is at least one
95+
``-1`` vote;
96+
97+
* Core members can change their votes as many times as they desire
98+
during the course of a pull request discussion;
99+
100+
* Core members are not allowed to vote on their own pull requests.
101+
102+
Pull Request Merging Policy
103+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
104+
105+
A pull request **can be merged** if:
106+
107+
* Enough time was given for peer reviews (a few minutes for typos or minor
108+
changes, at least 2 days for "regular" pull requests, and 4 days for pull
109+
requests with "a significant impact");
110+
111+
* It is a minor change [1]_, regardless of the number of votes;
112+
113+
* At least the component's **Merger** or two other Core members voted ``+1``
114+
and no Core member voted ``-1``.
115+
116+
Pull Request Merging Process
117+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
118+
119+
All code must be committed to the repository through pull requests, except for
120+
minor changes [1]_ which can be committed directly to the repository.
121+
122+
**Mergers** must always use the command-line ``gh`` tool provided by the
123+
**Project Leader** to merge the pull requests.
124+
125+
Release Policy
126+
~~~~~~~~~~~~~~
127+
128+
The **Project Leader** is also the release manager for every Symfony version.
129+
130+
Symfony Core Rules and Protocol Amendments
131+
------------------------------------------
132+
133+
The rules described in this document may be amended at anytime at the
134+
discretion of the **Project Leader**.
135+
136+
137+
.. [1] Minor changes comprise typos, DocBlock fixes, code standards
138+
violations, and minor CSS, JavaScript and HTML modifications.
139+
140+
.. _Form: https://github.com/symfony/Form
141+
.. _Validator: https://github.com/symfony/Validator
142+
.. _Icu: https://github.com/symfony/Icu
143+
.. _Intl: https://github.com/symfony/Intl
144+
.. _Locale: https://github.com/symfony/Locale
145+
.. _OptionsResolver: https://github.com/symfony/OptionsResolver
146+
.. _PropertyAccess: https://github.com/symfony/PropertyAccess
147+
.. _Routing: https://github.com/symfony/Routing
148+
.. _Process: https://github.com/symfony/Process
149+
.. _Debug: https://github.com/symfony/Debug

contributing/code/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Contributing Code
66

77
bugs
88
patches
9+
core_team
910
security
1011
tests
1112
bc

contributing/map.rst.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
* :doc:`Bugs </contributing/code/bugs>`
44
* :doc:`Patches </contributing/code/patches>`
5+
* :doc:`The Core Team </contributing/code/core_team>`
56
* :doc:`Security </contributing/code/security>`
67
* :doc:`Tests </contributing/code/tests>`
78
* :doc:`Backwards Compatibility </contributing/code/bc>`

cookbook/configuration/front_controllers_and_kernel.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,5 +168,5 @@ way of loading your configuration.
168168
.. _app/console: https://github.com/symfony/symfony-standard/blob/master/app/console
169169
.. _AppKernel: https://github.com/symfony/symfony-standard/blob/master/app/AppKernel.php
170170
.. _decorate: http://en.wikipedia.org/wiki/Decorator_pattern
171-
.. _RewriteRule shipped with the Standard Edition: https://github.com/symfony/symfony-standard/blob/master/web/.htaccess)
171+
.. _RewriteRule shipped with the Standard Edition: https://github.com/symfony/symfony-standard/blob/master/web/.htaccess
172172
.. _template methods: http://en.wikipedia.org/wiki/Template_method_pattern

cookbook/security/api_key_authentication.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ Handling Authentication Failure
215215

216216
In order for your ``ApiKeyAuthentication`` to correctly display a 403
217217
http status when either bad credentials or authentication fails you will
218-
need to implement the :class:`Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface` on your
218+
need to implement the :class:`Symfony\\Component\\Security\\Http\\Authentication\\AuthenticationFailureHandlerInterface` on your
219219
Authenticator. This will provide a method ``onAuthenticationFailure`` which
220220
you can use to create an error ``Response``.
221221

reference/forms/types/time.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ options are ``input`` and ``widget``.
5151

5252
Suppose that you have a ``startTime`` field whose underlying time data is a
5353
``DateTime`` object. The following configures the ``time`` type for that
54-
field as three different choice fields:
54+
field as two different choice fields:
5555

5656
.. code-block:: php
5757

0 commit comments

Comments
 (0)