Commit Graph

14593 Commits

Author SHA1 Message Date
Rich Sage
97b38edeff Added type of return value in VoterInterface. 2013-05-23 04:09:04 +02:00
Tim Anido
79a842a83d [Console] Add namespace support back in to list command 2013-05-22 13:09:47 +10:00
Fabien Potencier
e9802047c0 merged branch jdesrosiers/ticket_8097 (PR #8098)
This PR was submitted for the 2.0 branch but it was merged into the 2.1 branch instead (closes #8098).

Discussion
----------

[HttpKernel] Fixed two bugs in HttpCache

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

1. 304 responses always send "Content-Type: text/html; charset=UTF-8"
header
I discovered that the HttpCache::handle method calls Response::prepare
after calling Response::isModified.  Response::isModified removes the
Content-Type header as it should, but Response::handle adds in the
default Content-Type header when none is set.  If the default
Content-Type is not the correct Content-Type, then the Content-Type in
the cache gets clobered.  I solved this problem by moving the
Response::isModified call after the Response::prepare call.  I updated
the testRespondsWith304WhenIfModifiedSinceMatchesLastModified and
testRespondsWith304WhenIfNoneMatchMatchesETag tests to verify that the
Content-Type header was not being sent for 304 responses.

2. Failure to invalidate cached entities referred to by the Location
header
I discovered that the Store::invalidate method was looking for Location
and Content-Location headers to invalidate, but it was looking in the
request headers instead of the response headers.  Because the
Store::invalidate method doesn't take a response, I decided it was
better to move this logic to the HttpCache::invalidate method instead.
I updated the testInvalidatesCachedResponsesOnPost test to verify that
Location headers are getting invalidated correctly.

Commits
-------

a4251bd [HttpKernel] Fixed two bugs in HttpCache
2013-05-21 00:28:52 +02:00
Jason Desrosiers
532160026f Fixed two bugs in HttpCache
1. 304 responses always send "Content-Type: text/html; charset=UTF-8"
header
I discovered that the HttpCache::handle method calls Response::prepare
after calling Response::isModified.  Response::isModified removes the
Content-Type header as it should, but Response::handle adds in the
default Content-Type header when none is set.  If the default
Content-Type is not the correct Content-Type, then the Content-Type in
the cache gets clobered.  I solved this problem by moving the
Response::isModified call after the Response::prepare call.  I updated
the testRespondsWith304WhenIfModifiedSinceMatchesLastModified and
testRespondsWith304WhenIfNoneMatchMatchesETag tests to verify that the
Content-Type header was not being sent for 304 responses.

2. Failure to invalidate cached entities referred to by the Location
header
I discovered that the Store::invalidate method was looking for Location
and Content-Location headers to invalidate, but it was looking in the
request headers instead of the response headers.  Because the
Store::invalidate method doesn't take a response, I decided it was
better to move this logic to the HttpCache::invalidate method instead.
I updated the testInvalidatesCachedResponsesOnPost test to verify that
Location headers are getting invalidated correctly.
2013-05-21 00:25:38 +02:00
Fabien Potencier
55f2000580 merged branch hason/security_bundle (PR #8064)
This PR was merged into the 2.3 branch.

Discussion
----------

[SecurityBundle] Added missing files for phpunit

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes and no (BC Break in RequestMatcher, symfony/http-foundation: 2.2.x)
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

11497f3 [SecurityBundle] Added missing files for phpunit
2013-05-21 00:17:21 +02:00
Fabien Potencier
2398144270 merged branch hason/framework (PR #8061)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Added missing files for phpunit

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

Commits
-------

815cee5 [FrameworkBundle] Added missing files for phpunit
2013-05-21 00:16:18 +02:00
Fabien Potencier
750ca71e18 merged branch jakzal/2.3-router-tests (PR #8102)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] Added Router tests and fixed an exception message

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

Commits
-------

e61ba7d [Routing] Added Router tests and fixed an exception message.
2013-05-20 15:46:54 +02:00
Fabien Potencier
44d7b2be33 merged branch hason/web-profiler-bundle (PR #8103)
This PR was merged into the 2.3 branch.

Discussion
----------

[WebProfilerBundle] Fixed composer.json

Commits
-------

d4f5389 [WebProfilerBundle] Fixed composer.json
2013-05-20 15:44:34 +02:00
Martin Hasoň
d4f5389a38 [WebProfilerBundle] Fixed composer.json 2013-05-20 12:46:47 +02:00
Martin Hasoň
11497f34cf [SecurityBundle] Added missing files for phpunit 2013-05-20 11:51:16 +02:00
Martin Hasoň
815cee5bac [FrameworkBundle] Added missing files for phpunit 2013-05-20 11:44:05 +02:00
Jakub Zalas
e61ba7d765 [Routing] Added Router tests and fixed an exception message. 2013-05-20 09:57:26 +01:00
Fabien Potencier
e4b900e137 merged branch hason/twig_bundle (PR #8062)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBundle] Added missing files for phpunit

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

Commits
-------

2952269 [TwigBundle] Added missing files for phpunit
2013-05-19 21:21:42 +02:00
Fabien Potencier
71d28836a5 merged branch zakharovvi/ContainerDebugCommand_fix_double_assignment (PR #8078)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8078).

Discussion
----------

[FrameworkBundle] fix double variable assignment in ContainerDebugComman...

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

Commits
-------

9d1a219 [FrameworkBundle] fix double variable assignment in ContainerDebugCommand
2013-05-19 21:12:18 +02:00
Vitaliy Zakharov
70c0424f69 fix double variable assignment in ContainerDebugCommand 2013-05-19 21:12:17 +02:00
Fabien Potencier
88b06d0dd5 merged branch weaverryan/resource-loader-show-previous-exception (PR #8089)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] Including exception message to clarify the underlying issue

Hi guys!

In the framework if you, for example, make a syntax error in YAML, then the true, clear message (e.g. Unable to parse at line 5 (near "framework") is nested, and harder to visually see. This includes that message in the main exception so that users can debug more easily.

I see this quite a bit, it's a choke point for newcomers :).

Before: Cannot import resource "/path/to/app/config/config.yml" from "/path/to/app/config/config_dev.yml".

After: Cannot import resource "/path/to/app/config/config.yml" from "/path/to/app/config/config_dev.yml". (Unable to parse at line 5 (near "framework").)

Corrections and comments warmly appreciated.

Thanks!

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

Commits
-------

435012f [Config] Adding the previous exception message into the FileLoaderLoadException so it's more easily seen
2013-05-19 21:10:48 +02:00
Fabien Potencier
aa6a73ae73 Merge branch '2.2' into 2.3
* 2.2:
  [Console] fix and refactor exit code handling

Conflicts:
	src/Symfony/Component/Console/Application.php
2013-05-19 21:06:00 +02:00
Fabien Potencier
f213a851e6 Merge branch '2.1' into 2.2
* 2.1:
  [Console] fix and refactor exit code handling
2013-05-19 21:04:48 +02:00
Fabien Potencier
92399ff79a merged branch Tobion/console-exit-code (PR #8080)
This PR was merged into the 2.1 branch.

Discussion
----------

[Console] fix and refactor exit code handling

Split of #8038

Commits
-------

5c317b7 [Console] fix and refactor exit code handling
2013-05-19 21:02:55 +02:00
Fabien Potencier
f989c846fe Merge branch '2.2' into 2.3
* 2.2:
  [CssSelector] Fix :nth-last-child() translation
  Fix Crawler::children() to not trigger a notice for childless node

Conflicts:
	src/Symfony/Component/CssSelector/Node/FunctionNode.php
	src/Symfony/Component/CssSelector/Tests/Node/FunctionNodeTest.php
2013-05-19 21:00:48 +02:00
Fabien Potencier
7b5e68053f Merge branch '2.1' into 2.2
* 2.1:
  [CssSelector] Fix :nth-last-child() translation
  Fix Crawler::children() to not trigger a notice for childless node
2013-05-19 21:00:13 +02:00
Fabien Potencier
f723bda26e merged branch lazyhammer/issue-8068 (PR #8072)
This PR was merged into the 2.3 branch.

Discussion
----------

[CssSelector] Fix :nth-last-child() translation

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

Commits
-------

2d9027d [CssSelector] Fix :nth-last-child() translation
2013-05-19 20:59:12 +02:00
Fabien Potencier
b31769b551 merged branch lazyhammer/issue-8068-2.1 (PR #8073)
This PR was merged into the 2.1 branch.

Discussion
----------

[CssSelector] Fix :nth-last-child() translation

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

Same as #8072, but for < 2.3

Commits
-------

1469953 [CssSelector] Fix :nth-last-child() translation
2013-05-19 20:58:42 +02:00
Fabien Potencier
d0fed26138 merged branch jakzal/bugfix/intl-tests-covers (PR #8082)
This PR was merged into the 2.3 branch.

Discussion
----------

[Intl] Fixed the class namespaces in the @covers annotations.

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

Commits
-------

a39db7b [Intl] Fixed the class namespaces in the @covers annotations.
2013-05-19 04:19:40 +02:00
Fabien Potencier
e8bb5021c0 merged branch jakzal/2.3-cssselector-test-location (PR #8090)
This PR was merged into the 2.3 branch.

Discussion
----------

[CssSelector] Moved a test into the Tests folder.

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

Commits
-------

b2e52e8 [CssSelector] Moved a test into the Tests folder.
2013-05-19 04:19:00 +02:00
Jakub Zalas
b2e52e8e15 [CssSelector] Moved a test into the Tests folder. 2013-05-19 04:12:07 +02:00
Ryan Weaver
435012f711 [Config] Adding the previous exception message into the FileLoaderLoadException so it's more easily seen
In the framework if you, for example, make a syntax error in YAML, then the true, clear message (e.g. Unable to parse at line 5 (near "framework") is nested, and harder to visually see. This includes that message in the main exception so that users can debug more easily.

Before: Cannot import resource "/path/to/app/config/config.yml" from "/path/to/app/config/config_dev.yml".

After: Cannot import resource "/path/to/app/config/config.yml" from "/path/to/app/config/config_dev.yml". (Unable to parse at line 5 (near "framework").)
2013-05-18 16:11:24 -05:00
Jakub Zalas
a39db7b9d2 [Intl] Fixed the class namespaces in the @covers annotations. 2013-05-18 13:21:22 +02:00
Tobias Schultze
5c317b77e8 [Console] fix and refactor exit code handling 2013-05-17 23:54:02 +02:00
Dmitrii Chekaliuk
1469953df4 [CssSelector] Fix :nth-last-child() translation 2013-05-17 03:31:34 +03:00
Dmitrii Chekaliuk
2d9027d9a2 [CssSelector] Fix :nth-last-child() translation 2013-05-17 02:48:20 +03:00
Fabien Potencier
c8b2e111d2 bumped Symfony version to 2.3.0-DEV-DEV 2013-05-16 23:58:08 +02:00
Fabien Potencier
db719aea88 updated VERSION for 2.3.0-RC1 2013-05-16 22:52:46 +02:00
Fabien Potencier
f3bee77d6b updated CHANGELOG for 2.3.0-RC1 2013-05-16 22:52:14 +02:00
Fabien Potencier
37d9de9fc7 merged branch bschussek/table-layout-fix (PR #8059)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8059).

Discussion
----------

[TwigBridge] Added missing column to the form's table layout

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

Commits
-------

97f3669 [TwigBridge] Added missing column to the form's table layout
2013-05-16 12:19:58 +02:00
Bernhard Schussek
683bd17592 Added missing column to the form's table layout 2013-05-16 12:19:58 +02:00
Martin Hasoň
29522695d3 [TwigBundle] Added missing files for phpunit 2013-05-16 11:58:37 +02:00
Fabien Potencier
419f0f039c merged branch lazyhammer/issue-8048 (PR #8054)
This PR was merged into the 2.1 branch.

Discussion
----------

[DomCrawler] Fix Crawler::children() to not trigger a notice for childless node

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

Commits
-------

91b8490 Fix Crawler::children() to not trigger a notice for childless node
2013-05-16 11:51:41 +02:00
Fabien Potencier
3c57921c6c merged branch bschussek/intl-fix (PR #8057)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8057).

Discussion
----------

[Intl] Bumped Icu dependency to RC

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

Commits
-------

2ce5aa4 [Intl] Bumped Icu dependency to RC
2013-05-16 11:48:58 +02:00
Bernhard Schussek
f3af8c2dfd Bumped Icu dependency to RC 2013-05-16 11:48:58 +02:00
Fabien Potencier
309373fff3 merged branch vitaliytv/patch-2 (PR #8055)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8055).

Discussion
----------

[Validator] Update validators.ru.xlf

russian language update

Commits
-------

bbfdd15 Update validators.ru.xlf
2013-05-16 11:46:22 +02:00
Vitaliy Tverdokhlib
742cdb35be Update validators.ru.xlf
[Validator] russian language update
2013-05-16 11:46:22 +02:00
Fabien Potencier
c31caca04c merged branch xabbuh/issue8007-master (PR #8052)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8052).

Discussion
----------

remove check for PHP bug #50731

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

Commits
-------

28534a6 remove check for PHP bug #50731
2013-05-16 11:44:24 +02:00
Christian Flothmann
95f356b8d0 remove check for PHP bug #50731 2013-05-16 11:44:24 +02:00
Fabien Potencier
2b3a0b9802 merged branch empire/patch-validator-fa (PR #8060)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8060).

Discussion
----------

[Validator] added missing Farsi translations

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

Farsi translations for the following validators

-  IBAN
-  ISBN
-  ISSN
-  Currency
-  EqualTo
-  IdenticalTo
-  NotEqualTo
-  NotIdenticalTo
-  GreaterThan
-  GreaterThanOrEqual
-  LessThan
-  LessThanOrEqual;

Commits
-------

026f2ac [Validator] adding missing Farsi translations
2013-05-16 11:42:49 +02:00
Hossein Zolfi (Ocean)
204e23e2db adding missing Farsi translations 2013-05-16 11:42:49 +02:00
Fabien Potencier
1231d47acf Revert "merged branch armetiz/master (PR #8045)"
This reverts commit a6dd5db60d, reversing
changes made to da6f190a6b.
2013-05-16 10:06:37 +02:00
Fabien Potencier
ffccc1af29 Merge branch '2.2'
* 2.2:
  removed CHANGELOG for 2.0 as it is not maintained anymore
2013-05-16 09:49:46 +02:00
Fabien Potencier
6bc3179113 Merge branch '2.1' into 2.2
* 2.1:
  removed CHANGELOG for 2.0 as it is not maintained anymore

Conflicts:
	CHANGELOG-2.0.md
2013-05-16 09:49:40 +02:00
Dmitrii Chekaliuk
91b84903b7 Fix Crawler::children() to not trigger a notice for childless node 2013-05-16 03:06:15 +03:00