Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit cb3fa20

Browse filesBrowse files
weaverryanweaverryan
committed
Merge remote-tracking branch 'origin/2.7' into 2.7
* origin/2.7: removed Charles Updated the Core Team information added CVE 2017-11365 added URL where to ask for a CVE identifier add missing choices_as_values options
2 parents 0aa25f8 + 7a58612 commit cb3fa20
Copy full SHA for cb3fa20

File tree

Expand file treeCollapse file tree

4 files changed

+41
-20
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+41
-20
lines changed

‎contributing/code/core_team.rst

Copy file name to clipboardExpand all lines: contributing/code/core_team.rst
+29-14Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ Active Core Members
4949

5050
* **Mergers** (``@symfony/mergers`` on GitHub):
5151

52-
* **Bernhard Schussek** (`webmozart`_) can merge into the Form_,
53-
Validator_, Icu_, Intl_, Locale_, OptionsResolver_ and PropertyAccess_
54-
components;
55-
5652
* **Tobias Schultze** (`Tobion`_) can merge into the Routing_,
5753
OptionsResolver_ and PropertyAccess_ components;
5854

@@ -69,23 +65,37 @@ Active Core Members
6965
* **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_,
7066
Serializer_ component;
7167

72-
* **Abdellatif AitBoudad** (`aitboudad`_) can merge into the Translation_
73-
component;
74-
75-
* **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ component;
68+
* **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ and Intl_
69+
components;
7670

7771
* **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component;
7872

79-
* **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_
80-
bundle.
73+
* **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_;
74+
75+
* **Grégoire Pineau** (`lyrixx`_) can merge into the Workflow_ component;
76+
77+
* **Ryan Weaver** (`weaverryan`_) can merge into the Security_ component and
78+
the SecurityBundle_;
8179

82-
* **Grégoire Pineau** (`lyrixx`_) can merge into the Workflow_ component.
80+
* **Robin Chalas** (`chalasr`_) can merge into the Console_ and Security_
81+
components and the SecurityBundle_;
82+
83+
* **Maxime Steinhausser** (`ogizanagi`_) can merge into Config_, Console_,
84+
Form_, Serializer_, DependencyInjection_, and HttpKernel_ components.
8385

8486
* **Deciders** (``@symfony/deciders`` on GitHub):
8587

8688
* **Jordi Boggiano** (`seldaek`_);
87-
* **Lukas Kahwe Smith** (`lsmith77`_);
88-
* **Ryan Weaver** (`weaverryan`_).
89+
* **Lukas Kahwe Smith** (`lsmith77`_).
90+
91+
Former Core Members
92+
~~~~~~~~~~~~~~~~~~~
93+
94+
They are no longer part of the Core Team, but we are very grateful for all their
95+
Symfony contributions:
96+
97+
* **Bernhard Schussek** (`webmozart`_);
98+
* **Abdellatif AitBoudad** (`aitboudad`_).
8999

90100
Core Membership Application
91101
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -158,7 +168,6 @@ Symfony Core Rules and Protocol Amendments
158168
The rules described in this document may be amended at anytime at the
159169
discretion of the **Project Leader**.
160170

161-
162171
.. [1] Minor changes comprise typos, DocBlock fixes, code standards
163172
violations, and minor CSS, JavaScript and HTML modifications.
164173
@@ -178,6 +187,7 @@ discretion of the **Project Leader**.
178187
.. _HttpKernel: https://github.com/symfony/http-kernel
179188
.. _Icu: https://github.com/symfony/icu
180189
.. _Intl: https://github.com/symfony/intl
190+
.. _LDAP: https://github.com/symfony/ldap
181191
.. _Locale: https://github.com/symfony/locale
182192
.. _MonologBridge: https://github.com/symfony/monolog-bridge
183193
.. _OptionsResolver: https://github.com/symfony/options-resolver
@@ -187,6 +197,8 @@ discretion of the **Project Leader**.
187197
.. _Routing: https://github.com/symfony/routing
188198
.. _Serializer: https://github.com/symfony/serializer
189199
.. _Translation: https://github.com/symfony/translation
200+
.. _Security: https://github.com/symfony/security
201+
.. _SecurityBundle: https://github.com/symfony/security-bundle
190202
.. _Stopwatch: https://github.com/symfony/stopwatch
191203
.. _TwigBridge: https://github.com/symfony/twig-bridge
192204
.. _Validator: https://github.com/symfony/validator
@@ -209,3 +221,6 @@ discretion of the **Project Leader**.
209221
.. _`xabbuh`: https://github.com/xabbuh/
210222
.. _`javiereguiluz`: https://github.com/javiereguiluz/
211223
.. _`lyrixx`: https://github.com/lyrixx/
224+
.. _`chalasr`: https://github.com/chalasr/
225+
.. _`ogizanagi`: https://github.com/ogizanagi/
226+
.. _`csarrazi`: https://github.com/csarrazi/

‎contributing/code/security.rst

Copy file name to clipboardExpand all lines: contributing/code/security.rst
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ confirmed, the core-team works on a solution following these steps:
2121

2222
#. Send an acknowledgement to the reporter;
2323
#. Work on a patch;
24-
#. Get a CVE identifier from mitre.org;
24+
#. Get a CVE identifier from `mitre.org`_;
2525
#. Write a security announcement for the official Symfony `blog`_ about the
2626
vulnerability. This post should contain the following information:
2727

@@ -103,6 +103,7 @@ Security Advisories
103103
This section indexes security vulnerabilities that were fixed in Symfony
104104
releases, starting from Symfony 1.0.0:
105105

106+
* Jul 17, 2017, `CVE-2017-11365: Empty passwords validation issue <https://symfony.com/blog/cve-2017-11365-empty-passwords-validation-issue>`_ (2.7.30, 2.7.31, 2.8.23, 2.8.24, 3.2.10, 3.2.11, 3.3.3, and 3.3.4)
106107
* May 9, 2016: `CVE-2016-2403: Unauthorized access on a misconfigured Ldap server when using an empty password <https://symfony.com/blog/cve-2016-2403-unauthorized-access-on-a-misconfigured-ldap-server-when-using-an-empty-password>`_ (2.8.0-2.8.5, 3.0.0-3.0.5)
107108
* May 9, 2016: `CVE-2016-4423: Large username storage in session <https://symfony.com/blog/cve-2016-4423-large-username-storage-in-session>`_ (2.3.0-2.3.40, 2.7.0-2.7.12, 2.8.0-2.8.5, 3.0.0-3.0.5)
108109
* January 18, 2016: `CVE-2016-1902: SecureRandom's fallback not secure when OpenSSL fails <https://symfony.com/blog/cve-2016-1902-securerandom-s-fallback-not-secure-when-openssl-fails>`_ (2.3.0-2.3.36, 2.6.0-2.6.12, 2.7.0-2.7.8)
@@ -142,3 +143,4 @@ releases, starting from Symfony 1.0.0:
142143
.. _blog: https://symfony.com/blog/
143144
.. _Security Advisories: https://symfony.com/blog/category/security-advisories
144145
.. _`security advisories database`: https://github.com/FriendsOfPHP/security-advisories
146+
.. _`mitre.org`: https://cveform.mitre.org/

‎form/create_custom_field_type.rst

Copy file name to clipboardExpand all lines: form/create_custom_field_type.rst
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ for form fields, which is ``<BundleName>\Form\Type``. Make sure the field extend
3535
'Standard Shipping' => 'standard',
3636
'Expedited Shipping' => 'expedited',
3737
'Priority Shipping' => 'priority',
38-
)
38+
),
39+
'choices_as_values' => true,
3940
));
4041
}
4142

@@ -395,6 +396,7 @@ method to ``ShippingType``, which receives the shipping configuration::
395396
{
396397
$resolver->setDefaults(array(
397398
'choices' => array_flip($this->shippingOptions),
399+
'choices_as_values' => true,
398400
));
399401
}
400402

‎form/dynamic_form_modification.rst

Copy file name to clipboardExpand all lines: form/dynamic_form_modification.rst
+6-4Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -490,9 +490,10 @@ sport like this::
490490
$positions = null === $sport ? array() : $sport->getAvailablePositions();
491491

492492
$form->add('position', 'entity', array(
493-
'class' => 'AppBundle:Position',
493+
'class' => 'AppBundle:Position',
494494
'placeholder' => '',
495-
'choices' => $positions,
495+
'choices' => $positions,
496+
'choices_as_values' => true,
496497
));
497498
}
498499
);
@@ -553,9 +554,10 @@ The type would now look like::
553554
$positions = null === $sport ? array() : $sport->getAvailablePositions();
554555

555556
$form->add('position', 'entity', array(
556-
'class' => 'AppBundle:Position',
557+
'class' => 'AppBundle:Position',
557558
'placeholder' => '',
558-
'choices' => $positions,
559+
'choices' => $positions,
560+
'choices_as_values' => true,
559561
));
560562
};
561563

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.