Commit Graph

21009 Commits

Author SHA1 Message Date
Nicolas Grekas
bee2adad80 minor #14485 [FrameworkBundle] Fix typo in variable name (paulandrieux)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] Fix typo in variable name

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

This come from 3928ed5fce (diff-20b057eaf0a977f7a2ef2b874307279aR120)

Commits
-------

bb9c4ee Fix typo in variable name
2015-04-27 18:39:04 +02:00
Nicolas Grekas
343d2828d6 Fix merge 2015-04-27 18:33:29 +02:00
Paul Andrieux
bb9c4ee5c3 Fix typo in variable name
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~
2015-04-27 17:32:10 +02:00
Abdellatif Ait boudad
79e005bfbb [profiler][security] check authenticated user by tokenClass instead of username. 2015-04-27 16:29:18 +01:00
Romain Neutron
af54bda89b [VarDumper] Fix #14481 : Open tree recursively on OSX 2015-04-27 17:26:27 +02:00
Fabien Potencier
614561b737 bug #14466 [WebProfiler] fix html syntax for input types (Tobion)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #14466).

Discussion
----------

[WebProfiler] fix html syntax for input types

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

HTML validator:

> Attribute placeholder is only allowed when the input type is email, number, password, search, tel, text, or url.

> Element option without attribute label must not be empty.

The other placeholders are totatlly useless. For url it usually just says `e.g.` without a value because the baseUrl is empty...

Commits
-------

876b180 [WebProfiler] fix html syntax for input types
2015-04-27 15:13:12 +02:00
Tobias Schultze
876b180227 [WebProfiler] fix html syntax for input types 2015-04-27 15:13:12 +02:00
Hippolyte Alain
4d2f0442f4 [TwigBundle] Fix deprecated use of FlattenException 2015-04-27 14:57:27 +02:00
Fabien Potencier
3928ed5fce Merge branch '2.3' into 2.6
* 2.3:
  [DependencyInjection] Removed extra strtolower calls
  [Validator] Fixed Choice when an empty array is used in the "choices" option
  Fixed tests
  [StringUtil] Fixed singularification of 'selfies'
  Fix Portuguese (Portugal) translation for Security
  improved exception when missing required component
  CS: unalign =
  Show a better error when the port is in use
  CS: unalign =>
  [FrameworkBundle] Check for 'xlf' instead of 'xliff'
  Add better phpdoc message for getListeners method of the EventDispatcher

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
	src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
2015-04-27 14:43:05 +02:00
Fabien Potencier
3a404f8fe6 minor #14412 [Yaml] Match signature of Yaml::parse() with Parser->parse() (Zzortell)
This PR was merged into the 2.7 branch.

Discussion
----------

[Yaml] Match signature of Yaml::parse() with Parser->parse()

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

Commits
-------

238589d Add $objectForMap as argument of Yaml::parse()
2015-04-27 14:33:52 +02:00
Fabien Potencier
7f24883f48 bug #14436 Show a better error when the port is in use (dosten)
This PR was merged into the 2.3 branch.

Discussion
----------

Show a better error when the port is in use

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

This is a backport of #14063

Commits
-------

34e000e Show a better error when the port is in use
2015-04-27 14:30:26 +02:00
Fabien Potencier
3be6492e2b minor #14449 [Security] Fix Portuguese (Portugal) translation (Restless-ET)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Fix Portuguese (Portugal) translation

Commits
-------

b62eb73 Fix Portuguese (Portugal) translation for Security
2015-04-27 14:28:09 +02:00
Fabien Potencier
94cf4ba449 minor #14452 [StringUtil] Fixed singularification of 'selfies' (pmodin)
This PR was merged into the 2.3 branch.

Discussion
----------

[StringUtil] Fixed singularification of 'selfies'

| 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

Related to #14191.

At tonights PHP Stockholm meetup we discussed #14191, and we noticed that "selfie" was incorrectly handled as well. One selfie, many selfies.

Commits
-------

7c2b875 [StringUtil] Fixed singularification of 'selfies'
2015-04-27 14:27:22 +02:00
Fabien Potencier
501df8d14c minor #14460 [Filesystem] deprecate chmod support in dumpFile() (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Filesystem] deprecate chmod support in dumpFile()

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

The ability to support a custom permission mask in the `dumpFile()` method is deprecated since Symfony Symfony 2.3.12. This commit adds the `trigger_error()` call if a custom permission mask is passed.

Commits
-------

faee0d7 [Filesystem] deprecate chmod support in dumpFile()
2015-04-27 14:23:34 +02:00
Fabien Potencier
01b2d8ef96 bug #14463 [Validator] Fixed Choice when an empty array is used in the "choices" option (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fixed Choice when an empty array is used in the "choices" option

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

This is a backport of #14448 for the 2.3 branch.

Commits
-------

8bf8556 [Validator] Fixed Choice when an empty array is used in the "choices" option
2015-04-27 14:22:06 +02:00
Fabien Potencier
8f7a55864a minor #14470 [DependencyInjection] Removed extra strtolower calls (dosten)
This PR was squashed before being merged into the 2.3 branch (closes #14470).

Discussion
----------

[DependencyInjection] Removed extra strtolower calls

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

`Alias` already lowercase the `$id` in the constructor. Using `ContainerBuilder::hasAlias()` and `ContainerBuilder::hasDefinition()` inside the code makes an extra strtolower call.

Commits
-------

3bfbf45 [DependencyInjection] Removed extra strtolower calls
2015-04-27 14:15:57 +02:00
Diego Saint Esteben
3bfbf45ed2 [DependencyInjection] Removed extra strtolower calls 2015-04-27 14:15:55 +02:00
Fabien Potencier
5cc28497e8 minor #14473 [DX] Minor improvement for the translation:debug output (nicolasdewez)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #14473).

Discussion
----------

[DX] Minor improvement for the translation:debug output

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

Commits
-------

6970469 Changed output for translation:debug command
2015-04-27 14:13:46 +02:00
Nicolas Dewez
69704692e4 Changed output for translation:debug command 2015-04-27 14:13:46 +02:00
Fabien Potencier
09cde7c52d bug #14415 [Serializer] Fix a bug when using groups together with a name converter (dunglas)
This PR was squashed before being merged into the 2.7 branch (closes #14415).

Discussion
----------

[Serializer] Fix a bug when using groups together with a name converter

| 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

* Fix the bug
* Increase test coverage

Commits
-------

454ef8c [Serializer] Fix a bug when using groups together with a name converter
2015-04-27 14:05:47 +02:00
Kévin Dunglas
454ef8cc6f [Serializer] Fix a bug when using groups together with a name converter 2015-04-27 14:05:43 +02:00
Abdellatif Ait boudad
f85ba5d74f bug #14301 [FrameworkBundle][Translation] skip warmUp when cache is not used. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle][Translation] skip warmUp when cache is not used.

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

Commits
-------

efb10f6 [FrameworkBundle][Translation] skip warmUp when cache is not used.
2015-04-27 12:29:25 +01:00
Nicolas Grekas
fcf53950ca minor #14457 [DependencyInjection] Fixed missing tests (dosten)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Fixed missing tests

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

Follow up of #11422 and #14446

Commits
-------

2892902 Fixed tests
2015-04-27 12:30:21 +02:00
Nicolas Grekas
7c5337367a bug #14446 [DependencyInjection] resolve circular reference (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[DependencyInjection] resolve circular reference

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

This issue has been fixed in #11422. Due to a bad merge in 3bed1b7988 it partially appeared again in Symfony 2.6 or higher.

Commits
-------

8b3b3ce [DependencyInjection] resolve circular reference
2015-04-27 12:29:08 +02:00
Kévin Dunglas
a1f7fb3b04 feature #14187 [Serializer] Supports hassers and setters for groups annotations (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Supports hassers and setters for groups annotations

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

For more coherence with the new `ObjectNormalizer` (#13257), this PR allows to add `@Groups` annotations on hasser and setter methods too.

Commits
-------

9c87ecc [Serializer] Supports hassers and setters for groups annotations
2015-04-27 09:28:02 +02:00
Johnny Robeson
74983d7fd7 Use https://symfony.com/search for searching
Using https for symfony.com/search stops chrome (and eventually firefox)
from warning us about "Mixed Content" when developing sites that use SSL
for the entire site.
2015-04-26 17:52:15 -04:00
Abdellatif Ait boudad
7e29d2c999 feature #14473 [DX] Minor improvement for the translation:debug output (nicolasdewez)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #14473).

Discussion
----------

[DX] Minor improvement for the translation:debug output

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

Commits
-------

b941bd3 Changed output for translation:debug command
2015-04-26 16:54:56 +01:00
Nicolas Dewez
b941bd3c46 Changed output for translation:debug command 2015-04-26 16:54:56 +01:00
Nicolas Grekas
9b333d655e minor #14439 CS: unalign => (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: unalign =>

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

Update before upcoming changes on PHP CS Fixer 1.8

To keep fabbot.io happy ;)

Commits
-------

1233baa CS: unalign =>
2015-04-26 16:27:11 +02:00
Nicolas Grekas
22693f3a46 minor #14438 CS: unalign = (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: unalign =

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

Update before upcoming changes on PHP CS Fixer 1.8

To keep fabbot.io happy ;)

Commits
-------

d5742c1 CS: unalign =
2015-04-26 16:20:13 +02:00
Nicolas Grekas
e94b31f3a0 [Debug] PHP7 compatibility with BaseException 2015-04-26 11:08:32 +02:00
Abdellatif Ait boudad
efb10f641a [FrameworkBundle][Translation] skip warmUp when cache is not used. 2015-04-25 12:46:08 +01:00
Abdellatif Ait boudad
0cd300f2d9 minor #14291 [Translator]Test case refactoring and simplifications for the Translator class (mpdude)
This PR was merged into the 2.7 branch.

Discussion
----------

[Translator]Test case refactoring and simplifications for the Translator class

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

Also see #14280 and #14281.

This also tests for the fix in [b5da2ae876](b5da2ae876 (diff-3126bfacb25e1e304b8cc720e8527a19))

Commits
-------

c0300f5 Remaining tweaks for translator tests on 2.7
2015-04-25 10:52:42 +01:00
Matthias Pigulla
c0300f57d5 Remaining tweaks for translator tests on 2.7
This are the remaining changes on the 2.7 branch after #14437 merged most of the improvements into 2.6.
2015-04-24 23:23:51 +02:00
Nicolas Grekas
b09df56a4e Merge branch '2.7' into 2.8
* 2.7:
  [FrameworkBundle] Fix test related to PSR-4
2015-04-24 21:22:47 +02:00
Nicolas Grekas
4cc4f079c5 [FrameworkBundle] Fix test related to PSR-4 2015-04-24 21:21:36 +02:00
Nicolas Grekas
dc89425c7f Merge branch '2.7' into 2.8
* 2.7:
  Fix test
2015-04-24 18:45:00 +02:00
Nicolas Grekas
0cbe1e011d Fix test 2015-04-24 18:44:40 +02:00
Nicolas Grekas
e6d05b7dc4 Merge branch '2.7' into 2.8
* 2.7:
  [Debug] Fix deprecated use of DebugClassLoader
  Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response"
  [Validator] Fixed Choice when an empty array is used in the "choices" option
2015-04-24 17:39:02 +02:00
Nicolas Grekas
62808e4078 feature #14462 Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response" (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response"

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

This partially reverts commit 22f4807522:
it broke BC (see https://github.com/silexphp/Silex/pull/1142 and 22f4807522 (commitcomment-10857485))

Commits
-------

10c5ffb Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response"
2015-04-24 17:37:58 +02:00
Nicolas Grekas
e0c6f444a3 Merge branch '2.6' into 2.7
* 2.6:
  [Debug] Fix deprecated use of DebugClassLoader
  [Validator] Fixed Choice when an empty array is used in the "choices" option
2015-04-24 17:36:44 +02:00
Nicolas Grekas
dc86ff71e2 minor #14464 [Debug] Fix deprecated use of DebugClassLoader (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] Fix deprecated use of DebugClassLoader

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

Commits
-------

4a6100a [Debug] Fix deprecated use of DebugClassLoader
2015-04-24 17:35:34 +02:00
Nicolas Grekas
4a6100a6f2 [Debug] Fix deprecated use of DebugClassLoader 2015-04-24 12:55:50 +02:00
Bernhard Schussek
8bf855620f [Validator] Fixed Choice when an empty array is used in the "choices" option 2015-04-24 12:06:28 +02:00
Bernhard Schussek
d206ffd212 bug #14448 [Validator] Fixed Choice when an empty array is used in the "choices" option (webmozart)
This PR was merged into the 2.6 branch.

Discussion
----------

[Validator] Fixed Choice when an empty array is used in the "choices" option

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

Commits
-------

a5a41b2 [Validator] Fixed Choice when an empty array is used in the "choices" option
2015-04-24 11:48:58 +02:00
Nicolas Grekas
10c5ffbdd0 Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response"
This partially reverts commit 22f4807522.
2015-04-24 09:21:43 +02:00
Nicolas Grekas
f5a0ac2945 Merge branch '2.7' into 2.8
* 2.7: (40 commits)
  [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
  [2.6][Translator] Extend, refactor and simplify Translator tests.
  Update DebugClassLoader.php
  inject asset packages in assets helper service
  [travis] Do not exclude legacy tests on 2.7
  [HttpFoundation] remove getExtension method
  [2.6][Translation] fix legacy tests.
  [Form] Removed remaining deprecation notices in the test suite
  [Form] Moved deprecation notice triggers to file level
  [Debug] Map PHP errors to LogLevel::CRITICAL
  [Routing][DependencyInjection] Support .yaml extension in YAML loaders
  [DX] improve file loader error for router/other resources in bundle
  [FrameworkBundle] Initialize translator with the default locale.
  [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
  [2.7][Translation] remove duplicate code for loading catalogue.
  [2.6][Translation] remove duplicate code for loading catalogue.
  [HttpKernel] Cleanup ExceptionListener
  CS fixes
  [DependencyInjection] Show better error when the Yaml component is not installed
  [2.3] SCA for Components - reference mismatches
  ...
2015-04-24 09:03:44 +02:00
Nicolas Grekas
1b34f2cb7d Merge branch '2.6' into 2.7
* 2.6:
  [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
  [2.6][Translator] Extend, refactor and simplify Translator tests.

Conflicts:
	src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
	src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
2015-04-24 09:02:30 +02:00
Nicolas Grekas
750792e32a minor #14418 [travis] Do not exclude legacy tests on 2.7 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[travis] Do not exclude legacy tests on 2.7

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

This is to be reverted on 2.8, where legacy tests should be excluded.

Commits
-------

8e39a08 [travis] Do not exclude legacy tests on 2.7
2015-04-24 08:20:20 +02:00
Nicolas Grekas
d90891a372 bug #14451 [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups

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

This is already tested: 2.7 fails because this patch is missing.

Commits
-------

98ed078 [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
2015-04-24 08:18:45 +02:00