Commit Graph

19647 Commits

Author SHA1 Message Date
Nicolas Grekas
9e7b10915b minor #13722 [VarDumper] Ignore /vendor/ directory in git (lyrixx)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Ignore /vendor/ directory in git

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

Commits
-------

cbec76c [VarDumper] Ignore /vendor/ directory in git
2015-02-17 21:47:41 +01:00
Grégoire Pineau
cbec76c099 [VarDumper] Ignore /vendor/ directory in git 2015-02-17 17:54:47 +01:00
Fabien Potencier
69f901fd89 minor #13718 Small syntax fix in CHANGELOG (WouterJ)
This PR was merged into the 2.6 branch.

Discussion
----------

Small syntax fix in CHANGELOG

Markdown list items have to start with a space (both render correctly, but this is the standard and consistent with the rest of the file).

| Q | A
| --- | ---
| Fixed tickets | -
| License | MIT

Commits
-------

e45d514 Small syntax fix
2015-02-17 17:18:28 +01:00
Wouter J
e45d514bfc Small syntax fix 2015-02-17 14:25:32 +01:00
Fabien Potencier
42e6540224 bug #13693 [HttpKernel] Fixed DumpDataCollector: dump.name for Windows file paths (King2500)
This PR was merged into the 2.6 branch.

Discussion
----------

[HttpKernel] Fixed DumpDataCollector: dump.name for Windows file paths

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

When using VarDumper on Windows files, the automatic "dump.name" generated wrong names.
`dump()` call in:

```
F:\HtDocs\demo\src\Acme\Controller\DemoController.php
```

Displayed:
```
dump()
in :\HtDocs\demo\src\Acme\Controller\DemoController.php line 35
```
Expected result is:
```
dump()
in DemoController.php line 35
```

The existing code in line 118 didn't use the variable from the previous line.

Commits
-------

a025dea Fix dump.name for Windows file paths
2015-02-17 09:22:34 +01:00
Fabien Potencier
ce009624aa minor #13684 Fixes event listener attaching error (bartru)
This PR was merged into the 2.6 branch.

Discussion
----------

Fixes event listener attaching error

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

Commits
-------

34b489d Fixes event listener attaching error
2015-02-16 10:22:28 +01:00
Fabien Potencier
fd0fd31ac3 minor #13688 [WebProfilerBundle] fix html lint on (other) empty onclick (jrobeson)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle] fix html lint on (other) empty onclick

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

*This is for the empty onclick that appeared in 2.6*

The request collector has an empty onclick="" attribute
when {{ link }} isn't available. This tends to happen when
rendering the debug toolbar.

Commits
-------

58bd16c [WebProfilerBundle] fix html lint on (other) empty onclick
2015-02-16 10:15:54 +01:00
Fabien Potencier
e09c3cd52c bug #13685 [WebProfilerBundle] Fix for broken profiler layout (kbond)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle] Fix for broken profiler layout

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

With the latest 2.6 the profiler layout is broken:

![screen](https://cloud.githubusercontent.com/assets/127811/6192633/17f7f192-b382-11e4-90c9-2595fd6079af.png)

I am not sure what broke it...

Commits
-------

af0ea97 Fix for broken profiler layout
2015-02-16 10:11:35 +01:00
Thomas Schulz
a025dea06e Fix dump.name for Windows file paths
Wrong variables were used in line 118 ($file -> $name)
2015-02-14 23:44:52 +01:00
Johnny Robeson
58bd16c3d3 [WebProfilerBundle] fix html lint on (other) empty onclick
*This is for the empty onclick that appeared in 2.6*

The request collector has an empty onclick="" attribute
when {{ link }} isn't available. This tends to happen when
rendering the debug toolbar.
2015-02-14 04:26:22 -05:00
Kevin Bond
af0ea978ea Fix for broken profiler layout 2015-02-13 13:11:44 -05:00
Bart Ruysseveldt
34b489d01e Fixes event listener attaching error
| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes]
| Fixed tickets | [none]
| License       | MIT
| Doc PR        | [none]
2015-02-13 16:25:52 +01:00
Fabien Potencier
2cca8617b9 fixed a test 2015-02-12 12:03:23 +01:00
Fabien Potencier
7356876c33 bug #13636 [WebProfilerBundle] Fixes event listener attaching error in IE (aik099)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle] Fixes event listener attaching error in IE

I haven't tested the change, because I don't any working Symfony installation at hand. By the looks of changes it should work.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | not sure (do we have JS tests?)
| Fixed tickets | #13447
| License       | MIT
| Doc PR        |

Commits
-------

21693e4 [WebProfilerBundle] Fixes event listener attaching error in IE
2015-02-11 11:38:49 +01:00
Fabien Potencier
38f03bd2f5 Merge branch '2.3' into 2.6
* 2.3:
  [FrameworkBundle] Fix title and placeholder rendering in php form templates.
  RequestDataCollector - small fix
  renamed composer.phar to composer to be consistent with the Symfony docs
  [FrameworkBundle] bumped min version of Routing to 2.3
  removed composer --dev option everywhere
  fixed a test
  [Console] Fixed output bug, if escaped string in a formatted string.
  [Security] Remove ContextListener's onKernelResponse listener as it is used
  Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)"
  Revert "fixed assertion"
  fixed assertion
  [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value
  fixed URL
  Add reference to documentation in FormEvents phpdocs
  [YAML] Fix one-liners to work with multiple new lines
  Keep "pre" meaning for var_dump quick-and-dirty debug
  [Console][Table] Fix cell padding with multi-byte

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Console/Helper/TableHelper.php
2015-02-11 08:12:14 +01:00
Fabien Potencier
917067e940 bug #13647 [FrameworkBundle] Fix title and placeholder rendering in php form templates (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix title and placeholder rendering in php form templates

Small fix for rendering placeholder on widgets in php templates.

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

This is a test case for #13290, including a fix applied on 2.3, since that's the earliest supported branch the bug exist.

In 2.6 the template is a bit different, and unfortunately I couldn't re-use #13290's fix.

When this is merged into 2.3, and then to 2.6 I think we can also merge #13290.

Commits
-------

f82193d [FrameworkBundle] Fix title and placeholder rendering in php form templates.
2015-02-11 08:05:50 +01:00
Jakub Zalas
f82193db99 [FrameworkBundle] Fix title and placeholder rendering in php form templates. 2015-02-10 17:14:04 +00:00
Alexander Obuhovich
21693e4571 [WebProfilerBundle] Fixes event listener attaching error in IE 2015-02-10 18:33:07 +02:00
Fabien Potencier
d0c1c534b2 minor #13638 [TwigBridge] Removed duplicated code from TwigRenderer (hason)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #13638).

Discussion
----------

[TwigBridge] Removed duplicated code from TwigRenderer

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

See https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Form/FormRenderer.php#L65-L69

Commits
-------

1a9aca7 [TwigBridge] Removed duplicated code from TwigRenderer
2015-02-10 17:22:44 +01:00
Martin Hasoň
1a9aca7152 [TwigBridge] Removed duplicated code from TwigRenderer 2015-02-10 17:22:35 +01:00
Fabien Potencier
8b12bf967a bug #13608 Fix form icon position in web profiler (sadikoff)
This PR was merged into the 2.6 branch.

Discussion
----------

Fix form icon position in web profiler

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

Form icon in web profiler toolbar moved to the left edge
![pe64g11](https://cloud.githubusercontent.com/assets/213810/6077805/4523c5ba-adfb-11e4-9e8c-61c4940cd7c1.png)

This fix changes icon position to its default value.

Commits
-------

b128439 Fix form icon position in web profiler
2015-02-10 17:18:48 +01:00
Fabien Potencier
85c7195ad7 bug #13642 [Translator][Logging] implement TranslatorBagInterface. (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[Translator][Logging] implement TranslatorBagInterface.

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

Commits
-------

dcb2306 [Translator][Logging] implement TranslatorBagInterface.
2015-02-10 15:54:53 +01:00
Abdellatif Ait boudad
dcb2306d03 [Translator][Logging] implement TranslatorBagInterface. 2015-02-10 13:48:21 +00:00
Fabien Potencier
9a70bbbdb2 minor #13624 removed composer --dev option everywhere (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

removed composer --dev option everywhere

| 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

Commits
-------

0fe4913 renamed composer.phar to composer to be consistent with the Symfony docs
af59316 removed composer --dev option everywhere
2015-02-10 09:04:11 +01:00
Fabien Potencier
ce95fa8fb3 minor #13629 RequestDataCollector - small fix (ovr)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #13629).

Discussion
----------

RequestDataCollector - small fix

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

Commits
-------

7ed48db RequestDataCollector - small fix
2015-02-09 20:53:11 +01:00
Дмитрий Пацура
7ed48db94c RequestDataCollector - small fix 2015-02-09 20:53:11 +01:00
Fabien Potencier
0fe4913079 renamed composer.phar to composer to be consistent with the Symfony docs 2015-02-08 08:41:14 +01:00
Fabien Potencier
bfa181bd65 [FrameworkBundle] bumped min version of Routing to 2.3 2015-02-08 08:36:25 +01:00
Fabien Potencier
af59316536 removed composer --dev option everywhere 2015-02-08 08:33:54 +01:00
Fabien Potencier
004e5abbd6 fixed a test 2015-02-08 08:28:06 +01:00
Fabien Potencier
a43a58ccff bug #13607 [Console] Fixed output bug, if escaped string in a formatted string. (tronsha)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13607).

Discussion
----------

[Console] Fixed output bug, if escaped string in a formatted string.

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

If there is a escaped tag in a formatted string, the output wasn't correct.

I have add a test for this problem and integrated a solution for this.

Commits
-------

1c62eb7 [Console] Fixed output bug, if escaped string in a formatted string.
2015-02-08 08:25:55 +01:00
Stefan Hüsges
1c62eb77e0 [Console] Fixed output bug, if escaped string in a formatted string. 2015-02-08 08:25:54 +01:00
Fabien Potencier
8b10043dad bug #13611 [Console] “console help” ignores --raw option (c960657)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #13611).

Discussion
----------

[Console] “console help” ignores --raw option

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

The option for DescriptorHelper::describe() is `raw_text`, not `raw`.

Commits
-------

eabc5d8 “console help” ignores --raw option
2015-02-08 08:19:48 +01:00
Christian Schmidt
eabc5d8e92 “console help” ignores --raw option 2015-02-08 08:19:48 +01:00
Vladimir Sadicov
b12843971c Fix form icon position in web profiler 2015-02-06 12:24:56 +02:00
Fabien Potencier
d9c0c55ace bug #13466 [Security] Remove ContextListener's onKernelResponse listener as it is used (davedevelopment)
This PR was squashed before being merged into the 2.3 branch (closes #13466).

Discussion
----------

[Security] Remove ContextListener's onKernelResponse listener as it is used

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

The context listeners are specific to a particular firewall, and as such, should not be applied if the current request doesn't match that context listener. To avoid this, the context listener can remove itself from the dispatcher as it is called.

This comes in to affect when two or more firewalls are setup and using the same kernel for multiple requests.  Assuming there are two firewalls 'site' and 'admin'

- Request comes in matching 'site' firewall, 'site' ContextListener adds it's onKernelResponse method to the dispatcher
- Succesful auth for 'site'
- ContextListener writes token to session
- Request comes in matching 'admin' firewall, 'admin' ContextListener can't find anything in the session, so nulls the token in the security context
- 'site' ContextListener listens for response, can't find a token in the security context so removes the 'site' token from the session

Commits
-------

380d805 [Security] Remove ContextListener's onKernelResponse listener as it is used
2015-02-05 11:02:25 +01:00
Dave Marshall
380d8052ac [Security] Remove ContextListener's onKernelResponse listener as it is used 2015-02-05 11:01:10 +01:00
Fabien Potencier
58fcb8d515 Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)"
This reverts commit 09225c7466, reversing
changes made to a0298331ad.
2015-02-05 10:45:43 +01:00
Fabien Potencier
6e9768c8b9 Revert "fixed assertion"
This reverts commit b0a4c38465.
2015-02-05 10:45:38 +01:00
Fabien Potencier
b0a4c38465 fixed assertion 2015-02-05 10:43:13 +01:00
Fabien Potencier
09225c7466 minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #12652).

Discussion
----------

[HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value

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

Implementing test for issue #9942 to confirm that the bug is already fixed. It's possibile to close the issue.

Thanks also to @baiolo, @andyroid1978 for contributions at HackDay of the SymfonyConf

Commits
-------

0b9f310 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value
2015-02-05 10:42:23 +01:00
Mauro Foti
0b9f310055 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value 2015-02-05 10:42:22 +01:00
Fabien Potencier
a0298331ad fixed URL 2015-02-05 10:28:56 +01:00
Fabien Potencier
c5b50f28f5 minor #12626 Add reference to documentation in FormEvents phpdocs (ifdattic)
This PR was squashed before being merged into the 2.3 branch (closes #12626).

Discussion
----------

Add reference to documentation in FormEvents phpdocs

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

Commits
-------

2b33ba6 Add reference to documentation in FormEvents phpdocs
2015-02-05 10:26:57 +01:00
Andrew M
2b33ba618c Add reference to documentation in FormEvents phpdocs 2015-02-05 10:26:27 +01:00
Fabien Potencier
e73c5546a9 Merge branch '2.5' into 2.6
* 2.5:
  [FrameworkBundle] fixed tests
2015-02-05 09:35:03 +01:00
Fabien Potencier
7126c8d5d2 [FrameworkBundle] fixed tests 2015-02-05 09:31:48 +01:00
Fabien Potencier
bc75c36e03 bug #12864 [Console][Table] Fix cell padding with multi-byte (ttsuruoka)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console][Table] Fix cell padding with multi-byte

| 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

When the `TableHelper` dealing with East Asian text, it renders wrong widths. This fixes that problem.

Commits
-------

11014c2 [Console][Table] Fix cell padding with multi-byte
2015-02-05 09:10:27 +01:00
Fabien Potencier
25294ce09b bug #13201 [FrameworkBundle][config cmd] initialize extension. (aitboudad)
This PR was submitted for the 2.5 branch but it was merged into the 2.6 branch instead (closes #13201).

Discussion
----------

[FrameworkBundle][config cmd] initialize extension.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Fixed tickets  | #13196, #11037
| Tests pass?   | yes
| License       | MIT

Commits
-------

d6ec874 [FrameworkBundle][config cmd] initialize extension.
2015-02-05 08:26:17 +01:00
Abdellatif Ait boudad
d6ec874441 [FrameworkBundle][config cmd] initialize extension. 2015-02-05 08:26:16 +01:00