Commit Graph

20114 Commits

Author SHA1 Message Date
Fabien Potencier
f74a1f2dc3 renamed asset_path() to asset() and added a BC layer 2015-02-10 13:45:46 +01:00
Fabien Potencier
4d0adeae16 [Asset] added a NullContext class 2015-02-10 13:45:00 +01:00
Fabien Potencier
d33c41d436 [Asset] added the component 2015-02-10 13:45:00 +01: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
ac389b6714 feature #11379 Added new Forwarded header support for Request::getClientIps (tony-co)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #11379).

Discussion
----------

Added new Forwarded header support for Request::getClientIps

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

Commits
-------

4c8a25a Added new Forwarded header support for Request::getClientIps
2015-02-08 08:21:15 +01:00
Tony Cosentino
4c8a25a6e2 Added new Forwarded header support for Request::getClientIps 2015-02-08 08:21:15 +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
Fabien Potencier
51a8b11ecd bug #13606 [Form][DoctrineBridge] Optimize EntityType by only loading choices for values restricted by values (guilhermeblanco)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form][DoctrineBridge] Optimize EntityType by only loading choices for values restricted by values

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

Optimize EntityType by only loading choices for values in the same way that EntityLoader customization does (if you provide a query_builder).

Commits
-------

2185883 Optimize EntityType by only loading choices for values in the same way that EntityLoader customization does (if you provide a query_builder).
2015-02-08 07:49:29 +01:00
Vladimir Sadicov
b12843971c Fix form icon position in web profiler 2015-02-06 12:24:56 +02:00
Guilherme Blanco
2185883520 Optimize EntityType by only loading choices for values in the same way that EntityLoader customization does (if you provide a query_builder). 2015-02-05 17:41:00 +00:00
Fabien Potencier
542f60457d feature #9782 [Security] added string representation for core Users (tobiassjosten)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #9782).

Discussion
----------

[Security] added string representation for core Users

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

I often use type casting and `__toString()` to print my users as this lets me very easily keep one canonical format for their representation. In functional tests however, it is easier to use in-memory users but this defaults to instances of the core `User` object. Because these don't have a string representation all the nice type casting crashes.

Hence I propose to represent the core Users by their username string by default. It would be useful in a lot of cases and I can't see any harm in it?

Commits
-------

722c3a7 [Security] added string representation for core Users
2015-02-05 16:54:07 +01:00
Tobias Sjösten
722c3a77d3 [Security] added string representation for core Users 2015-02-05 16:54:07 +01:00
Fabien Potencier
1882cb1b50 feature #12174 [TwigBundle] Add loader priority (wizhippo)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #12174).

Discussion
----------

[TwigBundle] Add loader priority

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

Add the ability to specify a priority to the tag of `twig.loader` services.

eg:
```
        <service id="twig.loader.filesystem" class="%twig.loader.filesystem.class%" public="false">
            <argument type="service" id="templating.locator" />
            <argument type="service" id="templating.name_parser" />
            <tag name="twig.loader" priority="100"/>
        </service>
```

Commits
-------

67dffea Add Twig loader priority
2015-02-05 16:17:39 +01:00
wizhippo
67dffea346 Add Twig loader priority 2015-02-05 16:17:38 +01: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
25441343c6 Merge branch '2.6' into 2.7
* 2.6:
  [FrameworkBundle] fixed tests
  [FrameworkBundle][config cmd] initialize extension.
2015-02-05 09:35:11 +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
354593fe3f minor #12981 [HttpKernel] Mask '_password' request in profiler (goabonga)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Mask '_password' request in profiler

Just mask the request _password value in profiler log view.

Commits
-------

1224fc6 [HttpKernel] Mask '_password' request in profiler
2015-02-05 09:00:50 +01:00
Fabien Potencier
53c8baeae2 feature #13074 [Translation] Refresh catalogues when resources change (iamluc)
This PR was merged into the 2.7 branch.

Discussion
----------

[Translation] Refresh catalogues when resources change

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

When a translation file is added in a bundle, the container is refreshed thanks to a DirectoryResource watching for changes.
But the translator has his own cache that is not refreshed.

This PR adds a hash check when cached is used.

Commits
-------

1113999 Refresh catalogues when resources change
2015-02-05 08:41:54 +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
Fabien Potencier
33bf087a9b bug #13375 [YAML] Fix one-liners to work with multiple new lines (Alex Pott)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13375).

Discussion
----------

[YAML] Fix one-liners to work with multiple new lines

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

Commits
-------

4d22bf7 [YAML] Fix one-liners to work with multiple new lines
2015-02-05 08:14:20 +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
f56bbe557e minor #13388 [Console][TableStyle] validate padding type value. (aitboudad)
This PR was submitted for the 2.5 branch but it was merged into the 2.7 branch instead (closes #13388).

Discussion
----------

[Console][TableStyle] validate padding type value.

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

Commits
-------

755653d [Console][TableStyle] validate padding type value.
2015-02-05 08:11:59 +01:00
Abdellatif Ait boudad
755653d561 [Console][TableStyle] validate padding type value. 2015-02-05 08:11:58 +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
d7870a2b5d Merge branch '2.6' into 2.7
* 2.6: (46 commits)
  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
  removed non-sense example
  Fixes small typo.
  [Validator] Remove unnecessary include in tests
  [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
  fixed typo
  [Validator] fix DOS-style line endings
  Drop useless execution bit
  bumped Symfony version to 2.6.5
  [Serializer] update changelog
  updated VERSION for 2.6.4
  updated CHANGELOG for 2.6.4
  bumped Symfony version to 2.5.11
  [HttpKernel] Added use of provided by #12022 method to instantiate controller class in bundle's controller resolver
  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
  ...

Conflicts:
	src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
	src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php
	src/Symfony/Component/HttpKernel/Exception/FlattenException.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
	src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf
2015-02-05 07:58:17 +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
Fabien Potencier
1aa37689af bug #13545 fixxed order of usage (OskarStark)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #13545).

Discussion
----------

fixxed order of usage

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

```[options] command [arguments]```

to

```command [options] [arguments]```

(i made some issues in this branch before #13538 )

Commits
-------

d44ff2a fixxed order of usage
2015-02-05 07:29:55 +01:00