Fabien Potencier
8dedf9d999
Merge branch '3.1' into 3.2
...
* 3.1:
tweaked php cs fixer configuration
[TwigBundle] fixed typo in composer.json
2017-01-04 14:01:24 -08:00
Fabien Potencier
2904201ec6
Merge branch '2.8' into 3.1
...
* 2.8:
tweaked php cs fixer configuration
2017-01-04 14:01:15 -08:00
Fabien Potencier
a9ed1841dc
Merge branch '2.7' into 2.8
...
* 2.7:
tweaked php cs fixer configuration
2017-01-04 14:01:04 -08:00
Fabien Potencier
4864e9dd51
tweaked php cs fixer configuration
2017-01-04 14:00:53 -08:00
Fabien Potencier
c3a50b0931
Merge branch '2.8' into 3.1
...
* 2.8:
[TwigBundle] fixed typo in composer.json
2017-01-04 12:00:51 -08:00
Fabien Potencier
fccb98c551
[TwigBundle] fixed typo in composer.json
2017-01-04 12:00:29 -08:00
Fabien Potencier
0d1f53f48b
Merge branch '3.2'
...
* 3.2:
Fix serializer/translations/validator resources loading for bundles overriding getPath()
Fix the priority order of compiler pass trait
2017-01-04 11:58:57 -08:00
Fabien Potencier
be882c4663
Merge branch '3.1' into 3.2
...
* 3.1:
Fix serializer/translations/validator resources loading for bundles overriding getPath()
2017-01-04 11:58:34 -08:00
Fabien Potencier
8f82bf7076
Merge branch '2.8' into 3.1
...
* 2.8:
Fix serializer/translations/validator resources loading for bundles overriding getPath()
2017-01-04 11:57:42 -08:00
Fabien Potencier
829b6bd475
Merge branch '2.7' into 2.8
...
* 2.7:
Fix serializer/translations/validator resources loading for bundles overriding getPath()
2017-01-04 11:55:18 -08:00
Fabien Potencier
da88e6b1d7
bug #21113 [FrameworkBundle][HttpKernel] Fix resources loading for bundles with custom structure (chalasr)
...
This PR was merged into the 2.7 branch.
Discussion
----------
[FrameworkBundle][HttpKernel] Fix resources loading for bundles with custom structure
| Q | A
| ------------- | ---
| Branch? | 2.7
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/18563
| License | MIT
| Doc PR | n/a
This fixes twig/translator/validator/serializer resource loading for bundles overriding `Bundle::getPath()`, adding a kernel parameter containing the bundle metadata (i.e. `path`, `namespace` and `parent`).
Fixes #18563 and unlocks https://github.com/symfony/symfony/pull/19586
Commits
-------
fef3146b3b
Fix serializer/translations/validator resources loading for bundles overriding getPath()
2017-01-04 11:50:28 -08:00
Robin Chalas
fef3146b3b
Fix serializer/translations/validator resources loading for bundles overriding getPath()
2017-01-04 20:27:15 +01:00
Patrick Dawkins
6afb0afa24
[Console] Fix return type in Terminal docblocks
2017-01-04 17:48:15 +00:00
Fabien Potencier
df38318303
feature #21075 [Console] Show hidden commands in json & xml descriptors (ogizanagi)
...
This PR was merged into the 3.3-dev branch.
Discussion
----------
[Console] Show hidden commands in json & xml descriptors
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | no (may be considered, but as hidden commands did not exist before 3.2, looks more like a behavior change, hence a feature)
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/20866#issuecomment-266678895
| License | MIT
| Doc PR | N/A
Commits
-------
b6cf240ab5
[Console] Show hidden commands in json & xml descriptors
2017-01-04 06:29:21 -08:00
Fabien Potencier
ed5eb6df7d
feature #21129 [FrameworkBundle] Display original definition for aliases in debug:container (chalasr)
...
This PR was merged into the 3.3-dev branch.
Discussion
----------
[FrameworkBundle] Display original definition for aliases in debug:container
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #20954
| License | MIT
| Doc PR | n/a
Before
![before-txt](http://image.prntscr.com/image/b0cb59f23ddb43669ba0aba093f454af.png )
After
![after-txt](http://image.prntscr.com/image/adf234957acf444292e45bded8efb9d8.png )
<details>
<summary>XML output</summary>
Before
![before-xml](http://image.prntscr.com/image/66212d92db654f88b8196b211046bcf2.png )
After
![after-xml](http://image.prntscr.com/image/3f6b5f9f1ea54a31aea36de5928b6ae9.png )
</details>
<details>
<summary>JSON output</summary>
Before
![before-json](http://image.prntscr.com/image/a7ffc4bcda61486f90af85c90e3d6caa.png )
After
![after-json](http://image.prntscr.com/image/15d0f37e78354dcf8e3015b94fcbdaed.png )
</details>
<details>
<summary>Markdown output</summary>
Before
![before-md](http://image.prntscr.com/image/be5289840ac64a5e80f11748f481686c.png )
After
![after-md](http://image.prntscr.com/image/cba4217863f647e9974e1715812eda01.png )
</details>
Commits
-------
cd4b15e605
[FrameworkBundle] Display original definition for aliases in debug:container
2017-01-04 05:25:52 -08:00
Robin Chalas
cd4b15e605
[FrameworkBundle] Display original definition for aliases in debug:container
2017-01-04 14:20:26 +01:00
Iltar van der Berg
ba005438f9
No fallback to REQUEST_TIME in TimeDataCollector
2017-01-04 11:32:26 +01:00
Nicolas Grekas
601648e0e8
feature #21108 [Cache] Add DSN, createClient & better error reporting to MemcachedAdapter (nicolas-grekas, robfrawley)
...
This PR was merged into the 3.3-dev branch.
Discussion
----------
[Cache] Add DSN, createClient & better error reporting to MemcachedAdapter
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | symfony/symfony-docs#7265
Replaces #20863
ping @robfrawley: would you mind opening a doc PR for this?
Commits
-------
87030b4
[cache] Add tests for MemcachedAdapter::createClient()
e109438
[Cache] Add DSN, createClient & better error reporting to MemcachedAdapter
2017-01-04 07:51:37 +01:00
Maxime Steinhausser
b282076d8a
[Profiler][VarDumper] Fix minor color issue & duplicated selector
2017-01-03 20:31:24 +01:00
Nicolas Grekas
142afa359e
bug #20995 [DependencyInjection] Fix the priority order of compiler pass trait (francoispluchino)
...
This PR was merged into the 3.2 branch.
Discussion
----------
[DependencyInjection] Fix the priority order of compiler pass trait
| Q | A
| ------------- | ---
| Branch? | 3.2
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #20332 , #20993
| License | MIT
| Doc PR | ~
A regression has appeared between the version `3.1` and `3.2` on the compilation passes using a priority option (see #20332 ).
Indeed, the order is no longer preserved for service definitions with the same priority. This is caused by the `SplPriorityQueue` class that does not have a FIFO implementation (see this [comment](https://github.com/symfony/symfony/issues/20332#issuecomment-268096527 )).
The PR #20993 fixes the problem but only for Forms, not for all compiler passes using the `PriorityTaggedServiceTrait` trait since `3.2`.
Commits
-------
aac9a7e
Fix the priority order of compiler pass trait
2017-01-03 18:12:19 +01:00
Nicolas Grekas
b655e6009b
Merge branch '3.2'
...
* 3.2:
Fix hhvm & tty tests
2017-01-03 17:40:32 +01:00
Nicolas Grekas
1e39b99c7f
Merge branch '3.1' into 3.2
...
* 3.1:
Fix hhvm & tty tests
2017-01-03 17:40:20 +01:00
Nicolas Grekas
1563b4242b
Merge branch '2.8' into 3.1
...
* 2.8:
Fix hhvm & tty tests
2017-01-03 17:39:53 +01:00
Nicolas Grekas
1fc445a5e9
Merge branch '2.7' into 2.8
...
* 2.7:
Fix hhvm & tty tests
2017-01-03 17:39:35 +01:00
Nicolas Grekas
d294051fe8
Fix hhvm & tty tests
2017-01-03 17:38:07 +01:00
Rob Frawley 2nd
87030b43ca
[cache] Add tests for MemcachedAdapter::createClient()
2017-01-03 17:10:30 +01:00
Nicolas Grekas
1a1d6a5abe
Merge branch '3.2'
...
* 3.2:
Minor fixes found while ugrading the CI
2017-01-03 16:52:54 +01:00
Nicolas Grekas
42d17b13a4
Merge branch '3.1' into 3.2
...
* 3.1:
Minor fixes found while ugrading the CI
2017-01-03 16:52:33 +01:00
Nicolas Grekas
de02095c92
Merge branch '2.8' into 3.1
...
* 2.8:
Minor fixes found while ugrading the CI
2017-01-03 16:52:17 +01:00
Nicolas Grekas
3569531e60
Merge branch '2.7' into 2.8
...
* 2.7:
Minor fixes found while ugrading the CI
2017-01-03 16:50:41 +01:00
Nicolas Grekas
0b9fc83ae7
minor #21150 Minor fixes found while ugrading the CI (nicolas-grekas)
...
This PR was merged into the 2.7 branch.
Discussion
----------
Minor fixes found while ugrading the CI
| 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 | -
Commits
-------
aae4f6d
Minor fixes found while ugrading the CI
2017-01-03 16:50:21 +01:00
Nicolas Grekas
aae4f6d9e7
Minor fixes found while ugrading the CI
2017-01-03 16:43:07 +01:00
Fabien Potencier
c423b163e6
bug #21136 [Security] use authenticated token for json authentication (fbourigault)
...
This PR was merged into the 3.3-dev branch.
Discussion
----------
[Security] use authenticated token for json authentication
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #21123
| License | MIT
| Doc PR | N/A
When using `UsernamePasswordJsonAuthenticationListener` with [LexikJWTAuthenticationBundle](https://github.com/lexik/LexikJWTAuthenticationBundle ), we get a type exception
> Type error: Argument 1 passed to Lexik\Bundle\JWTAuthenticationBundle\Security\Http\Authentication\AuthenticationSuccessHandler::handleAuthenticationSuccess() must implement interface Symfony\Component\Security\Core\User\UserInterface, string given, called in .../vendor/lexik/jwt-authentication-bundle/Security/Http/Authentication/AuthenticationSuccessHandler.php on line 47
This error occurs because the `UsernamePasswordJsonAuthenticationListener` send to the authentication success handler the token which have the user as a string and not the authenticated one that have a UserInterface as user.
Commits
-------
208c617716
use authenticated token for json authentication
2017-01-03 05:53:24 -08:00
Nicolas Grekas
6dd45a51cf
Merge branch '3.2'
...
* 3.2:
[appveyor] Update phpunit-bridge cache-id
handle empty lines inside unindented collection
2017-01-03 14:51:44 +01:00
Nicolas Grekas
cfd3262b81
Merge branch '3.1' into 3.2
...
* 3.1:
[appveyor] Update phpunit-bridge cache-id
handle empty lines inside unindented collection
2017-01-03 14:51:32 +01:00
Nicolas Grekas
0f21c853e9
Merge branch '2.8' into 3.1
...
* 2.8:
[appveyor] Update phpunit-bridge cache-id
handle empty lines inside unindented collection
2017-01-03 14:51:21 +01:00
Nicolas Grekas
eced0dad35
Merge branch '2.7' into 2.8
...
* 2.7:
[appveyor] Update phpunit-bridge cache-id
handle empty lines inside unindented collection
2017-01-03 14:49:52 +01:00
Nicolas Grekas
5044c9875c
[appveyor] Update phpunit-bridge cache-id
2017-01-03 14:47:36 +01:00
Fabien Potencier
942e0c1706
bug #21084 [Yaml] handle empty lines inside unindented collection (xabbuh)
...
This PR was merged into the 2.7 branch.
Discussion
----------
[Yaml] handle empty lines inside unindented collection
| Q | A
| ------------- | ---
| Branch? | 2.7
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #21005
| License | MIT
| Doc PR |
Commits
-------
bbfe6f73b5
handle empty lines inside unindented collection
2017-01-03 05:44:39 -08:00
Nicolas Grekas
a9037a65be
Merge branch '3.2'
...
* 3.2:
[PhpUnitBrige] Fix current failures
2017-01-03 14:44:13 +01:00
Nicolas Grekas
03d5567602
minor #21149 [PhpUnitBrige] Fix current failures (nicolas-grekas)
...
This PR was merged into the 3.2 branch.
Discussion
----------
[PhpUnitBrige] Fix current failures
| 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 | -
Commits
-------
73df9cd
[PhpUnitBrige] Fix current failures
2017-01-03 14:43:49 +01:00
Nicolas Grekas
73df9cd423
[PhpUnitBrige] Fix current failures
2017-01-03 14:42:10 +01:00
Nicolas Grekas
c2a0bcfb65
Merge branch '3.2'
...
* 3.2:
[ci] Update travis/appveyor
[HttpFoundation] Validate/cast cookie expire time
2017-01-03 12:31:33 +01:00
Nicolas Grekas
fcf8b334ec
Merge branch '3.1' into 3.2
...
* 3.1:
[ci] Update travis/appveyor
[HttpFoundation] Validate/cast cookie expire time
2017-01-03 12:28:32 +01:00
Nicolas Grekas
e3e1cce863
Merge branch '2.8' into 3.1
...
* 2.8:
[ci] Update travis/appveyor
[HttpFoundation] Validate/cast cookie expire time
2017-01-03 12:28:18 +01:00
Nicolas Grekas
41539cf165
Merge branch '2.7' into 2.8
...
* 2.7:
[ci] Update travis/appveyor
[HttpFoundation] Validate/cast cookie expire time
2017-01-03 12:26:18 +01:00
Nicolas Grekas
5ad1586eab
minor #21146 [ci] Update travis/appveyor (nicolas-grekas)
...
This PR was merged into the 2.7 branch.
Discussion
----------
[ci] Update travis/appveyor
| 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 | -
Account for latest changes in simple-phpunit + update to PhpUnit 5.7.
Commits
-------
32b8d98
[ci] Update travis/appveyor
2017-01-03 12:25:55 +01:00
Nicolas Grekas
32b8d98bed
[ci] Update travis/appveyor
2017-01-03 12:24:35 +01:00
Nicolas Grekas
0c5afe4393
Merge branch '3.2'
...
* 3.2:
[PhpUnitBridge] Fix HHVM compat with putenv()
2017-01-03 12:23:25 +01:00
Nicolas Grekas
c29f89515d
minor #21148 [PhpUnitBridge] Fix HHVM compat with putenv() (nicolas-grekas)
...
This PR was merged into the 3.2 branch.
Discussion
----------
[PhpUnitBridge] Fix HHVM compat with putenv()
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
On HHVM, `putenv()` is ignored by `passthru()` & co., but works with `proc_open()`.
Commits
-------
d4553c5
[PhpUnitBridge] Fix HHVM compat with putenv()
2017-01-03 12:23:10 +01:00