Commit Graph

23651 Commits

Author SHA1 Message Date
Issei.M
7101cab29f [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper 2016-05-13 09:43:53 -05:00
Christophe Coevoet
d9d8ea8910 minor #18770 Updated the link to the list of currency codes (javiereguiluz)
This PR was merged into the 2.3 branch.

Discussion
----------

Updated the link to the list of currency codes

| Q             | A
| ------------- | ---
| Branch?       | 2.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #18758
| License       | MIT
| Doc PR        | -

Commits
-------

09b70a1 Updated the link to the list of currency codes
2016-05-13 10:26:22 +02:00
Javier Eguiluz
09b70a1df4 Updated the link to the list of currency codes 2016-05-13 09:29:13 +02:00
Nicolas Grekas
215c891310 Merge branch '2.3' into 2.7
* 2.3:
  Drop hirak/prestissimo
  bumped Symfony version to 2.3.42
  updated VERSION for 2.3.41
  update CONTRIBUTORS for 2.3.41
  updated CHANGELOG for 2.3.41

Conflicts:
	appveyor.yml
	src/Symfony/Component/HttpKernel/Kernel.php
2016-05-12 10:18:46 -05:00
Nicolas Grekas
b3da5df715 minor #18757 Drop hirak/prestissimo (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Drop hirak/prestissimo

| Q             | A
| ------------- | ---
| Branch?       | 2.3
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

unstable (see #18743 on appveyor)

Commits
-------

8f136ab Drop hirak/prestissimo
2016-05-12 10:16:26 -05:00
Nicolas Grekas
8f136ab665 Drop hirak/prestissimo 2016-05-12 07:44:15 -05:00
Fabien Potencier
7e59c71d9a bug #18737 [Debug] Fix fatal error handlers on PHP 7 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Fix fatal error handlers on PHP 7

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Currently, fatal error handlers are broken on PHP 7.

Commits
-------

c7d3b45 [Debug] Fix fatal error handlers on PHP 7
2016-05-10 11:50:18 -05:00
Fabien Potencier
ebdff4686d bumped Symfony version to 2.7.14 2016-05-09 16:42:27 -05:00
Fabien Potencier
7c23f76ba7 Merge pull request #18739 from fabpot/release-2.7.13
released v2.7.13
2016-05-09 22:35:47 +02:00
Fabien Potencier
d0c233ee4d updated VERSION for 2.7.13 2016-05-09 15:35:33 -05:00
Fabien Potencier
f31a08d69c updated CHANGELOG for 2.7.13 2016-05-09 15:35:20 -05:00
Fabien Potencier
4533220997 bumped Symfony version to 2.3.42 2016-05-09 15:32:07 -05:00
Nicolas Grekas
c7d3b45841 [Debug] Fix fatal error handlers on PHP 7 2016-05-09 15:05:29 -05:00
Fabien Potencier
f3f87ce00d Merge pull request #18738 from fabpot/release-2.3.41
released v2.3.41
2016-05-09 21:45:40 +02:00
Fabien Potencier
efd48596a9 updated VERSION for 2.3.41 2016-05-09 14:45:27 -05:00
Fabien Potencier
f80f588218 update CONTRIBUTORS for 2.3.41 2016-05-09 14:45:18 -05:00
Fabien Potencier
a5c27e37cd updated CHANGELOG for 2.3.41 2016-05-09 14:45:08 -05:00
Fabien Potencier
9a0e29991d fixed bad merge 2016-05-09 14:39:01 -05:00
Fabien Potencier
60bf201eba Merge branch '2.3' into 2.7
* 2.3:
  limited the maximum length of a submitted username
2016-05-09 14:23:35 -05:00
Fabien Potencier
ff93b17930 security #18733 limited the maximum length of a submitted username (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

limited the maximum length of a submitted username

| Q             | A
| ------------- | ---
| Branch?       | 2.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

f8dc28a limited the maximum length of a submitted username
2016-05-09 14:13:10 -05:00
Fabien Potencier
f8dc28ae53 limited the maximum length of a submitted username 2016-05-09 13:29:33 -05:00
Fabien Potencier
b9b68f7af8 Merge branch '2.3' into 2.7
* 2.3:
  [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
  call get() after the container was compiled
  Fixed readme of OptionsResolver
2016-05-09 13:11:52 -05:00
Fabien Potencier
928c1d65b4 bug #18730 [FrameworkBundle] prevent calling get() for service_container service (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] prevent calling get() for service_container service

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

This change will simply fix the tests once #18728 gets merged. An alternative approach would be to compile the container so that the code would still work even for services that have been set directly using `set()`. However, compiling the container in a descriptor imo is an unexpected side effect which I tried to avoid here.

Commits
-------

2d46bd4 prevent calling get() for service_container service
2016-05-09 13:08:03 -05:00
Fabien Potencier
daa2afa90c minor #18729 call get() after the container was compiled (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

call get() after the container was compiled

| Q             | A
| ------------- | ---
| Branch?       | 2.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

This will prevent future issues when calling `ContainerBuilder::get()` before compiling the container will be deprecated (see #18728).

Commits
-------

954126b call get() after the container was compiled
2016-05-09 13:03:25 -05:00
Fabien Potencier
17e29116c6 minor #18695 [DependencyInjection] Suggest ExpressionLanguage in composer.json (chalasr)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] Suggest ExpressionLanguage in composer.json

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

As the DependencyInjection component has lots of classes containing uses of the ExpressionLanguage component, I propose to add it to the composer.json suggests.

Commits
-------

d6c9073 [DependencyInjection] Suggest ExpressionLanguage in composer.json
2016-05-09 13:00:26 -05:00
Fabien Potencier
bdc99de4bc minor #18727 [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param (eriwin)
This PR was squashed before being merged into the 2.3 branch (closes #18727).

Discussion
----------

[2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param

| Q             | A
| ------------- | ---
| Branch?       | 2.3
| Bug fix?      | yes, phpdoc one
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Updated phpdoc of AnonymousToken $user param from string to string|object since an object is allowed to in the parent AbstractToken: https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php#L91

Commits
-------

b1c60b4 [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
2016-05-09 12:47:57 -05:00
Erik van Wingerden
b1c60b4f0d [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param 2016-05-09 12:47:55 -05:00
Christian Flothmann
2d46bd4812 prevent calling get() for service_container service 2016-05-09 17:08:24 +02:00
Christian Flothmann
954126b04f call get() after the container was compiled 2016-05-09 17:05:30 +02:00
Tobias Schultze
e8970a6de2 minor #18721 [OptionsResolver] Fixed readme (francisbesset)
This PR was merged into the 2.3 branch.

Discussion
----------

[OptionsResolver] Fixed readme

| Q             | A
| ------------- | ---
| Branch?       | 2.3
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

This PR fix bad markdown syntax in readme file of OptionsResolver component.

Commits
-------

beecc6c Fixed readme of OptionsResolver
2016-05-06 22:49:13 +02:00
Francis Besset
beecc6c1be Fixed readme of OptionsResolver 2016-05-06 22:13:08 +02:00
Nicolas Grekas
a53aba327e Merge branch '2.3' into 2.7
* 2.3:
  top-level anonymous services must be public

Conflicts:
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
2016-05-06 11:19:28 +02:00
Nicolas Grekas
9fabd83223 bug #18709 [DependencyInjection] top-level anonymous services must be public (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] top-level anonymous services must be public

| Q             | A
| ------------- | ---
| Branch?       | 2.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #18703
| License       | MIT
| Doc PR        |

Commits
-------

13a47c3 top-level anonymous services must be public
2016-05-06 11:06:26 +02:00
Christian Flothmann
13a47c3c6d top-level anonymous services must be public 2016-05-04 22:01:55 +02:00
Robin Chalas
d6c9073ec2 [DependencyInjection] Suggest ExpressionLanguage in composer.json
Add a suggestion message

Fix wrong message
2016-05-04 18:44:06 +02:00
Fabien Potencier
591fc3a491 Merge branch '2.3' into 2.7
* 2.3:
  add @Event annotation for AuthenticationEvents
  bumped Symfony version to 2.3.41
  updated VERSION for 2.3.40
  update CONTRIBUTORS for 2.3.40
  updated CHANGELOG for 2.3.40
  bug #17460 [DI] fix ambiguous services schema
2016-05-03 14:21:10 +02:00
Fabien Potencier
6f86b0e9bb bug #18692 add @Event annotation for KernelEvents (Haehnchen)
This PR was merged into the 2.7 branch.

Discussion
----------

add @Event annotation for KernelEvents

| Q             | A
| ------------- | ---
| Branch       | 2.7
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #18684
| License       | MIT

split of #18684 for targeting 2.7 branch

Commits
-------

a52e51a add @Event annotation for KernelEvents
2016-05-03 14:18:00 +02:00
Daniel Espendiller
af4ca4f48b add @Event annotation for AuthenticationEvents 2016-05-03 14:17:15 +02:00
Daniel Espendiller
a52e51a7b8 add @Event annotation for KernelEvents 2016-05-02 19:24:41 +02:00
Abdellatif Ait boudad
9b35449216 [console][table] adjust width of colspanned cell. 2016-05-02 13:08:27 +01:00
Fabien Potencier
fb92d7a04a bumped Symfony version to 2.7.13 2016-04-29 12:50:16 +02:00
Fabien Potencier
9edf2430f1 Merge pull request #18670 from fabpot/release-2.7.12
released v2.7.12
2016-04-29 11:48:03 +02:00
Fabien Potencier
39890ed371 updated VERSION for 2.7.12 2016-04-29 11:47:36 +02:00
Fabien Potencier
1ce2f04915 update CONTRIBUTORS for 2.7.12 2016-04-29 11:47:34 +02:00
Fabien Potencier
2ada5535cd updated CHANGELOG for 2.7.12 2016-04-29 11:47:27 +02:00
Fabien Potencier
ca80946379 bumped Symfony version to 2.3.41 2016-04-29 11:36:11 +02:00
Fabien Potencier
7bcb5deb31 Merge pull request #18669 from fabpot/release-2.3.40
released v2.3.40
2016-04-29 07:45:37 +02:00
Fabien Potencier
2dc63b3914 updated VERSION for 2.3.40 2016-04-29 07:38:17 +02:00
Fabien Potencier
30d7571ec6 update CONTRIBUTORS for 2.3.40 2016-04-29 07:37:50 +02:00
Fabien Potencier
84d46cc404 updated CHANGELOG for 2.3.40 2016-04-29 07:37:42 +02:00