Commit Graph

20169 Commits

Author SHA1 Message Date
Fabien Potencier
b36900ed33 minor #13515 [Form] fixed form tests when using 2.7 deps (fabpot)
This PR was merged into the 2.6 branch.

Discussion
----------

[Form] fixed form tests when using 2.7 deps

| 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

This PR allows tests to pass for the Form subtree-split when using any version of the Validator component. The build was broken because the 2.4 API works in the same way as the 2.5 one in Symfony 2.7, so the cause is set. Testing the implementation of the context allows to know whether to expect the cause more reliably.

Commits
-------

a55f5c8 [Form] fixed form tests when using 2.7 deps
2015-01-25 04:35:46 +01:00
Fabien Potencier
9c6339ecea bug #13503 [Routing] merge instead of replace class and method scheme/method annotations (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[Routing] merge instead of replace class and method scheme/method annotations

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | slightly (but since it only widens the scheme/method requirements, it should not really affect anyone)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7132
| License       | MIT
| Doc PR        |

Using replace for schemes/methods makes no sense, since it's not associative. So it can produce unexpected outcomes as demonstrated in the referenced ticket.

I chose 2.7 as  target branch because it's a bug fix but also a minor change in behavior. I also added more and better tests.

Commits
-------

e2505b5 [Routing] merge instead of replace class and method scheme/method annotations
2015-01-25 04:34:48 +01:00
Fabien Potencier
17184f3d4f minor #13509 [2.3] [HttpFoundation] [MimeTypeGuesser] Updated exception in MimeTypeGuesser (phansys)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [HttpFoundation] [MimeTypeGuesser] Updated exception in MimeTypeGuesser

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

Updated exception message in MimeTypeGuesser when no guessers available
(issue #12857).

Commits
-------

1e4a8d5 [2.3] [HttpFoundation] [MimeTypeGuesser]
2015-01-25 04:31:43 +01:00
Fabien Potencier
a55f5c8dda [Form] fixed form tests when using 2.7 deps 2015-01-25 04:25:09 +01:00
Fabien Potencier
312dbedf9d Merge branch '2.7'
* 2.7:
  [TwigBundle] made AppVariable compatible with 3.0
  fixed error message

Conflicts:
	src/Symfony/Bridge/Twig/AppVariable.php
2015-01-25 03:42:07 +01:00
Fabien Potencier
c5407f1cde minor #13513 [TwigBundle] made AppVariable compatible with 3.0 (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBundle] made AppVariable compatible with 3.0

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

bf066da [TwigBundle] made AppVariable compatible with 3.0
2015-01-25 03:39:31 +01:00
Fabien Potencier
bf066dace2 [TwigBundle] made AppVariable compatible with 3.0 2015-01-25 03:38:09 +01:00
Fabien Potencier
89e57ec523 fixed error message 2015-01-25 03:16:21 +01:00
Fabien Potencier
f712a330c8 Merge branch '2.7'
* 2.7:
  [TwigBridge] fixed AppVariable compat with older Symfony versions
  [Validator] re-added support for 2.4 API version in tests
  fixed typos
  fixed typo
  fixed typo
  fixed BC layer
  [SecurityBundle] decouple the logout PHP helper and Twig extension
  [Validator] added Japanese translation for unresolvable host (id: 79)
  [Serializer] Fix PHPDoc

Conflicts:
	src/Symfony/Bridge/Twig/AppVariable.php
2015-01-25 03:13:51 +01:00
Fabien Potencier
62decf0bf7 minor #13512 [TwigBridge] fixed AppVariable compat with older Symfony versions (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBridge] fixed AppVariable compat with older Symfony versions

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

b0d041f [TwigBridge] fixed AppVariable compat with older Symfony versions
2015-01-25 03:00:56 +01:00
Fabien Potencier
b0d041fd60 [TwigBridge] fixed AppVariable compat with older Symfony versions 2015-01-25 02:59:50 +01:00
Fabien Potencier
24d0748cc4 minor #13511 [Validator] re-added support for 2.4 API version in tests (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] re-added support for 2.4 API version in tests

| 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

Alternative to #13414

Commits
-------

b72ef6b [Validator] re-added support for 2.4 API version in tests
2015-01-25 02:23:21 +01:00
Fabien Potencier
b72ef6b470 [Validator] re-added support for 2.4 API version in tests 2015-01-25 02:21:24 +01:00
Fabien Potencier
d735b28056 minor #13510 [3.0] Travis Fix (GrahamCampbell)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[3.0] Travis Fix

| 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

Previously we were not actually running the framework tests on php 5.6, but only the component tests. I assume we want the same setup we've got on the 2.7 branch.

Commits
-------

c217adb Travis fix
2015-01-25 01:53:34 +01:00
Graham Campbell
c217adb794 Travis fix 2015-01-24 23:32:14 +00:00
Javier Spagnoletti
1e4a8d55cb [2.3] [HttpFoundation] [MimeTypeGuesser]
Updated exception message in MimeTypeGuesser when no guessers available
(issue #12857).

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12857
| License       | MIT
| Doc PR        | none
2015-01-24 20:09:16 -03:00
iamluc
1113999699 Refresh catalogues when resources change 2015-01-24 15:45:41 +01:00
Fabien Potencier
6000f60190 minor #13236 Consistent spaceless nodes in form templates (peterrehm)
This PR was merged into the 2.3 branch.

Discussion
----------

Consistent spaceless nodes in form templates

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

Added '-' at the start and at the end of all if, for, set and block nodes. Related to #12422.
Replaces #12560.

Commits
-------

41c5be6 Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes
2015-01-23 20:42:42 +01:00
Fabien Potencier
52dea4b13d bug #13501 [TwigBridge] Fix bootstrap rendering when user explicitly use form_label (lyrixx)
This PR was merged into the 2.6 branch.

Discussion
----------

[TwigBridge] Fix bootstrap rendering when user explicitly use form_label

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

I implemented what @javiereguiluz said in this [comment](https://github.com/symfony/symfony/issues/13417#issuecomment-71162558)

Commits
-------

717c6d1 [TwigBridge] Fix bootstrap rendering when user explicitly use form_label
2015-01-23 20:38:55 +01:00
Tobias Schultze
e2505b5cdc [Routing] merge instead of replace class and method scheme/method annotations 2015-01-23 18:16:45 +01:00
Grégoire Pineau
717c6d1800 [TwigBridge] Fix bootstrap rendering when user explicitly use form_label 2015-01-23 12:14:04 +01:00
sarah khalil
dbbe170168 Removed dead code and various cleaning 2015-01-21 21:57:55 +01:00
Arrilot
538195c7f5 [Var-Dumper] css-fix 2015-01-21 23:15:29 +03:00
sarah khalil
50973bace1 Removed dead code and various cleaning 2015-01-21 21:14:55 +01:00
Fabien Potencier
77cb48e1e2 bug #13487 [VarDumper] Fixed HtmlDumper with long string (alOneh)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Fixed HtmlDumper with long string

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

Commits
-------

0a327eb Fixed HtmlDumper with long string
2015-01-21 19:47:28 +01:00
Hippolyte Alain
0a327eb639 Fixed HtmlDumper with long string 2015-01-21 18:40:20 +01:00
sarah khalil
9272f86264 Removed dead code and various cleaning 2015-01-21 17:43:56 +01:00
Fabien Potencier
69748a1595 [TwigBundle] fixed Twig options (removed the parameter as it cannot contain service references) 2015-01-21 05:17:19 +01:00
Fabien Potencier
3d174a4058 fixed typos 2015-01-21 04:50:33 +01:00
Fabien Potencier
cc8abb210f fixed typo 2015-01-21 04:48:45 +01:00
Fabien Potencier
3b97306144 fixed typo 2015-01-21 04:46:04 +01:00
Fabien Potencier
7eb599e5a0 fixed BC layer 2015-01-21 04:40:42 +01:00
Fabien Potencier
5bb2816b0f feature #13475 [SecurityBundle] decouple the logout PHP helper and Twig extension (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[SecurityBundle] decouple the logout PHP helper and Twig extension

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

f089dd4 [SecurityBundle] decouple the logout PHP helper and Twig extension
2015-01-21 04:39:05 +01:00
Fabien Potencier
f089dd4dd6 [SecurityBundle] decouple the logout PHP helper and Twig extension 2015-01-21 04:29:57 +01:00
Fabien Potencier
7be7e62cfc minor #13452 [Console] Clarify method arguments (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Clarify method arguments

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

Make it clear that the second argument is not about command options to avoid bug reports like #13415.

Commits
-------

32338af [Console] Make it clear that the second argument is not about command options.
2015-01-21 00:58:45 +01:00
Fabien Potencier
497fdd4cc6 minor #13474 [Validator] added Japanese translation for unresolvable host (id: 79) (issei-m)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] added Japanese translation for unresolvable host (id: 79)

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

Commits
-------

067e686 [Validator] added Japanese translation for unresolvable host (id: 79)
2015-01-21 00:33:28 +01:00
Issei.M
067e686c2b [Validator] added Japanese translation for unresolvable host (id: 79) 2015-01-21 08:07:46 +09:00
Abdellatif Ait boudad
7e19fab51c [FrameworkBundle][xsd] added missing logging attribute. 2015-01-20 22:59:02 +00:00
Stefano Sala
838857c992 [Toolbar] Reset right and left .sf-toolbar-info values needed for window resize 2015-01-20 22:09:33 +01:00
Peter Rehm
9b9158b4da Remove the deprecated OptionsResolverInterface 2015-01-20 14:17:10 +01:00
Peter Rehm
602678143f Removed deprecated setDefaultOptions methods 2015-01-20 07:08:27 +01:00
Fabien Potencier
002101094a minor #13442 [Serializer] minor: Fix PHPDoc (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] minor: Fix PHPDoc

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

Fix PHPDoc as pointed by @stof in https://github.com/symfony/symfony/pull/13255/files#r23134338

Commits
-------

d264486 [Serializer] Fix PHPDoc
2015-01-20 02:42:45 +01:00
Fabien Potencier
db80498bbd Merge branch '2.7'
* 2.7:
  Minor plural/singular change
  print error message if server couldn't be started
  [HttpFoundation] [Request] fix baseUrl parsing to fix wrong path_info
  [Twig][Bridge][TranslationDefaultDomain] add support of named arguments.
  [Form] Improved exception message if the data class is not found
  Fixes ArgvInput's argument getter with empty tokens
  execute cheaper checks before more expensive ones
  [DependencyInjection] Fix missing ExpressionLanguageProviders on extension bild
  [FrameworkBundle] FormDataCollector should be loaded only if form config is enabled
2015-01-20 02:40:45 +01:00
Fabien Potencier
ba9392ce4f Merge branch '2.6' into 2.7
* 2.6:
  Minor plural/singular change
  print error message if server couldn't be started
  [HttpFoundation] [Request] fix baseUrl parsing to fix wrong path_info
  [Twig][Bridge][TranslationDefaultDomain] add support of named arguments.
  [Form] Improved exception message if the data class is not found
  Fixes ArgvInput's argument getter with empty tokens
  execute cheaper checks before more expensive ones
  [DependencyInjection] Fix missing ExpressionLanguageProviders on extension bild
  [FrameworkBundle] FormDataCollector should be loaded only if form config is enabled
2015-01-20 02:40:35 +01:00
Fabien Potencier
7a3332b798 Merge branch '2.5' into 2.6
* 2.5:
  [HttpFoundation] [Request] fix baseUrl parsing to fix wrong path_info
  [Twig][Bridge][TranslationDefaultDomain] add support of named arguments.
  [Form] Improved exception message if the data class is not found
  Fixes ArgvInput's argument getter with empty tokens
  execute cheaper checks before more expensive ones
  [FrameworkBundle] FormDataCollector should be loaded only if form config is enabled

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
2015-01-20 02:40:20 +01:00
Fabien Potencier
760553176f Merge branch '2.3' into 2.5
* 2.3:
  [HttpFoundation] [Request] fix baseUrl parsing to fix wrong path_info
  [Twig][Bridge][TranslationDefaultDomain] add support of named arguments.
  [Form] Improved exception message if the data class is not found
  Fixes ArgvInput's argument getter with empty tokens
  execute cheaper checks before more expensive ones

Conflicts:
	src/Symfony/Component/Form/FormConfigBuilder.php
2015-01-20 02:39:13 +01:00
Fabien Potencier
620744f182 fixed merge issue 2015-01-20 02:34:26 +01:00
Fabien Potencier
30935c7b8c Merge branch '2.7'
* 2.7:
  removed deprecation notice for internal constant
  removed deprecated notices when using the security service
  [Validator] fixed deprecation notice for ElementMetadata
  Revert "minor #13434 fixed some deprecated notices (fabpot)"
  removed usage of the deprecated EsiListener class in core
  [security] Fetching current stored context when not explicitly specified
  [FrameworkBundle] Container parameters in Route#condition
  Deprecated setDefaultOptions() in favor of configureOptions()

Conflicts:
	src/Symfony/Bridge/Doctrine/composer.json
	src/Symfony/Bridge/Propel1/composer.json
	src/Symfony/Bridge/Twig/AppVariable.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php
	src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
2015-01-20 02:26:34 +01:00
Fabien Potencier
a5e6b0dc50 minor #13462 removed deprecation notice for internal constant (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

removed deprecation notice for internal constant

| 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

This notice is being raised when using the legacy validator, but it shouldn't. Moreover, as this is purely an internal constant, there is no point in raising a notice anyway.

Commits
-------

19be8b0 removed deprecation notice for internal constant
2015-01-20 02:01:35 +01:00
Fabien Potencier
19be8b0e54 removed deprecation notice for internal constant 2015-01-20 01:47:52 +01:00