Commit Graph

15073 Commits

Author SHA1 Message Date
Fabien Potencier
7f3878e1d9 merged branch vierbergenlars/patch-1 (PR #8854)
This PR was merged into the master branch.

Discussion
----------

[Security] Keep other query string parameters when switching users

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

When switching users, the whole query string gets dropped when redirecting after the switch.
I think only the switch user parameter should be dropped from the query string.

Commits
-------

0a338f5 [Security] Keep other query string parameters when switching users
2013-08-30 15:07:27 +02:00
Fabien Potencier
f02dbd6641 [Security] fixed some phpdoc 2013-08-30 14:58:19 +02:00
Fabien Potencier
042be413cf merged branch fabpot/debug-classloader (PR #8870)
This PR was merged into the master branch.

Discussion
----------

duplicated the DebugClassLoader in the Debug component

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

This is a follow-up for #8553.

Commits
-------

d146461 duplicated the DebugClassLoader in the Debug component
2013-08-30 14:14:08 +02:00
Fabien Potencier
7a0eba4ddc merged branch fabpot/fragment-urls (PR #8879)
This PR was merged into the 2.2 branch.

Discussion
----------

Made fragment URLs relative instead of absolute by default

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

This fixes a regression introduced with the new fragment system where fragment URLs were generated as absolute URLs. As per the ESI spec, there is no need to generate an absolute URL and this can even be problematic when dealing with internal sub-requests in a more "complex" hosting environment.

Commits
-------

91234cd [HttpKernel] changed fragment URLs to be relative by default (closes #8458)
2013-08-30 14:12:10 +02:00
Fabien Potencier
32a560fb40 merged branch ChristianGaertner/patch-1 (PR #8887)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8887).

Discussion
----------

[Process] Fixed PHPDoc Blocks

These ```RunTimeExceptions``` are NOT the native ones, therefor the should not be ```\``` in front of them.

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

Commits
-------

26e9717 Fixed PHPDoc Blocks
2013-08-30 14:09:31 +02:00
Christian Gärtner
6d8e91bf4f Fixed PHPDoc Blocks
These ```RunTimeExceptions``` are NOT the native ones, therefor the should not be ```\``` in front of them.
2013-08-30 14:09:30 +02:00
Fabien Potencier
ce53700003 merged branch kriswallsmith/http/misleading-comment (PR #8886)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed misleading doc block

This doc block does not match what's happening in the code.

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

Commits
-------

4d01e7e fixed misleading doc block
2013-08-30 13:37:51 +02:00
Fabien Potencier
480dda41cf merged branch tgabi333/master (PR #8891)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8891).

Discussion
----------

[DependencyInjection] optimized circular reference checker

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

It is an addtion to my previous PR https://github.com/symfony/symfony/pull/7699

There is no need to check again previously checked sub-trees.

In our tightly coupled services graph, this circular reference check runs avg 1,5ms, before that: 100ms

Commits
-------

67ebf8f optimized circular reference checker
2013-08-30 13:28:31 +02:00
Tóth Gábor
96bb731b28 optimized circular reference checker 2013-08-30 13:28:31 +02:00
Fabien Potencier
fc15c706f1 [Debug] fixed unit tests 2013-08-30 13:26:06 +02:00
Fabien Potencier
f3e5994212 [Debug] fixed typo that prevented smart errors for class not found errors to work 2013-08-30 09:34:07 +02:00
Kris Wallsmith
4d01e7ebbd fixed misleading doc block 2013-08-29 12:32:30 -07:00
Andrej Hudec
713f62326b Use sprintf in "Untrusted Host" and "Invalid Host" exception 2013-08-29 12:43:36 +02:00
Fabien Potencier
feff411dfc Merge branch '2.3'
* 2.3:
  Clear lazy loading initializer after the service is successfully initialized
  [FrameworkBundle] added support for double-quoted strings in the extractor (closes #8797)
  [SecurityBundle] Move format-dependent tests from SecurityExtensionTest
  bumped Symfony version to 2.3.5-DEV
  updated VERSION for 2.3.4
  updated CHANGELOG for 2.3.4
  bumped Symfony version to 2.2.7
  updated VERSION for 2.2.6
  update CONTRIBUTORS for 2.2.6
  updated CHANGELOG for 2.2.6
  clearToken exception is thrown at wrong place.
  fix typo in test skipped message
  [Form] Fixed Form::all() signature for PHP 5.3.3
  [Form] Fixed Form::all() signature for PHP 5.3.3
  [Locale] Fixed: Locale::setDefault() throws no exception when "en" is passed
  [Locale] Fixed: StubLocale::setDefault() throws no exception when "en" is passed
  [Translation] Grammar fix
  [Yaml] fixed embedded folded string parsing
  [Validator] fixed Boolean handling in XML constraint mappings (closes #5603)
  [Translation] Fixed regression: When only one rule is passed to transChoice(), this rule should be used

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-08-29 08:54:01 +02:00
Fabien Potencier
c0a256d966 Merge branch '2.2' into 2.3
* 2.2:
  [FrameworkBundle] added support for double-quoted strings in the extractor (closes #8797)
  [SecurityBundle] Move format-dependent tests from SecurityExtensionTest

Conflicts:
	src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
2013-08-29 08:53:29 +02:00
Fabien Potencier
70db3c3182 merged branch jeremylivingston/proxy-init (PR #8877)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8877).

Discussion
----------

Clear lazy loading initializer after the service is successfully initialized

Fixes #8875

Commits
-------

da73102 Clear lazy loading initializer after the service is successfully initialized
2013-08-29 07:26:51 +02:00
Jeremy Livingston
39b610d9ad Clear lazy loading initializer after the service is successfully initialized 2013-08-29 07:26:51 +02:00
Fabien Potencier
91234cd89a [HttpKernel] changed fragment URLs to be relative by default (closes #8458) 2013-08-29 07:21:07 +02:00
Fabien Potencier
5994f69a97 merged branch Inori/patch-3 (PR #8876)
This PR was merged into the master branch.

Discussion
----------

[HttpFoundation] add test to ensure Content-Length is preserved on HEAD

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

Related to #8873

Commits
-------

42f0596 [HttpFoundation] add test to ensure that Content-Length is preserved on HEAD method
2013-08-28 22:01:19 +02:00
Roman Marintšenko
42f0596f1a [HttpFoundation] add test to ensure that Content-Length is preserved on HEAD method 2013-08-28 22:35:29 +03:00
Fabien Potencier
803c0b74c5 merged branch Inori/tests-coverage (PR #8856)
This PR was squashed before being merged into the master branch (closes #8856).

Discussion
----------

[HttpFoundation] Improve test coverage

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

Commits
-------

aef78f2 [HttpFoundation] Improve test coverage
2013-08-28 20:56:23 +02:00
Roman Marintšenko
aef78f26a3 [HttpFoundation] Improve test coverage 2013-08-28 20:56:22 +02:00
Fabien Potencier
7f51252063 merged branch fabpot/moved_yaml_7 (PR #8872)
This PR was merged into the master branch.

Discussion
----------

fixes fabpots comment at yaml pr#6

Commits
-------

8b7cc14 fixes fabpots comment at yaml pr#6
2013-08-28 20:26:52 +02:00
fh-github@fholzhauer.de
8b7cc14962 fixes fabpots comment at yaml pr#6 2013-08-28 20:24:22 +02:00
Fabien Potencier
6132b40b06 merged branch endroid/master (PR #8488)
This PR was squashed before being merged into the master branch (closes #8488).

Discussion
----------

Add container aware trait

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

This trait can be used inside a class to make it container aware. As it is not always possible to extend the abstract ContainerAware class, the code for creating a container aware class is usually copied over and over (most of the time unchanged), resulting in a lot of redundant code in your project. As my projects are PHP 5.4 based nowadays, I would like to be able to use a trait in these scenarios to improve my workflow.

Commits
-------

4c9e606 Add container aware trait
2013-08-28 20:20:21 +02:00
endroid
4c9e606ea5 Add container aware trait 2013-08-28 20:20:21 +02:00
Fabien Potencier
0009deb055 merged branch fabpot/extrator-fix (PR #8869)
This PR was merged into the 2.2 branch.

Discussion
----------

[FrameworkBundle] added support for double-quoted strings in the extractor (closes #8797)

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

Commits
-------

4922a80 [FrameworkBundle] added support for double-quoted strings in the extractor (closes #8797)
2013-08-28 19:35:19 +02:00
Fabien Potencier
d146461250 duplicated the DebugClassLoader in the Debug component 2013-08-28 12:04:02 +02:00
Fabien Potencier
4922a80ee5 [FrameworkBundle] added support for double-quoted strings in the extractor (closes #8797) 2013-08-28 11:44:32 +02:00
Fabien Potencier
16b585dc6a merged branch unkind/security-bundle-tests-restructuring (PR #8840)
This PR was squashed before being merged into the 2.2 branch (closes #8840).

Discussion
----------

[SecurityBundle] Move format-dependent tests from SecurityExtensionTest

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

This PR solves issue with tests in the SecurityBundle: current structure of tests force to repeat the same test case for every format (PHP, XML, YAML) even if it doesn't depend on them (see #8782).

Commits
-------

d463e25 [SecurityBundle] Move format-dependent tests from SecurityExtensionTest
2013-08-28 10:11:27 +02:00
Nikita Konstantinov
d463e25a75 [SecurityBundle] Move format-dependent tests from SecurityExtensionTest 2013-08-28 10:11:26 +02:00
Fabien Potencier
196227bd83 bumped Symfony version to 2.3.5-DEV 2013-08-27 15:39:19 +02:00
Lars Vierbergen
0a338f5497 [Security] Keep other query string parameters when switching users 2013-08-27 12:44:23 +02:00
Fabien Potencier
4fb225f4e3 updated VERSION for 2.3.4 2013-08-27 10:58:24 +02:00
Fabien Potencier
5faaeb4bd6 updated CHANGELOG for 2.3.4 2013-08-27 10:58:06 +02:00
Fabien Potencier
d75a35ef12 Merge branch '2.2' into 2.3
* 2.2:
  bumped Symfony version to 2.2.7
  updated VERSION for 2.2.6
  update CONTRIBUTORS for 2.2.6
  updated CHANGELOG for 2.2.6
  clearToken exception is thrown at wrong place.

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-08-27 10:54:20 +02:00
Fabien Potencier
d73500b6eb bumped Symfony version to 2.2.7 2013-08-26 22:59:17 +02:00
Fabien Potencier
4059720232 updated VERSION for 2.2.6 2013-08-26 21:27:24 +02:00
Fabien Potencier
8b51765058 update CONTRIBUTORS for 2.2.6 2013-08-26 21:27:07 +02:00
Fabien Potencier
cb883a6975 updated CHANGELOG for 2.2.6 2013-08-26 21:26:38 +02:00
Fabien Potencier
c0f56f8353 merged branch xkobal/master (PR #8830)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8830).

Discussion
----------

clearToken exception is thrown at wrong place.

The PR https://github.com/symfony/symfony/pull/8528 has added a problem when logger is enabled.

The log message for clearToken exception throw actually a fatal error because $failed doesn't exist in clearToken method. I have moved the log message to the handle method.

Commits
-------

701c25b clearToken exception is thrown at wrong place.
2013-08-26 16:47:55 +02:00
Xavier HAUSHERR
f936b41a90 clearToken exception is thrown at wrong place. 2013-08-26 16:47:55 +02:00
Fabien Potencier
4ec3cd03db Merge branch '2.2' into 2.3
* 2.2:
  fix typo in test skipped message
  [Form] Fixed Form::all() signature for PHP 5.3.3
  [Translation] Grammar fix
  [Translation] Fixed regression: When only one rule is passed to transChoice(), this rule should be used

Conflicts:
	src/Symfony/Component/Form/Util/VirtualFormAwareIterator.php
2013-08-26 07:49:51 +02:00
Fabien Potencier
c5514578d5 merged branch bschussek/dereference-all-2.3 (PR #8852)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Form] Dereferenced Form::&all() since it is not supported for PHP <= 5.3.3

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

see 00bc2708bc and #8851

Commits
-------

fd09484 [Form] Fixed Form::all() signature for PHP 5.3.3
2013-08-26 07:49:08 +02:00
Fabien Potencier
be9f00af3d merged branch bschussek/dereference-all-2.2 (PR #8851)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Form] Dereferenced Form::&all() since it is not supported for PHP <= 5.3.3

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

see 00bc2708bc

Commits
-------

ea480bd [Form] Fixed Form::all() signature for PHP 5.3.3
2013-08-26 07:48:24 +02:00
Fabien Potencier
4585cf6d9d merged branch Inori/2.1 (PR #8855)
This PR was submitted for the 2.1 branch but it was merged into the 2.2 branch instead (closes #8855).

Discussion
----------

[HttpFoundation] [Tests] fix typo in Memcached tests skipped message

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

Commits
-------

83e4fcf fix typo in test skipped message
2013-08-25 20:21:56 +02:00
Roman Marintšenko
a1d7437b75 fix typo in test skipped message 2013-08-25 20:21:55 +02:00
Bernhard Schussek
fd09484a61 [Form] Fixed Form::all() signature for PHP 5.3.3 2013-08-25 14:07:23 +02:00
Bernhard Schussek
ea480bda3b [Form] Fixed Form::all() signature for PHP 5.3.3 2013-08-25 13:59:08 +02:00
Fabien Potencier
32947b2fc8 merged branch enumag/patch-1 (PR #8849)
This PR was merged into the master branch.

Discussion
----------

Fixed typo

The `PropertyAccess::getPropertyAccessor()` is deprecated.

Commits
-------

e0d3985 Fixed typo
2013-08-25 10:03:30 +02:00