Commit Graph

16174 Commits

Author SHA1 Message Date
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
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
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
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
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
Дмитрий Пацура
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
Stefan Hüsges
1c62eb77e0 [Console] Fixed output bug, if escaped string in a formatted string. 2015-02-08 08:25:54 +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
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
Abdellatif Ait boudad
d6ec874441 [FrameworkBundle][config cmd] initialize extension. 2015-02-05 08:26:16 +01:00
Alex Pott
4d22bf7f72 [YAML] Fix one-liners to work with multiple new lines 2015-02-05 08:14:20 +01:00
Fabien Potencier
b97e5437c7 minor #13495 [FrameworkBundle] Keep "pre" meaning for var_dump quick-and-dirty debug (giosh94mhz)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Keep "pre" meaning for var_dump quick-and-dirty debug

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

This is a minor fix to have a quick-and-dirty var_dump nicely work with the exception output from Symfony.
In short, the default "pre" whitespace CSS rules should be kept outside of block "#content", so that var_dump output is not diplayed in a single huge line.

Commits
-------

b6d4390 Keep "pre" meaning for var_dump quick-and-dirty debug
2015-02-05 08:04:52 +01:00
Fabien Potencier
2f6d5e4a8d Merge branch '2.5' into 2.6
* 2.5:
  fixxed order of usage
  [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
  [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
  [Validator] Remove unnecessary include in tests
  [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
  fixed typo
  [Validator] fix DOS-style line endings
  bumped Symfony version to 2.5.11
  updated VERSION for 2.5.10
  updated CHANGELOG for 2.5.10
  [Validator] Add a Russian translation for invalid charset message
  [2.3] [Validator] spanish translation for invalid charset message
  [Routing] make host matching case-insensitive according to RFC 3986

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Tests/Fixtures/application_1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
2015-02-05 07:36:51 +01:00
Fabien Potencier
f7a1adbce7 Merge branch '2.3' into 2.5
* 2.3:
  fixxed order of usage
  [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
  [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
  [Validator] Remove unnecessary include in tests
  [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
  fixed typo
  [Validator] fix DOS-style line endings
  [Validator] Add a Russian translation for invalid charset message
  [2.3] [Validator] spanish translation for invalid charset message
  [Routing] make host matching case-insensitive according to RFC 3986

Conflicts:
	src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
	src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
2015-02-05 07:31:40 +01:00
Oskar Stark
d44ff2a135 fixxed order of usage 2015-02-05 07:29:49 +01:00
Javier Spagnoletti
c2aeeeb042 [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none
2015-02-05 07:23:00 +01:00
Fabien Potencier
82c4edaeb6 bug #13577 [HttpKernel] Added use of instantiateController method provided in (#12022) (stavichenko)
This PR was merged into the 2.6 branch.

Discussion
----------

[HttpKernel] Added use of instantiateController method provided in (#12022)

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

Commits
-------

aa6538a [HttpKernel] Added use of provided by #12022 method to instantiate controller class in bundle's controller resolver
2015-02-05 07:19:58 +01:00
Fabien Potencier
2e7434102a bug #13567 [Routing] make host matching case-insensitive (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] make host matching case-insensitive

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

Ignore case in host which means:
- When generating URLs we leave the case in the host as specified.
- When matching we always return lower-cased versions of parameters (because of https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Routing/RequestContext.php#L190 ) in the host. This is also what browers do. They lowercase the host before sending the request, i.e. WWW.eXample.org is sent as www.example.org. But when using curl for example it sends the host as-is. So the HttpFoundation Request class can actually have a non-lowercased host because it doesn't have this normalization.

Commits
-------

952388c [Routing] make host matching case-insensitive according to RFC 3986
2015-02-05 07:17:31 +01:00
Fabien Potencier
051402e888 minor #13446 [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again (ymc-dabe)
This PR was squashed before being merged into the 2.3 branch (closes #13446).

Discussion
----------

[Process] Make test AbstractProcessTest::testStartAfterATimeout useful again

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

The test AbstractProcessTest::testStartAfterATimeout() is pretty useless, due to two reasons:

1. Any exception is caught
This means even the exception thrown with
<code>$this->fail('A RuntimeException should have been raised.');</code>
is caught, making the test pretty useless.

2. Invalid PHP code gets executed
The command that is executed in the tests actually is:
<code># php -r "$n = 1000; while ($n--) {echo ''; usleep(1000); }"</code>
.
This does not wait ~1s, but produces the following error:
<code>PHP Parse error:  syntax error, unexpected '=' in Command line code on line 1</code>

Commits
-------

1be266f [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
2015-02-04 15:30:31 +01:00
Daniel Beyer
1be266fea0 [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again 2015-02-04 15:30:30 +01:00
Fabien Potencier
6f128039a8 removed non-sense example 2015-02-04 15:27:24 +01:00
Adrian Philipp
7dbf61515b Fixes small typo. 2015-02-04 15:20:07 +01:00