Commit Graph

14651 Commits

Author SHA1 Message Date
Fabien Potencier
6cc192957d bumped Symfony version to 2.3.4-DEV 2013-08-07 20:24:25 +02:00
Fabien Potencier
17aefe6c8e updated VERSION for 2.3.3 2013-08-07 19:11:16 +02:00
Fabien Potencier
4369af2fc8 updated CHANGELOG for 2.3.3 2013-08-07 19:11:00 +02:00
Fabien Potencier
f8ffb80067 Merge branch '2.2' into 2.3
* 2.2:
  added trusted hosts check

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
2013-08-07 16:02:06 +02:00
Fabien Potencier
b8b972fe74 Merge branch '2.1' into 2.2
* 2.1:
  added trusted hosts check

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Component/HttpFoundation/Request.php
2013-08-07 16:00:53 +02:00
Fabien Potencier
31f0efd7bc Merge branch '2.0' into 2.1
* 2.0:
  added trusted hosts check

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
2013-08-07 15:58:42 +02:00
Jean-François Simon
c35cc5b900 added trusted hosts check 2013-08-06 09:14:49 +02:00
Fabien Potencier
3911cfa66f Merge branch '2.2' into 2.3
* 2.2:
  [Validator] fixed metadata serialization
  Fixed metadata serialization
2013-08-06 07:59:49 +02:00
Fabien Potencier
5d93815d84 Merge branch '2.1' into 2.2
* 2.1:
  [Validator] fixed metadata serialization
  Fixed metadata serialization
2013-08-06 07:59:38 +02:00
Fabien Potencier
5129d3f5d8 [Validator] fixed metadata serialization 2013-08-06 07:58:11 +02:00
Fabien Potencier
97fbb28f75 Merge branch '2.0' into 2.1
* 2.0:
  Fixed metadata serialization
2013-08-06 07:56:20 +02:00
Bernhard Schussek
6d555bc1a6 Fixed metadata serialization 2013-08-06 07:55:32 +02:00
Fabien Potencier
4de3a06f9b Merge branch '2.2' into 2.3
* 2.2:
  fix some file mode bug 755->644
2013-08-06 07:49:23 +02:00
Fabien Potencier
25ce787a92 merged branch bronze1man/pr-file-mode (PR #8674)
This PR was merged into the 2.2 branch.

Discussion
----------

fix some file mode bug 755->644

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

addd560 fix some file mode bug 755->644
2013-08-06 07:48:59 +02:00
bronze1man
addd560b0d fix some file mode bug 755->644 2013-08-06 10:31:28 +08:00
Fabien Potencier
fbb78ec62f merged branch jakzal/2.3-fragment-handler-fix (PR #8653)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Added a missing use statement

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

Build was broken by #8572 merged into 2.3 and master.

Commits
-------

ccb497a [HttpKernel] Added a missing use statement.
2013-08-03 07:54:12 +02:00
Fabien Potencier
4af347766a merged branch jakzal/process-stop-with-timeout-test (PR #8652)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Increased the timeout in a test to prevent random failures

This test fails quite often when travis is under a heavy load.

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

Commits
-------

9f3b1e1 [Process] Increased the timeout in a test to prevent random failures when travis is under a heavy load.
2013-08-03 07:47:23 +02:00
Jakub Zalas
ccb497a553 [HttpKernel] Added a missing use statement.
Broken by #8572.
2013-08-03 00:18:34 +01:00
Jakub Zalas
9f3b1e128d [Process] Increased the timeout in a test to prevent random failures when travis is under a heavy load. 2013-08-02 22:51:01 +01:00
Fabien Potencier
00c0237efa fixed typo 2013-08-02 23:24:57 +02:00
Fabien Potencier
64535bbcb2 Merge branch '2.2' into 2.3
* 2.2:
  [HttpKernel] added a missing dep for dev
  [Form] fixed wrong call to setTimeZone() (closes #8644)
  Fix issue with \DateTimeZone::UTC / 'UTC' for PHP 5.4
  [Form] Removed the "disabled" attribute from the placeholder option in select fields due to problems with the BlackBerry 10 browser
  [routing] added ability for apache matcher to handle array values
  removed dead code and fixed CS
  [Validator] fixed StaticMethodLoader trying to invoke methods of abstract classes (closes #8589)

Conflicts:
	src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php
	src/Symfony/Component/Form/FormConfigBuilder.php
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Validator/Tests/GraphWalkerTest.php
2013-08-02 22:53:38 +02:00
Fabien Potencier
fcea011138 merged branch fabpot/deps-versions (PR #8649)
This PR was merged into the 2.3 branch.

Discussion
----------

moved some fixed dep versions from 2.2.* to ~2.2

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

Commits
-------

e18f3ed moved some fixed dep versions from 2.2.* to ~2.2 (refs #8613)
2013-08-02 16:25:13 +02:00
Fabien Potencier
5e782c7768 merged branch fabpot/httpkernel-deps (PR #8648)
This PR was merged into the 2.2 branch.

Discussion
----------

Added a missing dev dep for Httpkernel

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

Commits
-------

a741414 [HttpKernel] added a missing dep for dev
2013-08-02 16:23:16 +02:00
Fabien Potencier
e18f3edb6a moved some fixed dep versions from 2.2.* to ~2.2 (refs #8613) 2013-08-02 15:48:04 +02:00
Fabien Potencier
a741414a5a [HttpKernel] added a missing dep for dev 2013-08-02 15:42:49 +02:00
Fabien Potencier
ef69619614 merged branch bschussek/issue8111 (PR #8638)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fixed patched forms to be valid even if children are not submitted

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

#8362 was reverted because it introduces a failing test that is caused by a regression. This PR takes the alternative approach that

* unsubmitted fields in the PATCH request remain unsubmitted
* `isValid()` ignores unsubmitted children
* `mapFormsToData()` ignores unsubmitted children

In my opinion this is a more proper solution than #8362.

Commits
-------

85330a6 [Form] Fixed patched forms to be valid even if children are not submitted
50f201e Revert "[Form] Fix of "PATCH'ed forms are never valid""
2013-08-02 15:20:14 +02:00
Fabien Potencier
adca1ef5cc merged branch bschussek/issue8385 (PR #8636)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fixed: If a form is not present in a request, it is not automatically submitted

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

This PR changes the following behavior of `handleRequest()`:

Current behavior:

```php
$_POST = array('foo' => 'bar');
$form = $factory->createNamed('myform', 'mytype');

// "myform" is not present in the request
$form->handleRequest();

assert(true === $form->isSubmitted());
```

Behavior after PR:

```php
$_POST = array('foo' => 'bar');
$form = $factory->createNamed('myform', 'mytype');

// "myform" is not present in the request
$form->handleRequest();

assert(false === $form->isSubmitted());
```

As #8385 pointed out, the latter behavior is expected, so I consider the current behavior a bug.

Commits
-------

cb5e765 [Form] Fixed: If a form is not present in a request, it is not automatically submitted
2013-08-02 15:19:16 +02:00
Fabien Potencier
888a2e4a64 merged branch langj/readme-link-fix (PR #8632)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixes link indices

Fixes links in the symfony/intl README.md

Commits
-------

d1e5710 Fixes link indices
2013-08-02 15:14:22 +02:00
Fabien Potencier
cd169b6000 merged branch bschussek/revert-7678 (PR #8623)
This PR was merged into the 2.3 branch.

Discussion
----------

Revert "[Form] Remove "value" attribute on empty_value option"

| Q             | A
| ------------- | ---
| Bug fix?      | yes (together with #8622)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7678 #8478 #8526
| License       | MIT
| Doc PR        | -

Commits
-------

dbd14fc Revert "[Form] Remove "value" attribute on empty_value option"
2013-08-02 15:13:07 +02:00
Fabien Potencier
e82a44ba99 merged branch bschussek/issue8526 (PR #8622)
This PR was merged into the 2.2 branch.

Discussion
----------

[Form] Removed the "disabled" attribute from the placeholder option in select fields due to problems with the BlackBerry 10 browser

| Q             | A
| ------------- | ---
| Bug fix?      | yes (together with #8623)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7678 #8478 #8526
| License       | MIT
| Doc PR        | -

Commits
-------

97cbb19 [Form] Removed the "disabled" attribute from the placeholder option in select fields due to problems with the BlackBerry 10 browser
2013-08-02 15:12:51 +02:00
Fabien Potencier
3d5d8edbb5 merged branch jfsimon/issue-8567 (PR #8608)
This PR was merged into the 2.2 branch.

Discussion
----------

[Routing] add ability for apache matcher to handle array values

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

Commits
-------

c138304 [routing] added ability for apache matcher to handle array values
2013-08-02 15:06:40 +02:00
Fabien Potencier
cd51d822b1 [Form] fixed wrong call to setTimeZone() (closes #8644) 2013-08-02 15:04:40 +02:00
Fabien Potencier
5b7e3bfe17 merged branch bobdenotter/2.2 (PR #8643)
This PR was merged into the 2.2 branch.

Discussion
----------

[Form] Fix issue with \DateTimeZone::UTC / 'UTC' for PHP < 5.5

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

On PHP 5.4.x and 5.3.x, `setTimeZoneId()` requires the parameter to be a string, but the constant `\DateTimeZone::UTC` is (int) 1024.

See: http://www.php.net/manual/en/intldateformatter.settimezoneid.php

This caused an issue for us when using Date formfields, giving this error:

    "DateTimeZone::__construct(): Unknown or bad timezone (1024)"

Commits
-------

5c359a8 Fix issue with \DateTimeZone::UTC / 'UTC' for PHP 5.4
2013-08-02 15:03:44 +02:00
Bob den Otter
5c359a87f9 Fix issue with \DateTimeZone::UTC / 'UTC' for PHP 5.4 2013-08-02 13:14:00 +02:00
Bernhard Schussek
85330a6863 [Form] Fixed patched forms to be valid even if children are not submitted 2013-08-01 18:07:41 +02:00
Bernhard Schussek
50f201ec64 Revert "[Form] Fix of "PATCH'ed forms are never valid""
This reverts commit a2b15359d8.

Conflicts:
	src/Symfony/Component/Form/Form.php

The commit is reverted because it introduces a bug demonstrated by a currently failing test.
2013-08-01 17:40:17 +02:00
Bernhard Schussek
cb5e765f58 [Form] Fixed: If a form is not present in a request, it is not automatically submitted 2013-08-01 17:20:43 +02:00
Jörn Lang
d1e571004d Fixes link indices 2013-08-01 14:40:45 +02:00
Bernhard Schussek
97cbb19bce [Form] Removed the "disabled" attribute from the placeholder option in select fields due to problems with the BlackBerry 10 browser 2013-08-01 10:41:32 +02:00
Bernhard Schussek
dbd14fc78f Revert "[Form] Remove "value" attribute on empty_value option"
This reverts commit 9e849eb78b.

Reasons for the revert:

* https://github.com/symfony/symfony/issues/8478
* https://github.com/symfony/symfony/issues/8526
2013-08-01 10:34:30 +02:00
Jean-François Simon
c138304823 [routing] added ability for apache matcher to handle array values 2013-07-30 13:22:46 +02:00
Fabien Potencier
bd30a5cc30 merged branch fabpot/console-fix (PR #8600)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] fixed regression where the command might have the wrong container if the application is reused several times

Commits
-------

1bd45b3 [FrameworkBundle] fixed regression where the command might have the wrong container if the application is reused several times
2013-07-29 19:56:59 +02:00
Fabien Potencier
1bd45b371e [FrameworkBundle] fixed regression where the command might have the wrong container if the application is reused several times 2013-07-29 19:40:51 +02:00
Fabien Potencier
b970d172cb merged branch fabpot/dead-code (PR #8572)
This PR was merged into the 2.2 branch.

Discussion
----------

removed dead code and fixed CS

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

7d58147 removed dead code and fixed CS
2013-07-28 22:42:16 +02:00
Fabien Potencier
bf260d7d64 merged branch fabpot/validator-abstract-fix (PR #8592)
This PR was merged into the 2.2 branch.

Discussion
----------

[Validator] Fixed StaticMethodLoader does not try to invoke methods of abstract classes anymore

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

Commits
-------

b41cf82 [Validator] fixed StaticMethodLoader trying to invoke methods of abstract classes (closes #8589)
2013-07-28 22:42:06 +02:00
Fabien Potencier
7d581471ce removed dead code and fixed CS 2013-07-28 20:26:16 +02:00
Fabien Potencier
b41cf82651 [Validator] fixed StaticMethodLoader trying to invoke methods of abstract classes (closes #8589) 2013-07-28 20:24:29 +02:00
Fabien Potencier
9d53905b88 Merge branch '2.2' into 2.3
* 2.2:
  return 0 if there is no valid data
  [Tests] Tests on php 5.5 should pass
  [Twig] fixed TwigEngine::exists() method when a template contains a syntax error (closes #88546)
2013-07-27 07:01:40 +02:00
Fabien Potencier
de1915f405 merged branch Flask/ticket_8548 (PR #8575)
This PR was squashed before being merged into the 2.3 branch (closes #8575).

Discussion
----------

[Form] fixes empty file-inputs get treated as extra field

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

Commits
-------

e5fba3c [Form] fixes empty file-inputs get treated as extra field
2013-07-26 13:48:41 +02:00
Flavian Sierk
e5fba3cf83 [Form] fixes empty file-inputs get treated as extra field 2013-07-26 13:48:40 +02:00