Commit Graph

14543 Commits

Author SHA1 Message Date
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
430c6d7485 merged branch Tobion/console-event (PR #8038)
This PR was merged into the master branch.

Discussion
----------

[Console] ensure integer exit codes in events

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

Commits
-------

fe1db71 [Console] ensure integer exit codes in events
2013-05-19 21:03:23 +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
fe1db7125a [Console] ensure integer exit codes in events 2013-05-18 00:03:24 +02:00
Tobias Schultze
5c317b77e8 [Console] fix and refactor exit code handling 2013-05-17 23:54:02 +02:00
Martin Pärtel
29c71a50f1 [Console] Add clear() to ProgressHelper.
One may want to print something else while the progress bar is running.
The output will be messy if the progress bar is not removed first.

One may also want to remove the progress bar after the work is complete.
2013-05-17 10:15:24 +03: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
b51de93e6c Merge branch '2.3'
* 2.3:
  Added missing column to the form's table layout
  Bumped Icu dependency to RC
  Update validators.ru.xlf
  remove check for PHP bug #50731
  adding missing Farsi translations
  Revert "merged branch armetiz/master (PR #8045)"
2013-05-16 22:40:38 +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
485802de94 updated version to 2.4 2013-05-16 09:54:39 +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
Lukas Kahwe Smith
6d2135b65c force the Content-Type to html in the web profiler controllers 2013-05-15 19:16:40 +02:00
Fabien Potencier
a6dd5db60d merged branch armetiz/master (PR #8045)
This PR was squashed before being merged into the master branch (closes #8045).

Discussion
----------

[Form] Add missing type hint

Commits
-------

4dccee6 [Form] Add missing type hint
2013-05-15 17:40:41 +02:00
Thomas Tourlourat
4dccee61c7 [Form] Add missing type hint 2013-05-15 17:40:40 +02:00
Fabien Potencier
da6f190a6b merged branch tiraeth/master-browserkit-redirect (PR #8025)
This PR was squashed before being merged into the master branch (closes #8025).

Discussion
----------

[BrowserKit] should not follow redirects if status code is not 30x

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

Currently, BrowserKit operates incorrectly. It follows "redirect" when `Location` header is present, but having just the header is not enough to perform redirection. [RFC-2616](http://tools.ietf.org/html/rfc2616#section-14.30) precisely says that the redirection should be performed only with `30x` status codes.

This PR fixes the incorrect behaviour of BrowserKit and make it consist with both the RFC document and with other clients, used for example with Behat.

I've found the issue while testing my application with Behat. I was returning `Location` header with `HTTP 201/Created` status code and was surprised that BrowserKit follows the redirection.

This PR is for 2.3 version (master) of Symfony.

Commits
-------

8f54da7 [BrowserKit] should not follow redirects if status code is not 30x
2013-05-15 17:16:47 +02:00
m.chwedziak
8f54da73dd [BrowserKit] should not follow redirects if status code is not 30x 2013-05-15 17:16:46 +02:00
Fabien Potencier
1f8a1b7125 tweaked previous merge (refs #8029) 2013-05-15 17:12:03 +02:00
Fabien Potencier
4edbf3cd2e merged branch ramonornela/master (PR #8029)
This PR was merged into the master branch.

Discussion
----------

Improvement composer.json Console

Added suggest to composer.json.

Commits
-------

5e6245f [ADD] Component_Console -add suggest in the composer.json to event-dispatcher
2013-05-15 17:11:32 +02:00
Fabien Potencier
d61ca1be07 merged branch jakzal/bugfix/segfaulting-tests (PR #8032)
This PR was merged into the master branch.

Discussion
----------

Fixed the tests on PHP 5.3.3

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

PHPUnit with PHP 5.3.3 couldn't handle garbage collecting properly.

Commits
-------

0617ed1 [Console] Removed the descriptor from data set providers.
2013-05-15 17:09:31 +02:00
Fabien Potencier
d656be01cf merged branch paradoxe/master (PR #8043)
This PR was merged into the master branch.

Discussion
----------

[Form][Twig] Removed an extra table column in the "button_row" block template

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

Commits
-------

6d5bc7a [Twig][Form] Removed extra table colunm in the button_row block template
2013-05-15 17:07:12 +02:00