Commit Graph

24113 Commits

Author SHA1 Message Date
Javier Eguiluz
5ad065de96 Fixed the antialiasing of the toolbar text 2016-02-19 17:33:18 +01:00
Nicolas Grekas
cd232ecd55 Merge branch '2.7' into 2.8
* 2.7:
  Create PULL_REQUEST_TEMPLATE.md
  Remove duplicate validation in RedirectResponse
  [Yaml] fix default timezone to be UTC
  [DependencyInjection] fix dumped YAML string
  [Config] Add suggest to composer.json for symfony/yaml

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
2016-02-18 09:58:48 +01:00
Nicolas Grekas
de5c737426 Merge branch '2.3' into 2.7
* 2.3:
  Create PULL_REQUEST_TEMPLATE.md
  Remove duplicate validation in RedirectResponse
  [Yaml] fix default timezone to be UTC
  [DependencyInjection] fix dumped YAML string

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2016-02-18 09:57:30 +01:00
Fabien Potencier
31d4548d78 minor #17827 [Config] Add suggest to composer.json for symfony/yaml (Calin Mihai Pristavu)
This PR was merged into the 2.7 branch.

Discussion
----------

[Config] Add suggest to composer.json for symfony/yaml

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

Fixes #17826

Commits
-------

2200b0c [Config] Add suggest to composer.json for symfony/yaml
2016-02-18 08:23:36 +01:00
Fabien Potencier
f676878fe0 minor #17831 Create PULL_REQUEST_TEMPLATE.md (colinodell)
This PR was squashed before being merged into the 2.3 branch (closes #17831).

Discussion
----------

Create PULL_REQUEST_TEMPLATE.md

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

Github has support for issue and template files (`issue_template.md` and `pull_request_template.md`).  The contents of these files will auto-populate new issues/PRs.

This PR creates a `PULL_REQUEST_TEMPLATE.md` file using the [Symfony Pull Request Template](https://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request).

See https://github.com/blog/2111-issue-and-pull-request-templates

Commits
-------

ac8f8f8 Create PULL_REQUEST_TEMPLATE.md
2016-02-18 08:17:40 +01:00
Colin O'Dell
ac8f8f8964 Create PULL_REQUEST_TEMPLATE.md 2016-02-18 08:17:38 +01:00
Fabien Potencier
5fda221d47 bug #17835 [Yaml] fix default timezone to be UTC (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] fix default timezone to be UTC

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

Commits
-------

e9ee877 [Yaml] fix default timezone to be UTC
2016-02-18 08:04:48 +01:00
Fabien Potencier
f01cda604c minor #17838 Remove duplicate validation in RedirectResponse (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

Remove duplicate validation in RedirectResponse

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

Commits
-------

d27c4f4 Remove duplicate validation in RedirectResponse
2016-02-18 08:03:40 +01:00
Tobias Schultze
d27c4f4d68 Remove duplicate validation in RedirectResponse 2016-02-18 01:47:59 +01:00
Christian Flothmann
e9ee877e4b [Yaml] fix default timezone to be UTC 2016-02-17 22:15:58 +01:00
Tobias Schultze
d3114d1778 bug #17823 [DependencyInjection] fix dumped YAML string (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] fix dumped YAML string

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

Commits
-------

b1bb135 [DependencyInjection] fix dumped YAML string
2016-02-17 22:06:18 +01:00
Christian Flothmann
b1bb135249 [DependencyInjection] fix dumped YAML string 2016-02-17 17:36:45 +01:00
Calin Mihai Pristavu
2200b0c178 [Config] Add suggest to composer.json for symfony/yaml 2016-02-17 16:19:09 +02:00
Fabien Potencier
2ddab1d055 Merge branch '2.7' into 2.8
* 2.7:
  The exception should be thrown if an object doesn't implement Traversable AND doesn't implement Countable, not when it doesn't implement Traversable but DOES implement Countable
  [Form] fix violation mapper tests
  [HttpKernel] Prevent a fatal error when DebugHandlersListener is used with a kernel with no terminateWithException() method
  don't rely on deprecated YAML parser feature
2016-02-17 07:14:28 +01:00
Fabien Potencier
fd33367074 minor #17820 [Form] fix violation mapper tests (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] fix violation mapper tests

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

This takes into account the changes to the `getErrors()` in Symfony 2.5
(the method rturns a `FormErrorIterator` instead of an array) as well as
the fact that non-submitted forms do not accept errors since #10567
anymore.

Commits
-------

f87558d [Form] fix violation mapper tests
2016-02-17 07:13:55 +01:00
Fabien Potencier
2c59be51df bug #17818 [Console] InvalidArgumentException is thrown under wrong condition (robinkanters)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #17818).

Discussion
----------

[Console] InvalidArgumentException is thrown under wrong condition

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

When an object is passed to `setAutocompleterValues` that implements `\Countable` and `\Traversable`, an `InvalidArgumentException` is thrown, even though its message says that the argument should implement both of those interfaces.

Instead, the exception should be thrown if the parameter fails to implement either `\Countable` or `\Traversable`, like the exception message says.

_Disclaimer: I've been looking at this line for 10min, and I've become convinced it should be changed according to my PR, but I could be wrong._

Commits
-------

8eea65e The exception should be thrown if an object doesn't implement Traversable AND doesn't implement Countable, not when it doesn't implement Traversable but DOES implement Countable
2016-02-17 07:13:05 +01:00
Robin Kanters
8eea65e0d8 The exception should be thrown if an object doesn't implement Traversable AND doesn't implement Countable, not when it doesn't implement Traversable but DOES implement Countable 2016-02-17 07:12:58 +01:00
Fabien Potencier
a515383611 bug #17819 [HttpKernel] Prevent a fatal error when DebugHandlersListener is used with a kernel with no terminateWithException() method (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Prevent a fatal error when DebugHandlersListener is used with a kernel with no terminateWithException() method

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

I just suffered from this bug on a project that used HttpKernelInterface implementation with no `terminateWithException() method (which is not part of the interface).

Commits
-------

2849152 [HttpKernel] Prevent a fatal error when DebugHandlersListener is used with a kernel with no terminateWithException() method
2016-02-17 07:06:50 +01:00
Christian Flothmann
f87558d05e [Form] fix violation mapper tests
This takes into account the changes to the `getErrors()` in Symfony 2.5
(the method rturns a `FormErrorIterator` instead of an array) as well as
the fact that non-submitted forms do not accept errors since #10567
anymore.
2016-02-16 20:52:17 +01:00
Jakub Zalas
2849152c5e [HttpKernel] Prevent a fatal error when DebugHandlersListener is used with a kernel with no terminateWithException() method 2016-02-16 16:51:17 +00:00
Christian Flothmann
1c79c7b234 Merge branch '2.3' into 2.7
* 2.3:
  don't rely on deprecated YAML parser feature
2016-02-16 10:30:21 +01:00
Christian Flothmann
1dcf83c35b minor #17816 [DependencyInjection] don't rely on deprecated YAML parser feature (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] don't rely on deprecated YAML parser feature

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

see [failing tests for the 2.7 branch](https://travis-ci.org/symfony/symfony/jobs/109537695#L2238)

Commits
-------

c8d387f don't rely on deprecated YAML parser feature
2016-02-16 10:29:38 +01:00
Christian Flothmann
c8d387f131 don't rely on deprecated YAML parser feature 2016-02-16 09:57:10 +01:00
Fabien Potencier
15ecc7bf63 Merge branch '2.7' into 2.8
* 2.7:
  [FrameworkBundle] fix YAML syntax
  fix YAML syntax in functional tests config
2016-02-16 08:16:12 +01:00
Fabien Potencier
1af6e98851 Merge branch '2.3' into 2.7
* 2.3:
  fix YAML syntax in functional tests config
2016-02-16 08:15:42 +01:00
Fabien Potencier
9b093c9744 minor #17810 fix YAML syntax in functional tests config (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

fix YAML syntax in functional tests config

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

see failing tests in #17809

Commits
-------

d9af4bc fix YAML syntax in functional tests config
2016-02-16 08:14:17 +01:00
Fabien Potencier
a6e934c0ca minor #17811 [FrameworkBundle] fix YAML syntax (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] fix YAML syntax

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

see failing tests in #17809

Commits
-------

2da4038 [FrameworkBundle] fix YAML syntax
2016-02-16 08:13:32 +01:00
Fabien Potencier
9bd9978c31 minor #17812 [Yaml] always restore the error handler in tests (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Yaml] always restore the error handler in tests

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/17809#discussion_r52928131
| License       | MIT
| Doc PR        |

The error handler must be restored even when assertions failed.

Commits
-------

7631202 [Yaml] always restore the error handler in tests
2016-02-16 08:12:44 +01:00
Fabien Potencier
fc2fa79bb5 Merge branch '2.7' into 2.8
* 2.7:
  [DependencyInjection] fix dumped YAML snytax
  Remove InputOption::VALUE_REQUIRED mode from $default parameter description as InputOption::setDefault() throws an exception only when called in InputOption::VALUE_NONE mode. In practice the $default value could still be accessed in InputOption::VALUE_REQUIRED mode in case InputOption was never set but accessed from InputDefinition::getOption() method
  [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path
  [TwigBridge] Symfony 3.1 forward compatibility
2016-02-16 07:09:38 +01:00
Fabien Potencier
457967c6c7 Merge branch '2.3' into 2.7
* 2.3:
  [DependencyInjection] fix dumped YAML snytax
  Remove InputOption::VALUE_REQUIRED mode from $default parameter description as InputOption::setDefault() throws an exception only when called in InputOption::VALUE_NONE mode. In practice the $default value could still be accessed in InputOption::VALUE_REQUIRED mode in case InputOption was never set but accessed from InputDefinition::getOption() method
  [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path
  [TwigBridge] Symfony 3.1 forward compatibility
2016-02-16 07:07:10 +01:00
Fabien Potencier
3f749d6559 bug #17814 [DependencyInjection] fix dumped YAML snytax (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] fix dumped YAML snytax

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

see the failing tests in #17809

Commits
-------

30388f1 [DependencyInjection] fix dumped YAML snytax
2016-02-16 07:02:27 +01:00
Christian Flothmann
30388f17ff [DependencyInjection] fix dumped YAML snytax 2016-02-15 22:04:15 +01:00
Fabien Potencier
f6e401a973 minor #17707 Remove InputOption::VALUE_REQUIRED mode from $default parameter description (tomasliubinas)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17707).

Discussion
----------

Remove InputOption::VALUE_REQUIRED mode from $default parameter description

Reopening previous PR, providing more information

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

Remove InputOption::VALUE_REQUIRED mode from $default parameter description as InputOption::setDefault() throws an exception only when called with InputOption::VALUE_NONE mode.
In practice the $default not null value could be still used in VALUE_REQUIRED mode in case InputOption was never set but accessed from InputDefinition::getOption() method.

There is an important difference between 2 concepts. Not required Option AND not required option Value. When the not required Option is not provided the default value still could be taken from required option Value instance.

Relevant (correct) test case:
https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php#L136

Commits
-------

3c06151 Remove InputOption::VALUE_REQUIRED mode from $default parameter description as InputOption::setDefault() throws an exception only when called in InputOption::VALUE_NONE mode. In practice the $default value could still be accessed in InputOption::VALUE_REQUIRED mode in case InputOption was never set but accessed from InputDefinition::getOption() method
2016-02-15 20:17:39 +01:00
Tomas Liubinas
3c0615141e Remove InputOption::VALUE_REQUIRED mode from $default parameter description as InputOption::setDefault() throws an exception only when called in InputOption::VALUE_NONE mode.
In practice the $default value could still be accessed in InputOption::VALUE_REQUIRED mode in case InputOption was never set but accessed from InputDefinition::getOption() method
2016-02-15 20:17:39 +01:00
Christian Flothmann
7631202155 [Yaml] always restore the error handler in tests
The error handler must be restored even when assertions failed.
2016-02-15 19:17:14 +01:00
Christian Flothmann
2da40382ab [FrameworkBundle] fix YAML syntax 2016-02-15 19:07:52 +01:00
Christian Flothmann
d9af4bc606 fix YAML syntax in functional tests config 2016-02-15 19:05:26 +01:00
Fabien Potencier
d4ac467462 bug #17099 [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path (alekitto)
This PR was squashed before being merged into the 2.3 branch (closes #17099).

Discussion
----------

[Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path

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

Commits
-------

f005c80 [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path
2016-02-15 10:19:57 +01:00
Alessandro Chitolina
f005c80bc5 [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path 2016-02-15 10:19:56 +01:00
Fabien Potencier
d6418d4b36 minor #17699 [2.8] [DoctrineBridge] fix tests added in EntityType with FQCN (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[2.8] [DoctrineBridge] fix tests added in EntityType with FQCN

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

- [x] Wait for #17694 to be merged in 2.8

Commits
-------

beb70d9 fix FQCN in tests added by #17694
2016-02-15 10:18:04 +01:00
Jules Pietri
beb70d9370 fix FQCN in tests added by #17694 2016-02-15 09:50:51 +01:00
Fabien Potencier
e692752f08 Merge branch '2.7' into 2.8
* 2.7:
  fix choice_value option in EntityType and add some tests
2016-02-15 09:18:17 +01:00
Fabien Potencier
52343b02b7 bug #17694 [2.7] [DoctrineBridge] [Form] fix choice_value in EntityType (HeahDude)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [DoctrineBridge] [Form] fix choice_value in EntityType

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #17693, #17271, #13964
| License       | MIT
| Doc PR        | symfony/symfony-docs#6260

Commits
-------

2336d5c fix choice_value option in EntityType and add some tests
2016-02-15 09:11:42 +01:00
Fabien Potencier
4688f99ea1 bug #17790 [Config] Fix EnumNodeDefinition to allow building enum nodes with one element (ogizanagi)
This PR was merged into the 2.8 branch.

Discussion
----------

[Config] Fix EnumNodeDefinition to allow building enum nodes with one element

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

Commits
-------

e9111e4 [Config] Fix EnumNodeDefinition to allow building enum nodes with one element
2016-02-14 14:45:42 +01:00
Fabien Potencier
a966a8819d minor #17780 [TwigBridge] Symfony 3.1 forward compatibility (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBridge] Symfony 3.1 forward compatibility

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/17743#discussion_r52718344
| License       | MIT
| Doc PR        |

Commits
-------

2991639 [TwigBridge] Symfony 3.1 forward compatibility
2016-02-14 14:09:49 +01:00
Fabien Potencier
5cf36ad563 Merge branch '2.7' into 2.8
* 2.7:
  Fix locale and written standard inconsistencies for Norwegian translations
  [Form] [Validator] Fix locale inconsistencies in Norwegian translations
  fixed CS
  [DependencyInjection] fixed exceptions thrown by get method of ContainerBuilder
  [Form] remove useless code in ResizeFormListener
2016-02-14 14:08:45 +01:00
Fabien Potencier
dc59e42257 Merge branch '2.3' into 2.7
* 2.3:
  [Form] [Validator] Fix locale inconsistencies in Norwegian translations
  fixed CS
  [DependencyInjection] fixed exceptions thrown by get method of ContainerBuilder
  [Form] remove useless code in ResizeFormListener
2016-02-14 14:08:36 +01:00
Fabien Potencier
10ba63cb5e minor #17785 [Form] [Validator] Fix locale inconsistencies for Norwegian translations (valisj)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #17785).

Discussion
----------

[Form] [Validator] Fix locale inconsistencies for Norwegian translations

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

Bokmål is the preferred written standard of Norwegian for 85% to 90% of the population of Norway. It is therefore not entirely correct that the current translation of English in Nynorsk is the default one (`no` locale) for the Validator component.

This also creates inconsistency in Norwegian translations as other translations with the `no` locale are actually in Bokmål in the Form component, meaning that different written standards would be rendered in the same page.

In this PR, the filenames for translations are changed in such a way that Bokmål will be the default translation for the `no` locale, and nynorsk for the `nn` locale.

Renaming of `validators.nb.xlf` to `validators.no.xlf` (in Form component) will, however, lead to missing translations for those who relied on the `nb` locale for Bokmål. One solution is to have 2 exact translation files - validators.no.xlf and validators.nb.xlf - to avoid this problem.

Renaming of `validators.no.xlf` (which is currently in Nynorsk `nn`) to `validators.nn.xlf` (in Validator component) must be done in order to make the relation between translation content and locales consistent. I don't think this will lead to any major problems, since people expect to have Bokmål as the default translation.

Any thoughts?

Commits
-------

67d343f Fix locale and written standard inconsistencies for Norwegian translations
2016-02-14 14:07:55 +01:00
Valentin Jonovs
67d343fd69 Fix locale and written standard inconsistencies for Norwegian translations 2016-02-14 14:07:55 +01:00
Fabien Potencier
1229b6d9b9 minor #17795 [Form] [Validator] Fix locale inconsistencies in Norwegian translations (valisj)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] [Validator] Fix locale inconsistencies in Norwegian translations

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

See #17785

Commits
-------

ab2ac93 [Form] [Validator] Fix locale inconsistencies in Norwegian translations
2016-02-14 14:06:33 +01:00