Commit Graph

32290 Commits

Author SHA1 Message Date
Fabien Potencier
cd2529432a bug #23575 [VarDumper] Use "C" locale when using "comma" flags (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[VarDumper] Use "C" locale when using "comma" flags

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

Adding trailing comma implicitly requires a C locale.

Commits
-------

305ae5e5d4 [VarDumper] Use "C" locale when using "comma" flags
2017-07-19 05:57:51 +02:00
Fabien Potencier
1f8cc178c1 minor #23579 [DI] Change "this" to "that" in findAndSortTaggedServices doc to reduce confusion (simshaun)
This PR was merged into the 3.2 branch.

Discussion
----------

[DI] Change "this" to "that" in `findAndSortTaggedServices` doc to reduce confusion

Continuation of PR #23578 which I royally messed up.....

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

I know this is extremely minor, but reading the description of this method, I got confused. Wondering if it's just me.

Where it says:

> The order of additions must be respected for services having the same priority, and knowing that the \SplPriorityQueue class does not respect the FIFO method, we should not use **this** class.

Should it not say "we should not use **that** class"?

Commits
-------

04b7b04b65 Change "this" to "that" to avoid confusion
2017-07-19 05:54:37 +02:00
Shaun Simmons
04b7b04b65 Change "this" to "that" to avoid confusion 2017-07-18 17:34:47 -04:00
Nicolas Grekas
eed8a5143d [VarDumper] Move locale sniffing to dump() time 2017-07-18 18:11:53 +02:00
Nicolas Grekas
305ae5e5d4 [VarDumper] Use "C" locale when using "comma" flags 2017-07-18 18:05:00 +02:00
Nicolas Grekas
53b01903ce [Config] Make ClassExistenceResource throw on invalid parents 2017-07-18 16:40:06 +02:00
Nicolas Grekas
86ec5e10a7 Remove last legacy codes 2017-07-18 15:35:15 +02:00
Nicolas Grekas
4b30b6efc0 Merge branch '3.4'
* 3.4:
  remove useless comment
  [FrameworkBundle] Make RouterCacheWarmer implement ServiceSubscriberInterface
  fix merge
2017-07-18 15:13:09 +02:00
Fabien Potencier
5a521bf5ae feature #23570 [FrameworkBundle] Make RouterCacheWarmer implement ServiceSubscriberInterface (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[FrameworkBundle] Make RouterCacheWarmer implement ServiceSubscriberInterface

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

Blocks #23569

Commits
-------

c0af0031ec [FrameworkBundle] Make RouterCacheWarmer implement ServiceSubscriberInterface
2017-07-18 15:06:41 +02:00
Nicolas Grekas
a1846f0637 Merge branch '3.3' into 3.4
* 3.3:
  remove useless comment
  fix merge
2017-07-18 13:59:19 +02:00
Nicolas Grekas
0bd1f09152 remove useless comment 2017-07-18 13:58:52 +02:00
Nicolas Grekas
c0af0031ec [FrameworkBundle] Make RouterCacheWarmer implement ServiceSubscriberInterface 2017-07-18 13:49:54 +02:00
Nicolas Grekas
aac9273765 feature #22783 [TwigBridge] remove deprecated features (xabbuh)
This PR was merged into the 4.0-dev branch.

Discussion
----------

[TwigBridge] remove deprecated features

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

Commits
-------

aae494c [TwigBridge] remove deprecated features
2017-07-18 13:05:50 +02:00
Christian Flothmann
aae494cac6 [TwigBridge] remove deprecated features 2017-07-18 13:03:21 +02:00
Nicolas Grekas
aa90ce6017 Merge branch '3.4'
* 3.4:
  [TwigBridge] fix tests
2017-07-18 12:38:33 +02:00
Fabien Potencier
ab661bd29a minor #23567 [TwigBridge] fix tests (xabbuh)
This PR was merged into the 3.4 branch.

Discussion
----------

[TwigBridge] fix tests

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

~The changed test did not pass locally. I do probably miss something important, but I fail to see why this did not occur when running the tests on Travis CI.~ Never mind, I was looking at the wrong build. It fails on Travis CI too.

Commits
-------

62410b6b7e [TwigBridge] fix tests
2017-07-18 12:28:19 +02:00
Christian Flothmann
62410b6b7e [TwigBridge] fix tests 2017-07-18 11:04:59 +02:00
Nicolas Grekas
c0c1881fe4 [DI] Optimize use of private and pre-defined services 2017-07-18 10:12:28 +02:00
Nicolas Grekas
4917b30718 fix merge 2017-07-18 10:09:42 +02:00
Nicolas Grekas
75701bc378 Merge branch '3.4'
* 3.4:
  [DI] Resolve aliases earlier
  [DI] Mark Container::$privates as internal
  [DI] Minor dumping logic simplification
  bumped Symfony version to 3.3.6
  updated VERSION for 3.3.5
  updated CHANGELOG for 3.3.5
  bumped Symfony version to 3.2.13
  updated VERSION for 3.2.12
  updated CHANGELOG for 3.2.12
  bumped Symfony version to 2.8.26
  updated VERSION for 2.8.25
  updated CHANGELOG for 2.8.25
  bumped Symfony version to 2.7.33
  updated VERSION for 2.7.32
  update CONTRIBUTORS for 2.7.32
  updated CHANGELOG for 2.7.32
2017-07-18 10:02:14 +02:00
Nicolas Grekas
a0795c7186 Merge branch '3.3' into 3.4
* 3.3:
  [DI] Resolve aliases earlier
  [DI] Mark Container::$privates as internal
  [DI] Minor dumping logic simplification
  bumped Symfony version to 3.3.6
  updated VERSION for 3.3.5
  updated CHANGELOG for 3.3.5
  bumped Symfony version to 3.2.13
  updated VERSION for 3.2.12
  updated CHANGELOG for 3.2.12
  bumped Symfony version to 2.8.26
  updated VERSION for 2.8.25
  updated CHANGELOG for 2.8.25
  bumped Symfony version to 2.7.33
  updated VERSION for 2.7.32
  update CONTRIBUTORS for 2.7.32
  updated CHANGELOG for 2.7.32
2017-07-18 09:59:12 +02:00
Nicolas Grekas
72aaecc0ff Merge branch '3.2' into 3.3
* 3.2:
  [DI] Resolve aliases earlier
  [DI] Mark Container::$privates as internal
  bumped Symfony version to 3.2.13
  updated VERSION for 3.2.12
  updated CHANGELOG for 3.2.12
  bumped Symfony version to 2.8.26
  updated VERSION for 2.8.25
  updated CHANGELOG for 2.8.25
  bumped Symfony version to 2.7.33
  updated VERSION for 2.7.32
  update CONTRIBUTORS for 2.7.32
  updated CHANGELOG for 2.7.32
2017-07-18 09:56:35 +02:00
Nicolas Grekas
30b409a295 Merge branch '2.8' into 3.2
* 2.8:
  [DI] Resolve aliases earlier
  bumped Symfony version to 2.8.26
  updated VERSION for 2.8.25
  updated CHANGELOG for 2.8.25
  bumped Symfony version to 2.7.33
  updated VERSION for 2.7.32
  update CONTRIBUTORS for 2.7.32
  updated CHANGELOG for 2.7.32
2017-07-18 09:52:56 +02:00
Nicolas Grekas
f8f5c028d1 Merge branch '2.7' into 2.8
* 2.7:
  [DI] Resolve aliases earlier
  bumped Symfony version to 2.7.33
  updated VERSION for 2.7.32
  update CONTRIBUTORS for 2.7.32
  updated CHANGELOG for 2.7.32
2017-07-18 09:49:35 +02:00
Nicolas Grekas
267970eff3 minor #23560 [DI] Minor dumping logic simplification (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Minor dumping logic simplification

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

Likely not a bug fix because private services should be dealt with by some compiler pass, but anyway, locally, I don't get why non-shared private services should check the "$this->services" property.
Did I miss something?

Commits
-------

37d8495 [DI] Minor dumping logic simplification
2017-07-18 09:48:14 +02:00
Fabien Potencier
910a8debd8 minor #23559 [DI] Resolve aliases earlier (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[DI] Resolve aliases earlier

| 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        | -

Not a bug fix because a compiler pass already resolves aliases, but makes reasoning locally about the code easier.

Commits
-------

9922827cc2 [DI] Resolve aliases earlier
2017-07-18 09:30:09 +02:00
Fabien Potencier
0ccd2edb21 minor #23565 [DI] Mark Container::$privates as internal (nicolas-grekas)
This PR was merged into the 3.2 branch.

Discussion
----------

[DI] Mark Container::$privates as internal

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

As is should have been since its introduction.

Commits
-------

2725fd6080 [DI] Mark Container::$privates as internal
2017-07-18 09:28:01 +02:00
Nicolas Grekas
9922827cc2 [DI] Resolve aliases earlier 2017-07-18 09:15:21 +02:00
Nicolas Grekas
2725fd6080 [DI] Mark Container::$privates as internal 2017-07-18 09:06:47 +02:00
Nicolas Grekas
37d8495a59 [DI] Minor dumping logic simplification 2017-07-17 22:48:54 +02:00
Fabien Potencier
5c2797afd3 bumped Symfony version to 3.3.6 2017-07-17 21:17:46 +02:00
Fabien Potencier
b9a0d3d239 Merge pull request #23555 from fabpot/release-3.3.5
released v3.3.5
2017-07-17 21:08:46 +02:00
Fabien Potencier
d7d9a07917 updated VERSION for 3.3.5 2017-07-17 21:08:23 +02:00
Fabien Potencier
7a608efbed updated CHANGELOG for 3.3.5 2017-07-17 21:08:20 +02:00
Fabien Potencier
95c03f2fb3 bumped Symfony version to 3.2.13 2017-07-17 21:06:44 +02:00
Fabien Potencier
d65d8fad37 Merge pull request #23554 from fabpot/release-3.2.12
released v3.2.12
2017-07-17 20:15:19 +02:00
Fabien Potencier
579203a9f0 updated VERSION for 3.2.12 2017-07-17 20:15:00 +02:00
Fabien Potencier
e81459303b updated CHANGELOG for 3.2.12 2017-07-17 20:14:55 +02:00
Fabien Potencier
53b8579bec bumped Symfony version to 2.8.26 2017-07-17 20:14:06 +02:00
Fabien Potencier
c2452af565 Merge pull request #23553 from fabpot/release-2.8.25
released v2.8.25
2017-07-17 20:00:19 +02:00
Fabien Potencier
5836f0ea64 updated VERSION for 2.8.25 2017-07-17 20:00:03 +02:00
Fabien Potencier
d3098b22ab updated CHANGELOG for 2.8.25 2017-07-17 19:59:59 +02:00
Fabien Potencier
3d4e143619 bumped Symfony version to 2.7.33 2017-07-17 19:58:04 +02:00
Fabien Potencier
f3f7d55052 Merge pull request #23552 from fabpot/release-2.7.32
released v2.7.32
2017-07-17 19:33:37 +02:00
Fabien Potencier
f01f3d328a updated VERSION for 2.7.32 2017-07-17 19:33:19 +02:00
Fabien Potencier
5377fe5d6a update CONTRIBUTORS for 2.7.32 2017-07-17 19:33:09 +02:00
Fabien Potencier
f62dc85fd9 updated CHANGELOG for 2.7.32 2017-07-17 19:33:01 +02:00
Fabien Potencier
09f196e019 Merge branch '3.4'
* 3.4:
  fixed double-declaration
2017-07-17 19:31:31 +02:00
Fabien Potencier
43eed768ab Merge branch '3.3' into 3.4
* 3.3:
  fixed double-declaration
2017-07-17 19:31:23 +02:00
Fabien Potencier
72947810a3 fixed double-declaration 2017-07-17 19:27:31 +02:00