Commit Graph

21173 Commits

Author SHA1 Message Date
Fabien Potencier
1dbf67ed66 bug #14793 [FrameworkBundle] make templating.helper.router service available again for BC reasons (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] make `templating.helper.router` service available again for BC reasons

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

Commits
-------

95dcfa2 [FrameworkBundle] make `templating.helper.router` service available again for BC reasons
2015-06-01 17:28:56 +02:00
Fabien Potencier
09515d61ac minor #14813 Fix profiler CSS (blaugueux)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix profiler CSS

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

![translation-profiler](https://cloud.githubusercontent.com/assets/767963/7908422/2fb45984-0845-11e5-962c-34021238a13c.jpg)

Commits
-------

fb9e5bf Fix profiler CSS
2015-06-01 16:58:43 +02:00
Benjamin Laugueux
fb9e5bfc69 Fix profiler CSS 2015-06-01 10:01:07 +02:00
Christian Flothmann
95dcfa2ee6 [FrameworkBundle] make templating.helper.router service available again for BC reasons 2015-05-30 22:40:00 +02:00
Fabien Potencier
7493c2bef5 bumped Symfony version to 2.7.1 2015-05-30 19:16:04 +02:00
Fabien Potencier
9975b1eca3 updated VERSION for 2.7.0 2015-05-30 18:52:28 +02:00
Fabien Potencier
c16e122590 updated CHANGELOG for 2.7.0 2015-05-30 18:52:19 +02:00
Fabien Potencier
e2b74ca429 Merge branch '2.6' into 2.7
* 2.6:
  bumped Symfony version to 2.6.10
  updated VERSION for 2.6.9
  updated CHANGELOG for 2.6.9
  fixed tests
  Avoid using the app global variable in the profiler templates

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2015-05-30 01:30:31 +02:00
Fabien Potencier
390e9b4dc6 bumped Symfony version to 2.6.10 2015-05-30 01:26:13 +02:00
Fabien Potencier
b06539573c updated VERSION for 2.6.9 2015-05-30 00:55:07 +02:00
Fabien Potencier
c6bf554a2f updated CHANGELOG for 2.6.9 2015-05-30 00:55:02 +02:00
Fabien Potencier
b5f7196bf5 fixed tests 2015-05-30 00:53:29 +02:00
Fabien Potencier
d9550362ef minor #14782 Adding UPGRADE-2.7 about small BC break in InputDefinition (weaverryan)
This PR was merged into the 2.7 branch.

Discussion
----------

Adding UPGRADE-2.7 about small BC break in InputDefinition

Hi guys!

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

In #13220, a small BC break was introduced when `InputDefinition::getSynopsis()` was given an optional argument. This, for example, breaks Behat 2.5, which overrides this method. I don't think this was noticed before, and it may be too late (or not worth it) to reverse the BC break.

So, I've at least doc'ed it.

Thanks!

Commits
-------

a7985d2 Fixing phpdoc typo
c35f2c8 Talking about getSynopsis()
2015-05-29 19:13:39 +02:00
Fabien Potencier
2e3040cefe bug #14777 Avoid using the app global variable in the profiler templates (stof)
This PR was merged into the 2.6 branch.

Discussion
----------

Avoid using the app global variable in the profiler templates

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | small one for people overwriting the WebDebugToolbarListener methods
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/silexphp/Silex-WebProfiler/issues/64
| License       | MIT
| Doc PR        | n/a

#14217 introduced a usage of the ``app`` global variables in profiler templates, while we previously removed all such usages to avoid the dependency on TwigBundle in these templates.
This keeps them usable outside the fullstack framework (for instance in Silex).

I had to do a small BC break to be able to pass the request in the place where we were not yet injecting the Request in the template.

Commits
-------

415c79e Avoid using the app global variable in the profiler templates
2015-05-29 18:43:31 +02:00
Ryan Weaver
a7985d244c Fixing phpdoc typo 2015-05-29 12:22:24 -04:00
Ryan Weaver
c35f2c8482 Talking about getSynopsis() 2015-05-29 12:21:38 -04:00
Fabien Potencier
b07eca5453 Merge branch '2.6' into 2.7
* 2.6: (21 commits)
  Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)"
  InvalidResourceException file name
  [Validators] Remove forgotten space in a translation key [nl]
  [Validators] Correct translation key and content [nl]
  bumped Symfony version to 2.6.9
  updated VERSION for 2.6.8
  updated CHANGELOG for 2.6.8
  added missing CVE number
  bumped Symfony version to 2.3.30
  updated VERSION for 2.3.29
  update CONTRIBUTORS for 2.3.29
  updated CHANGELOG for 2.3.29
  [Validators] Missing translations for arabic language.
  Code style
  fixed C
  [HttpKernel][Bundle] Check extension implements ExtensionInterface
  [DebugBundle] Fix config XSD
  [CS] [Console] StreamOuput : fix loose comparison
  [Framework][router commands] fixed failing test.
  [HttpKernel] Do not call the FragmentListener if _controller is already defined
  ...

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
2015-05-29 16:44:44 +02:00
Fabien Potencier
c349cb3528 Merge branch '2.3' into 2.6
* 2.3:
  Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)"
  InvalidResourceException file name
  [Validators] Remove forgotten space in a translation key [nl]
  [Validators] Correct translation key and content [nl]
  added missing CVE number
  bumped Symfony version to 2.3.30
  updated VERSION for 2.3.29
  update CONTRIBUTORS for 2.3.29
  updated CHANGELOG for 2.3.29
  [CS] [Console] StreamOuput : fix loose comparison
  [DependencyInjection] Avoid unnecessary calls to strtolower()

Conflicts:
	src/Symfony/Component/Console/Output/StreamOutput.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-05-29 16:42:58 +02:00
Fabien Potencier
a3ee1c5c09 Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)"
This reverts commit 4d40852596, reversing
changes made to dd2fb850a7.
2015-05-29 16:42:01 +02:00
Christophe Coevoet
415c79e0a6 Avoid using the app global variable in the profiler templates
This keeps them usable outside the fullstack framework (for instance in
Silex).
2015-05-29 10:20:13 +02:00
Fabien Potencier
a78d939da1 minor #14776 Adding notes about deprecated warnings in 2.7 (weaverryan)
This PR was merged into the 2.7 branch.

Discussion
----------

Adding notes about deprecated warnings in 2.7

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

Hi guys!

When I upgraded, my project exploded with deprecated warnings. I'm certain we'll get a lot of questions about these, so I think we should try to get ahead of these questions as much as possible. I'm adding this - if I'm mistaken in anything, please let me know. I also think we should mention this in the release blog post so that people are aware.

I'm about to propose a short docs entry to explain things there too (so that hopefully if someone googles for the issue, they'll find our explanation).

Thanks!

Commits
-------

e374274 Adding notes about deprecated warnings in 2.7
2015-05-29 06:53:58 +02:00
Ryan Weaver
e374274159 Adding notes about deprecated warnings in 2.7 2015-05-28 20:33:45 -04:00
Fabien Potencier
afd0b105a1 minor #14762 InvalidResourceException file name (DancZer)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #14762).

Discussion
----------

InvalidResourceException file name

Added filen ame to the InvalidResourceException,

Commits
-------

2e04e23 InvalidResourceException file name
2015-05-28 22:42:23 +02:00
Ladislav Tánczos
2e04e23c6a InvalidResourceException file name 2015-05-28 22:42:23 +02:00
Fabien Potencier
41adf224b5 minor #14643 [DependencyInjection] Avoid unnecessary calls to strtolower() (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Avoid unnecessary calls to strtolower()

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

Commits
-------

c27f564 [DependencyInjection] Avoid unnecessary calls to strtolower()
2015-05-28 16:28:38 +02:00
Fabien Potencier
a4e126d531 minor #14765 [Validators] Correct translation key and content [nl] (amouhzi)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validators] Correct translation key and content [nl]

The nl file is not up to date. Correct changed translation key.

Commits
-------

5bc4085 [Validators] Correct translation key and content [nl]
2015-05-28 05:26:02 +02:00
Fabien Potencier
fc39317691 minor #14766 [Validators] Remove forgotten space in a translation key [nl] (amouhzi)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validators] Remove forgotten space in a translation key [nl]

The nl file is not up to date. Correct changed translation key.

Commits
-------

51e3c22 [Validators] Remove forgotten space in a translation key [nl]
2015-05-28 05:24:15 +02:00
Hassan Amouhzi
51e3c222d4 [Validators] Remove forgotten space in a translation key [nl] 2015-05-27 23:21:50 +02:00
Hassan Amouhzi
5bc4085e4c [Validators] Correct translation key and content [nl] 2015-05-27 23:11:20 +02:00
Fabien Potencier
86ab2505a9 minor #14742 [CS] [Console] StreamOuput : fix loose comparison (ogizanagi)
This PR was merged into the 2.3 branch.

Discussion
----------

[CS] [Console] StreamOuput : fix loose comparison

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

Commits
-------

cd70ca8 [CS] [Console] StreamOuput : fix loose comparison
2015-05-27 20:33:26 +02:00
Fabien Potencier
31b5e5c5b1 minor #14758 [Serializer] [2.6] Code style (derrabus)
This PR was merged into the 2.6 branch.

Discussion
----------

[Serializer] [2.6] Code style

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

This PR fixes some minor code style issues fabbot discovered while I was working on PR #14756.

Commits
-------

864136a Code style
2015-05-27 20:30:26 +02:00
Fabien Potencier
9f5a6c6b66 bumped Symfony version to 2.6.9 2015-05-27 02:47:03 +02:00
Fabien Potencier
7ae1934082 updated VERSION for 2.6.8 2015-05-27 02:17:10 +02:00
Fabien Potencier
53c60cb825 updated CHANGELOG for 2.6.8 2015-05-27 02:17:02 +02:00
Fabien Potencier
ce2a47abe2 added missing CVE number 2015-05-27 01:41:50 +02:00
Fabien Potencier
a8886615e4 bumped Symfony version to 2.3.30 2015-05-27 01:35:14 +02:00
Fabien Potencier
c4da51ce0f updated VERSION for 2.3.29 2015-05-26 23:55:27 +02:00
Fabien Potencier
da10a3cb20 update CONTRIBUTORS for 2.3.29 2015-05-26 23:46:03 +02:00
Fabien Potencier
a5914d283b updated CHANGELOG for 2.3.29 2015-05-26 23:45:29 +02:00
Nicolas Grekas
662346403b Merge branch '2.3' into 2.6
* 2.3:
  [Validators] Missing translations for arabic language.
  fixed C
  [HttpKernel][Bundle] Check extension implements ExtensionInterface
  [HttpKernel] Do not call the FragmentListener if _controller is already defined
2015-05-26 14:42:28 -07:00
Fabien Potencier
64e9584fae security #14759 n/a (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

n/a

n/a

Commits
-------

d320d27 [HttpKernel] Do not call the FragmentListener if _controller is already defined
2015-05-26 23:41:30 +02:00
Fabien Potencier
ae2d062afc minor #14757 [Validators] Missing translations for arabic language. (amouhzi)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #14757).

Discussion
----------

[Validators] Missing translations for arabic language.

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

This pull request is for adding missing translations in validators.ar.xlf.

Commits
-------

9a26e4b [Validators] Missing translations for arabic language.
2015-05-26 23:24:07 +02:00
Hassan Amouhzi
9a26e4beba [Validators] Missing translations for arabic language. 2015-05-26 23:24:07 +02:00
Alexander M. Turek
864136a739 Code style 2015-05-26 23:19:30 +02:00
Fabien Potencier
2aeaa22e31 bug #14745 [Serializer] AbstractNormalizer::instantiateObject allow default values when not optional (boekkooi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] AbstractNormalizer::instantiateObject allow default values when not optional

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

This PR fixes a bug in the AbstractNormalizer when denormalizing a array with a missing value but a default value set in the class constructor.

Commits
-------

266d53e [Serializer] AbstractNormalizer::instantiateObject allow default values when not optional
2015-05-25 09:45:54 +02:00
Fabien Potencier
36dfdaf3db fixed C 2015-05-25 09:43:48 +02:00
Fabien Potencier
51b3b83270 minor #14735 [HttpKernel][Bundle] Check extension implements ExtensionInterface (taueres)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #14735).

Discussion
----------

[HttpKernel][Bundle] Check extension implements ExtensionInterface

- Avoid fatal errors on line 89 (calling getAlias on objects of
  unknown type).
- Help developers solve problems with their extensions

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

Commits
-------

b6e0a92 [HttpKernel][Bundle] Check extension implements ExtensionInterface
2015-05-25 09:42:57 +02:00
Sergio Santoro
b6e0a9246d [HttpKernel][Bundle] Check extension implements ExtensionInterface
- Avoid fatal errors on line 89 (calling getAlias on objects of
  unknown type).
- Help developers solve problems with their extensions
2015-05-25 09:42:57 +02:00
Fabien Potencier
504548ec6c bug #14743 [DebugBundle] Fix config XSD (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[DebugBundle] Fix config XSD

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

Commits
-------

6b15ab5 [DebugBundle] Fix config XSD
2015-05-25 09:38:05 +02:00
Fabien Potencier
c563bbc2e4 bug #14711 [Serializer] AbstractNormalizer instantiateObject avoid null rejection (boekkooi)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #14711).

Discussion
----------

[Serializer] AbstractNormalizer instantiateObject avoid `null` rejection

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

This PR fixes a bug in the AbstractNormalizer when denormalizing a array with a null argument.

Commits
-------

d546080 [Serializer] AbstractNormalizer::instantiateObject avoid `null` rejection
2015-05-25 09:37:02 +02:00