Commit Graph

14844 Commits

Author SHA1 Message Date
Fabien Potencier
702e652002 Merge branch '2.2' into 2.3
* 2.2:
  Fixing singular form for kisses, accesses and addresses.
  fixed some circular references
  [Security] fixed a leak in ExceptionListener
  [Security] fixed a leak in the ContextListener
  Ignore posix_istatty warnings
  typos
  [HttpKernel] fixed route parameters storage in the Request data collector (closes #8867)
  Return BC compatibility for `@Route` parameters and default values

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
	src/Symfony/Component/Console/Application.php
2013-09-06 20:20:34 +02:00
Fabien Potencier
535cf50c3a merged branch fabpot/firewall-leaks (PR #8946)
This PR was merged into the 2.2 branch.

Discussion
----------

[Security] fixed a leak in the ContextListener

| 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

Trying to fix leaks when using the same Kernel to handle several requests in a row without resetting the Container or shutting down the Kernel.

Commits
-------

899f176 [Security] fixed a leak in ExceptionListener
2fd8a7a [Security] fixed a leak in the ContextListener
2013-09-06 20:18:09 +02:00
Fabien Potencier
c753d68771 merged branch fabpot/random-leaks (PR #8948)
This PR was merged into the 2.2 branch.

Discussion
----------

Fixed some random leaks

| 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
-------

970405f fixed some circular references
2013-09-06 20:17:18 +02:00
Fabien Potencier
a42ad21003 merged branch jjanvier/master (PR #8943)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8943).

Discussion
----------

[PropertyAccess] Fixing singular form for kisses, accesses and addresses.

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

Plural form of noums finishing by *sses* is always *ss* (contrary to plural form of noums finishing by *ses*).

Commits
-------

ebae88f Fixing singular form for kisses, accesses and addresses.
2013-09-06 16:56:44 +02:00
jjanvier
011434a54d Fixing singular form for kisses, accesses and addresses. 2013-09-06 16:56:44 +02:00
Fabien Potencier
970405f293 fixed some circular references 2013-09-06 16:26:52 +02:00
Fabien Potencier
899f1760a6 [Security] fixed a leak in ExceptionListener 2013-09-06 16:13:07 +02:00
Fabien Potencier
2fd8a7acf3 [Security] fixed a leak in the ContextListener 2013-09-06 15:53:58 +02:00
Fabien Potencier
abb8042249 merged branch norzechowicz/posix_isatty (PR #8939)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8939).

Discussion
----------

[Console] Ignore posix_istatty warnings

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

When input stream is ``php://memory`` or ``php://temp`` function ``posix_isatty`` throws following warning

> posix_isatty(): could not use stream of type 'MEMORY' in ....

Commits
-------

cc255dd Ignore posix_istatty warnings
2013-09-05 15:35:47 +02:00
Norbert Orzechowicz
4e9d99032b Ignore posix_istatty warnings 2013-09-05 15:35:47 +02:00
Fabien Potencier
17f4a3dd10 removed unused variable 2013-09-05 13:25:56 +02:00
Fabien Potencier
eb9571e2b0 merged branch Tobion/form-phpdoc (PR #8925)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] fix iterator phpdoc

It returns IteratorAggregate. But we probably only want to specify Traversable because that is was counts.

Fix from #8852

Commits
-------

f438ac3 [Form] fix iterator typehint
2013-09-04 08:17:01 +02:00
Tobias Schultze
f438ac3843 [Form] fix iterator typehint 2013-09-04 00:28:35 +02:00
Fabien Potencier
aee97998d5 merged branch enumag/patch-4 (PR #8923)
This PR was merged into the 2.2 branch.

Discussion
----------

typos

Commits
-------

4e363a1 typos
2013-09-03 19:24:00 +02:00
Jáchym Toušek
4e363a145e typos 2013-09-03 19:10:25 +02:00
Fabien Potencier
a14ba2b65d merged branch mikeSimonson/patch-1 (PR #8247)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8247).

Discussion
----------

[Form][BUG]Button missing getErrorsAsString() fixes #8084

Debug: Not calling undefined method anymore.
If the form contained a submit button the call would fail and the debug of the form wasn't possible.
Now it will work in all cases.
This fixes #8084

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

Commits
-------

dab0688 [Form][BUG]Button missing getErrorsAsString() fixes #8084 Debug: Not calling undefined method anymore. If the form contained a submit button the call would fail and the debug of the form wasn't possible. Now it will work in all cases. This fixes #8084
2013-09-03 16:30:28 +02:00
mike
6362fa41b0 Button missing getErrorsAsString() fixes #8084 Debug: Not calling undefined method anymore. If the form contained a submit button the call would fail and the debug of the form wasn't possible. Now it will work in all cases. This fixes #8084
Adding a test for the fix of getErrorAsString on Form.
Was throwing a fatal because of a method that did not exist on
the new element type button.
2013-09-03 16:30:27 +02:00
Fabien Potencier
51014bf930 merged branch catch56/container_array_key_exists (PR #8907)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8907).

Discussion
----------

Use isset() instead of array_key_exists() in DIC

It doesn't look like the array_key_exists() in Container::get() and Container::has() is necessary. Changing this to isset() removed over 1,000 calls on a default Drupal 8 install - attaching before/after xhprof screenshots with this change.

![screen shot 2013-09-01 at 1 13 41 pm](https://f.cloud.github.com/assets/116285/1063965/d826057c-1300-11e3-96c3-2c94b89fe83a.png)

![screen shot 2013-09-01 at 1 13 49 pm](https://f.cloud.github.com/assets/116285/1063961/99a0f7b2-1300-11e3-9bd2-b0bf22d4245e.png)

Commits
-------

3c01ae6 Use isset() instead of array_key_exists() in DIC
2013-09-03 12:21:15 +02:00
Nathaniel Catchpole
e4b303973f Use isset() instead of array_key_exists() in DIC 2013-09-03 12:21:15 +02:00
Fabien Potencier
71621d7404 merged branch enumag/patch-2 (PR #8912)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8912).

Discussion
----------

Fixed annotation

See #8910.

Commits
-------

18ce361 Fixed annotation
2013-09-02 15:38:54 +02:00
Jáchym Toušek
4147047c8e Fixed annotation 2013-09-02 15:38:54 +02:00
Fabien Potencier
567e3f4642 merged branch stloyd/bugfix/issue-7724 (PR #8393)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2] Return BC compatibility for `@Route` parameters and default values

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

Commits
-------

d400b5a Return BC compatibility for `@Route` parameters and default values
2013-08-31 08:28:50 +02:00
Fabien Potencier
a5dcb32760 merged branch fabpot/router-webprofiler (PR #8894)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpKernel] fixed route parameters storage in the Request data collector (closes #8867)

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

Commits
-------

c931eb7 [HttpKernel] fixed route parameters storage in the Request data collector (closes #8867)
2013-08-31 08:13:13 +02:00
Fabien Potencier
47b32437e1 Merge branch '2.2' into 2.3
* 2.2:
  [BrowserKit] fixed method/files/content when redirecting a request
  [BrowserKit] removed some headers when redirecting a request
  [BrowserKit] fixed headers when redirecting if history is set to false (refs #8697)
  [BrowserKit] Pass headers when `followRedirect()` is called

Conflicts:
	src/Symfony/Component/BrowserKit/Client.php
	src/Symfony/Component/BrowserKit/Tests/ClientTest.php
2013-08-31 08:12:22 +02:00
Fabien Potencier
dc1a539c02 merged branch fabpot/browserkit-redirect-22 (PR #8895)
This PR was merged into the 2.2 branch.

Discussion
----------

[BrowserKit] fixed the redirect behavior according to the RFC

| 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

Commits
-------

2d34e78 [BrowserKit] fixed method/files/content when redirecting a request
64e1655 [BrowserKit] removed some headers when redirecting a request
96a4b00 [BrowserKit] fixed headers when redirecting if history is set to false (refs #8697)
2013-08-31 08:10:23 +02:00
Fabien Potencier
2d34e78aaf [BrowserKit] fixed method/files/content when redirecting a request 2013-08-30 20:46:40 +02:00
Fabien Potencier
64e1655164 [BrowserKit] removed some headers when redirecting a request 2013-08-30 20:37:24 +02:00
Fabien Potencier
96a4b00c7c [BrowserKit] fixed headers when redirecting if history is set to false (refs #8697) 2013-08-30 20:37:05 +02:00
Fabien Potencier
7e06905ec0 merged branch stloyd/bugfix/issue7929 (PR #8697)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2] [BrowserKit] Pass headers when `followRedirect()` is called

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

Commits
-------

0d07af8 [BrowserKit] Pass headers when `followRedirect()` is called
2013-08-30 20:27:38 +02:00
Fabien Potencier
c931eb7a53 [HttpKernel] fixed route parameters storage in the Request data collector (closes #8867) 2013-08-30 19:08:44 +02:00
Fabien Potencier
e8e5a3a2e5 Merge branch '2.2' into 2.3
* 2.2:
  [Security] fixed some phpdoc
  Fixed PHPDoc Blocks
  optimized circular reference checker
  [HttpKernel] changed fragment URLs to be relative by default (closes #8458)
2013-08-30 15:10:46 +02:00
Fabien Potencier
f02dbd6641 [Security] fixed some phpdoc 2013-08-30 14:58:19 +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
Kris Wallsmith
4d01e7ebbd fixed misleading doc block 2013-08-29 12:32:30 -07: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
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
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
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