Commit Graph

26047 Commits

Author SHA1 Message Date
Jules Pietri
8a6cf9d93e [DoctrineBridge] fixed bc layer from #18069 2016-05-04 01:20:48 +02:00
Fabien Potencier
6857c36576 feature #18685 move event listener method type hint docs to @Event annotations defau… (Haehnchen)
This PR was submitted for the 3.0 branch but it was merged into the 3.1-dev branch instead (closes #18685).

Discussion
----------

move event listener method type hint docs to @Event annotations defau…

| Q             | A
| ------------- | ---
| Branch?       | 3.0
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | reference to the documentation PR, if any

I moved all `listener method receives a "*"` from php docs to "@Event". makes them parsable by PhpStorm Plugin without extract class names out of comments. This helps to prefill type hints on method creation. There is also a fallback for doccomments, but it would be much easier to provide a common structure eg for external libs.

see also #18684, which adds some missing "@Events"

External issue:
https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/493

![phpstorm-events-method](https://cloud.githubusercontent.com/assets/1011712/14941660/e214f546-0fa3-11e6-8d2e-fa6fc7a6f201.png)

Commits
-------

f2c0446 move event listener method type hint docs to @Event annotations default value. makes it easily parsable by PhpStorm plugin
2016-05-03 20:48:46 +02:00
Daniel Espendiller
f2c04464d8 move event listener method type hint docs to @Event annotations default value. makes it easily parsable by PhpStorm plugin 2016-05-03 20:48:46 +02:00
Fabien Potencier
cab3f45a77 Merge branch '3.0'
* 3.0: (24 commits)
  add @Event annotation for AuthenticationEvents
  bumped Symfony version to 3.0.6
  updated VERSION for 3.0.5
  updated CHANGELOG for 3.0.5
  bumped Symfony version to 2.8.6
  [PropertyInfo] PHPDoc correction
  add @Event annotation for KernelEvents
  Fixed typo
  updated VERSION for 2.8.5
  updated CHANGELOG for 2.8.5
  bumped Symfony version to 2.7.13
  updated VERSION for 2.7.12
  update CONTRIBUTORS for 2.7.12
  updated CHANGELOG for 2.7.12
  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
  Revert "minor #18257 [Routing] Don't needlessly execute strtr's as they are fairly expensive (arjenm)"
  Revert "fixed CS"
  ...
2016-05-03 14:24:23 +02:00
Fabien Potencier
2877f4b9ec Merge branch '2.8' into 3.0
* 2.8:
  add @Event annotation for AuthenticationEvents
  bumped Symfony version to 2.8.6
  [PropertyInfo] PHPDoc correction
  add @Event annotation for KernelEvents
  updated VERSION for 2.8.5
  updated CHANGELOG for 2.8.5
  bumped Symfony version to 2.7.13
  updated VERSION for 2.7.12
  update CONTRIBUTORS for 2.7.12
  updated CHANGELOG for 2.7.12
  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
  Revert "minor #18257 [Routing] Don't needlessly execute strtr's as they are fairly expensive (arjenm)"
  Revert "fixed CS"
  fixed deprecation notices in tests
  [Security] Normalize "symfony/security-acl" dependency versions across all composer.json files
  [FrameworkBundle] Remove misleading comment
  bug #17460 [DI] fix ambiguous services schema
2016-05-03 14:23:49 +02:00
Fabien Potencier
a5e6172e12 Merge branch '2.7' into 2.8
* 2.7:
  add @Event annotation for AuthenticationEvents
  add @Event annotation for KernelEvents
  bumped Symfony version to 2.7.13
  updated VERSION for 2.7.12
  update CONTRIBUTORS for 2.7.12
  updated CHANGELOG for 2.7.12
  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
  Revert "minor #18257 [Routing] Don't needlessly execute strtr's as they are fairly expensive (arjenm)"
  Revert "fixed CS"
  [FrameworkBundle] Remove misleading comment
  bug #17460 [DI] fix ambiguous services schema
2016-05-03 14:21:46 +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
6bc7c87147 minor #18696 [PropertyInfo] PHPDoc correction (dunglas)
This PR was merged into the 2.8 branch.

Discussion
----------

[PropertyInfo] PHPDoc correction

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

Commits
-------

3b78492 [PropertyInfo] PHPDoc correction
2016-05-03 14:19:54 +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
Fabien Potencier
06dd96e5d2 bug #18693 add @Event annotation for AuthenticationEvents (Haehnchen)
This PR was merged into the 3.1-dev branch.

Discussion
----------

add @Event annotation for AuthenticationEvents

| Q             | A
| ------------- | ---
| Branch       | 2.3
| 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.3 branch

Commits
-------

e2c1270 add @Event annotation for AuthenticationEvents
2016-05-03 14:15:42 +02:00
Fabien Potencier
42279b5d00 bumped Symfony version to 3.0.6 2016-05-03 08:45:46 +02:00
Fabien Potencier
10c83b58fb Merge pull request #18697 from fabpot/release-3.0.5
released v3.0.5
2016-05-03 07:58:56 +02:00
Fabien Potencier
58b48a8337 updated VERSION for 3.0.5 2016-05-03 07:58:27 +02:00
Fabien Potencier
feae3e5c5f updated CHANGELOG for 3.0.5 2016-05-03 07:58:20 +02:00
Fabien Potencier
7b3c65bf67 bumped Symfony version to 2.8.6 2016-05-03 07:55:22 +02:00
Kévin Dunglas
3b78492136 [PropertyInfo] PHPDoc correction 2016-05-02 22:41:39 +02:00
Daniel Espendiller
a52e51a7b8 add @Event annotation for KernelEvents 2016-05-02 19:24:41 +02:00
Daniel Espendiller
e2c127081a add @Event annotation for AuthenticationEvents 2016-05-02 19:21:33 +02:00
Nicolas Grekas
cfcf263e24 minor #18687 [Cache] Cleanups (nicolas-grekas)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Cache] Cleanups

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

Commits
-------

9a56498 [Cache] Cleanups
2016-05-02 14:52:27 +02:00
Nicolas Grekas
9a56498c8d [Cache] Cleanups 2016-05-02 14:16:25 +02:00
Fabien Potencier
8166094dc2 feature #18681 [Cache] Add DSN based Redis connection factory (nicolas-grekas)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Cache] Add DSN based Redis connection factory

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

Required by #18667

Commits
-------

3073efb [Cache] Add DSN based Redis connection factory
2016-05-01 12:56:11 +02:00
Nicolas Grekas
3073efb6d1 [Cache] Add DSN based Redis connection factory 2016-05-01 11:31:04 +02:00
Fabien Potencier
28ec06b69f minor #18680 Fixed typo (radarhere)
This PR was submitted for the master branch but it was merged into the 3.0 branch instead (closes #18680).

Discussion
----------

Fixed typo

Commits
-------

ba64d7b Fixed typo
2016-05-01 05:15:06 +02:00
Andrew Murray
ba64d7bb0d Fixed typo 2016-05-01 05:15:06 +02:00
Fabien Potencier
352997e61e minor #18664 [Form] [DoctrineBridge] updated changelogs after #18359 (HeahDude)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Form] [DoctrineBridge] updated changelogs after #18359

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

follows #18359.

Commits
-------

1c8dc9d [Form] [DoctrineBridge] updated changelogs after #18359
2016-04-29 17:38:41 +02:00
Fabien Potencier
39ddd2383f Merge pull request #18674 from fabpot/release-2.8.5
released v2.8.5
2016-04-29 17:34:08 +02:00
Fabien Potencier
25d166b4d8 updated VERSION for 2.8.5 2016-04-29 17:33:46 +02:00
Fabien Potencier
73677e57ab updated CHANGELOG for 2.8.5 2016-04-29 17:33:40 +02: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
Jules Pietri
1c8dc9d06b [Form] [DoctrineBridge] updated changelogs after #18359
follows #18359.
2016-04-29 11:10:43 +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
Fabien Potencier
731d7a6bf0 Merge branch '3.0'
* 3.0:
  [Form] Fix tests added in #18180
2016-04-28 16:43:15 +02:00
Fabien Potencier
e2180e32c3 minor #18663 [Form] Fix tests added in #18180 (HeahDude)
This PR was submitted for the master branch but it was merged into the 3.0 branch instead (closes #18663).

Discussion
----------

[Form] Fix tests added in #18180

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

Commits
-------

c45a435 [Form] Fix tests added in #18180
2016-04-28 16:42:50 +02:00
Jules Pietri
c45a435805 [Form] Fix tests added in #18180 2016-04-28 16:42:50 +02:00
Fabien Potencier
1ab5be70ae feature #18656 Updating the error message of an AuthenticationEntryPointInterface (weaverryan)
This PR was merged into the 3.1-dev branch.

Discussion
----------

Updating the error message of an AuthenticationEntryPointInterface

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

During a training, we forgot to fill in the `start()` method for an entry point and got a *horrible* error message. Now, if you mess up `start()`, you get:

![screen shot 2016-04-27 at 12 49 50 pm](https://cloud.githubusercontent.com/assets/121003/14860378/92578e68-0c76-11e6-9fe5-45141fe2ce43.png)

Thanks!

Commits
-------

7b6c56c Updating the error message of an AuthenticationEntryPointInterface returns a non-Response object
2016-04-28 16:41:32 +02:00
Fabien Potencier
2f562c87ff feature #18069 [DoctrineBridge] deprecate MergeDoctrineCollectionListener::onBind() (HeahDude)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[DoctrineBridge] deprecate `MergeDoctrineCollectionListener::onBind()`

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

Commits
-------

ad08b95 [DoctrineBridge] deprecated `MergeDoctrineCollectionListener::onBind()`
2016-04-28 15:45:38 +02:00
Fabien Potencier
ae1baac0e6 bug #18659 [Cache] Dont use Redis connection when not required (nicolas-grekas)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Cache] Dont use Redis connection when not required

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

Commits
-------

1165459 [Cache] Dont use Redis connection when not required
2016-04-28 13:15:08 +02:00
Fabien Potencier
2d4df167c9 bug #18657 [FrameworkBundle] Fix a typo and add a test to prevent new regressions (Ener-Getick)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[FrameworkBundle] Fix a typo and add a test to prevent new regressions

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

This fixes a typo introduced in #18630 and adds a new functional test to avoid most regressions in service definitions in the future when features are only available in non-debug mode.

cc @nicolas-grekas

Commits
-------

61872ce Fix a typo and add a check to prevent regressions
2016-04-28 13:13:57 +02:00
Fabien Potencier
745334e386 minor #18594 [Security] Normalize "symfony/security-acl" dependency versions across all composer.json files (siwinski)
This PR was merged into the 2.8 branch.

Discussion
----------

[Security] Normalize "symfony/security-acl" dependency versions across all composer.json files

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

There are some inconsistencies in the Symfony 2.8 `symfony/security-acl` dependency versions that would help downstream if we could just package `symfony/security-acl` 3.0.0 instead of having to package both versions 2.8.0 (for Symfony 2.8) and 3.0.0 (for Symfony 3.0).

```
$ git clone https://github.com/symfony/symfony.git
Cloning into 'symfony'...
cd remote: Counting objects: 319438, done.
nyReceiving objects:   4% (12778/319438), 2.06 MiB | 4.12 MiB/s
4Receiving objects:  41% (130970/319438), 40.80 MiB | 7.86 MiB/s
remote: Total 319438 (delta 0), reused 0 (delta 0), pack-reused 319437
Receiving objects: 100% (319438/319438), 68.46 MiB | 8.21 MiB/s, done.
Resolving deltas: 100% (204691/204691), done.
Checking connectivity... done.

$ cd symfony

$ git checkout v2.8.4
Previous HEAD position was 4e17cb2... Merge branch '2.8' into 3.0
HEAD is now at 9e14f9f... Merge branch '2.7' into 2.8

$ find . -name 'composer.json' | xargs grep 'symfony/security-acl'
./src/Symfony/Bundle/SecurityBundle/composer.json:        "symfony/security-acl": "~2.7|~3.0.0",
./src/Symfony/Bridge/Twig/composer.json:        "symfony/security-acl": "~2.6|~3.0.0",
./src/Symfony/Component/Security/composer.json:        "symfony/security-acl": "~2.7",
./composer.json:        "symfony/security-acl": "~2.7",
```

Commits
-------

e249bc3 [Security] Normalize "symfony/security-acl" dependency versions across all composer.json files
2016-04-28 13:08:06 +02:00
Fabien Potencier
321fd382bd minor #18575 Fixed a redundant check in DefaultValueResolver (iltar)
This PR was merged into the 3.1-dev branch.

Discussion
----------

Fixed a redundant check in DefaultValueResolver

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

In #18308 I have introduced a `DefaultValueResolver`. When writing documentation, I was planning on adding the code as an example and I noticed it did a check in the request attributes. A default value value should always be injected, whether the request has it or not. In case the request _does_ have the value, it would've already been added and thus never reach the default resolver.

Thus as this is never called in the default and configured flows and should not change the default value behavior, I'm removing this.

Commits
-------

e54c1a6 Fixed a redundant check in DefaultValueResolver
2016-04-28 13:04:44 +02:00
Fabien Potencier
cf38962dfe minor #18551 [FrameworkBundle] Remove misleading comment (JhonnyL)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Remove misleading comment

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

This is not true for service_container anymore.

Commits
-------

9f2f858 [FrameworkBundle] Remove misleading comment
2016-04-28 13:02:03 +02:00