Commit Graph

20280 Commits

Author SHA1 Message Date
Fabien Potencier
1c4c0435b4 Merge branch '2.3' into 2.6
* 2.3:
  Improve the config validation in TwigBundle
  [Security][Acl] enforce string identifiers
  [BrowserKit] Fix bug when uri starts with http.
  bumped Symfony version to 2.3.31
  updated VERSION for 2.3.30
  updated CHANGELOG for 2.3.30
  Php Inspections (EA Extended):     - resolved possible PHP Fatal in \Symfony\Component\BrowserKit\Cookie::__toString     -resolved implicit magic methods calls     -resolved callable name case mismatches

Conflicts:
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-06-04 22:11:39 +02:00
Fabien Potencier
5c7cb563db bug #14859 Improve the config validation in TwigBundle (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Improve the config validation in TwigBundle

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

This ensures we have better error messages in case of misconfiguration instead of having crappy errors from Twig (which does not validates its options fully either, missing these things)

Commits
-------

f4dfee3 Improve the config validation in TwigBundle
2015-06-04 15:38:55 +02:00
Christophe Coevoet
f4dfee3bea Improve the config validation in TwigBundle 2015-06-04 12:52:47 +02:00
Fabien Potencier
5607f71079 bug #14785 [BrowserKit] Fix bug when uri starts with http. (amouhzi)
This PR was merged into the 2.3 branch.

Discussion
----------

[BrowserKit] Fix bug when uri starts with http.

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

Commits
-------

6d3ec63 [BrowserKit] Fix bug when uri starts with http.
2015-06-01 17:27:09 +02:00
Fabien Potencier
013009b6c8 minor #14474 [2.3] Static Code Analysis for Components (kalessil)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Static Code Analysis for Components

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

Static Code Analysis with Php Inspections (EA Extended), no functional changes:
- resolved possible PHP Fatal in \Symfony\Component\BrowserKit\Cookie::__toString
- resolved callable name case mismatches

Commits
-------

9eb2b14 Php Inspections (EA Extended):     - resolved possible PHP Fatal in \Symfony\Component\BrowserKit\Cookie::__toString     -resolved implicit magic methods calls     -resolved callable name case mismatches
2015-06-01 17:18:16 +02:00
Fabien Potencier
8172f2fecb bug #14807 [Security][Acl] enforce string identifiers (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security][Acl] enforce string identifiers

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

Commits
-------

bbb1064 [Security][Acl] enforce string identifiers
2015-06-01 17:07:46 +02:00
Fabien Potencier
418b28b464 bug #14808 [WebProfilerBundle][logger] added missing deprecation message. (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle][logger] added missing deprecation message.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Fixed tickets  | https://github.com/symfony/symfony/pull/14696#issuecomment-105710882
| Tests pass?   | yes
| License       | MIT

before:

![selection_012](https://cloud.githubusercontent.com/assets/1753742/7902598/068acae4-07ae-11e5-824e-12146548209e.jpg)

after:

![selection_011](https://cloud.githubusercontent.com/assets/1753742/7902599/0e7cf29a-07ae-11e5-80bd-42958df9d76b.jpg)

Commits
-------

3061ace [WebProfilerBundle][logger] added missing deprecation message.
2015-06-01 17:00:21 +02:00
Abdellatif Ait boudad
3061ace2bf [WebProfilerBundle][logger] added missing deprecation message. 2015-06-01 09:10:59 +00:00
Christian Flothmann
bbb1064c99 [Security][Acl] enforce string identifiers 2015-05-31 17:00:49 +02:00
Hassan Amouhzi
6d3ec633cd [BrowserKit] Fix bug when uri starts with http.
| Q             | A
| ------------- | ---
| Fixed tickets |
| License       | MIT
2015-05-30 22:07:20 +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
cff69aa18b bumped Symfony version to 2.3.31 2015-05-30 00:42:49 +02:00
Fabien Potencier
6dfe5551b7 updated VERSION for 2.3.30 2015-05-30 00:16:04 +02:00
Fabien Potencier
cceb63e6d5 updated CHANGELOG for 2.3.30 2015-05-30 00:15:41 +02:00
Vladimir Reznichenko
9eb2b14115 Php Inspections (EA Extended):
- resolved possible PHP Fatal in \Symfony\Component\BrowserKit\Cookie::__toString
    -resolved implicit magic methods calls
    -resolved callable name case mismatches
2015-05-29 19:14:48 +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
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
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
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
Nicolas Grekas
6b15ab5a4d [DebugBundle] Fix config XSD 2015-05-24 12:31:48 -07:00
ogizanagi
cd70ca8a51 [CS] [Console] StreamOuput : fix loose comparison 2015-05-24 20:51:45 +02:00