Commit Graph

23589 Commits

Author SHA1 Message Date
Tobias Schultze
819154127b Merge branch '2.8' 2015-11-12 02:15:38 +01:00
Tobias Schultze
fef28b2fa1 Merge branch '2.7' into 2.8 2015-11-12 02:14:48 +01:00
Tobias Schultze
0bd8b58d9b minor #16446 OptionsResolver test coverage (eventhorizonpl)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #16446).

Discussion
----------

OptionsResolver test coverage

Hi,

This PR adds 100% test code coverage to OptionsResolver component.

Best regards,
Michal

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

Commits
-------

185950c OptionsResolver test coverage
2015-11-12 02:13:16 +01:00
Michal Piotrowski
185950c5d4 OptionsResolver test coverage 2015-11-12 02:13:15 +01:00
Fabien Potencier
cbaa9c4eac minor #16523 Reorder upgrade doc (umpirsky)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #16523).

Discussion
----------

Reorder upgrade doc

Just group "The option "`a`" was renamed to "`b`"." together.

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

Commits
-------

2c65507 Reorder upgrade steps
2015-11-11 16:43:22 +01:00
umpirsky
2c655074f8 Reorder upgrade steps 2015-11-11 16:43:21 +01:00
Fabien Potencier
e5928f7d61 bug #16521 [3.0] Revert removal of framework.csrf_protection section (WouterJ)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[3.0] Revert removal of framework.csrf_protection section

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

This section was incorrectly removed from Symfony 3, only the `field_name` setting was removed. Disabling/enabling CSRF seperately from the froms is not deprecated and should not be removed.

/cc @symfony/deciders please merge quickly, it's holding up bundles with functional tests wanting to support to Symfony 3

Commits
-------

6f2782b Revert removal of framework.csrf_protection section
2015-11-11 15:08:33 +01:00
WouterJ
6f2782b188 Revert removal of framework.csrf_protection section 2015-11-11 11:02:58 +01:00
Fabien Potencier
779833be05 Merge branch '2.8'
* 2.8:
  Fixed tabs when there are several groups of tabs in the same page
  Fix mode
  Fixed failing test for HHVM
  Removed unused logic in MockStream
  Update coding standard for MockStream
  [Filesystem] added tempnam() stream wrapper aware version of PHP's native tempnam() and fixed dumpFile to allow dumping to streams
  Renamed key to secret
2015-11-10 14:34:42 +01:00
Fabien Potencier
775129fcd2 bug #16515 Fixed tabs when there are several groups of tabs in the same page (javiereguiluz)
This PR was merged into the 2.8 branch.

Discussion
----------

Fixed tabs when there are several groups of tabs in the same page

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

Multiple tabs in the same page work again as expected:

![multiple_tabs](https://cloud.githubusercontent.com/assets/73419/11059933/310169c6-879d-11e5-91b2-b90af67b2a74.gif)

Commits
-------

c5daff0 Fixed tabs when there are several groups of tabs in the same page
2015-11-10 13:35:38 +01:00
Fabien Potencier
f37932c350 feature #16516 Remove some more legacy code (nicolas-grekas)
This PR was merged into the 3.0-dev branch.

Discussion
----------

Remove some more legacy code

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

Commits
-------

5aa4a3b Remove some more legacy code
2015-11-10 13:34:25 +01:00
Nicolas Grekas
5aa4a3b64c Remove some more legacy code 2015-11-10 11:42:06 +01:00
Javier Eguiluz
c5daff0143 Fixed tabs when there are several groups of tabs in the same page 2015-11-10 11:20:15 +01:00
Fabien Potencier
0fc513e611 feature #16156 [Filesystem] Changed dumpFile to allow dumping to streams (markchalloner, pierredup)
This PR was merged into the 2.8 branch.

Discussion
----------

[Filesystem] Changed dumpFile to allow dumping to streams

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10018
| License       | MIT
| Doc PR        | symfony/symfony-docs#5393

This is a follow-up of #14970 with comments addressed

Commits
-------

5ca7dee Fix mode
a17aa5e Fixed failing test for HHVM
61a3afd Removed unused logic in MockStream
247266c Update coding standard for MockStream
c6a7747 [Filesystem] added tempnam() stream wrapper aware version of PHP's native tempnam() and fixed dumpFile to allow dumping to streams
2015-11-09 22:34:48 +01:00
Fabien Potencier
456e55846d bug #16493 [Security] Renamed key to secret Part 2 (WouterJ)
This PR was merged into the 2.8 branch.

Discussion
----------

[Security] Renamed key to secret Part 2

Anonymous and RememberMe were already changed in https://github.com/symfony/symfony/pull/15141 This PR renames 2 more occurences of key in the Security: AnonymousAuthenticationListener and the Digest entry point.

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

Commits
-------

55f59d5 Renamed key to secret
2015-11-09 22:34:05 +01:00
Nicolas Grekas
4e98d89f28 Merge branch '2.8'
* 2.8:
  [ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0
2015-11-09 17:22:58 +01:00
Nicolas Grekas
7c0b9b6a0d Merge branch '2.7' into 2.8
* 2.7:
  [ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0
2015-11-09 17:22:52 +01:00
Nicolas Grekas
6f1d506824 Merge branch '2.3' into 2.7
* 2.3:
  [ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0
2015-11-09 17:22:45 +01:00
Nicolas Grekas
f107a0a98e minor #16507 [ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0

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

To make tests green again until https://github.com/sebastianbergmann/phpunit-mock-objects/pull/272 or https://github.com/sebastianbergmann/phpunit-mock-objects/pull/268 is merged+tagged.

Commits
-------

1b428df [ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0
2015-11-09 17:22:04 +01:00
Nicolas Grekas
1b428df90f [ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0 2015-11-09 17:10:51 +01:00
Pierre du Plessis
5ca7dee2fd Fix mode 2015-11-09 17:11:40 +02:00
Pierre du Plessis
a17aa5e091 Fixed failing test for HHVM 2015-11-09 17:11:40 +02:00
Pierre du Plessis
61a3afd829 Removed unused logic in MockStream 2015-11-09 17:11:40 +02:00
Pierre du Plessis
247266cdef Update coding standard for MockStream 2015-11-09 17:11:40 +02:00
Mark Challoner
c6a774761d [Filesystem] added tempnam() stream wrapper aware version of PHP's native tempnam() and fixed dumpFile to allow dumping to streams 2015-11-09 17:11:40 +02:00
Nicolas Grekas
1c1c4e7005 Merge branch '2.8'
* 2.8:
  Fix merge
2015-11-09 14:21:10 +01:00
Nicolas Grekas
0bb46c1ae2 Fix merge 2015-11-09 14:20:59 +01:00
Nicolas Grekas
d33879a9db Merge branch '2.8'
* 2.8:
  [ci] Phpunit tests wont run if composer is installed in a wrapper
  [ci] Add version tag in phpunit wrapper to trigger cache-reset on demand
  fix race condition at mkdir (#16258)
  [VarDumper] Fix PHP7 type-hints compat
  [Bridge] [PhpUnit] fixes documentation markup.
  [PropertyAccess] Port of the performance optimization from 2.3
  trigger deprecation warning when using empty_value
  [PropertyAccess] Test access to dynamic properties
  [PropertyAccess] Fix dynamic property accessing.
  [Serializer] GetSetNormalizer shouldn't set/get static methods
  [Serializer] PropertyNormalizer shouldn't set static properties
  JsonDescriptor - encode container params only once

Conflicts:
	src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
	src/Symfony/Component/Form/Extension/Core/Type/DateType.php
	src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
	src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
2015-11-09 13:52:14 +01:00
Nicolas Grekas
d86a3f3172 Merge branch '2.7' into 2.8
* 2.7:
  [ci] Phpunit tests wont run if composer is installed in a wrapper
  [ci] Add version tag in phpunit wrapper to trigger cache-reset on demand
  fix race condition at mkdir (#16258)
  [VarDumper] Fix PHP7 type-hints compat
  [Bridge] [PhpUnit] fixes documentation markup.
  [PropertyAccess] Port of the performance optimization from 2.3
  trigger deprecation warning when using empty_value
  [PropertyAccess] Test access to dynamic properties
  [PropertyAccess] Fix dynamic property accessing.
  [Serializer] GetSetNormalizer shouldn't set/get static methods
  [Serializer] PropertyNormalizer shouldn't set static properties
  JsonDescriptor - encode container params only once

Conflicts:
	src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
2015-11-09 13:46:59 +01:00
Nicolas Grekas
1bc1931ede Merge branch '2.3' into 2.7
* 2.3:
  [ci] Phpunit tests wont run if composer is installed in a wrapper
  [ci] Add version tag in phpunit wrapper to trigger cache-reset on demand
  fix race condition at mkdir (#16258)
  [PropertyAccess] Test access to dynamic properties
  [PropertyAccess] Fix dynamic property accessing.

Conflicts:
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2015-11-09 13:45:14 +01:00
Nicolas Grekas
3d41d9368a minor #16503 [ci] Add version tag in phpunit wrapper to trigger cache-reset on demand (nicolas-grekas, emil-nasso)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Add version tag in phpunit wrapper to trigger cache-reset on demand

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

Commits
-------

f93e0c2 [ci] Phpunit tests wont run if composer is installed in a wrapper
481bf66 [ci] Add version tag in phpunit wrapper to trigger cache-reset on demand
2015-11-09 13:32:25 +01:00
Emil Andersson
f93e0c23d1 [ci] Phpunit tests wont run if composer is installed in a wrapper 2015-11-09 13:13:34 +01:00
Nicolas Grekas
481bf6603d [ci] Add version tag in phpunit wrapper to trigger cache-reset on demand 2015-11-09 13:13:33 +01:00
Nicolas Grekas
f763cc36ef Merge branch '2.8'
* 2.8:
  [Bridge/PhpUnit] Allow PHP 5.3.3 for testing with Symfony 2.3

Conflicts:
	src/Symfony/Bridge/PhpUnit/composer.json
2015-11-09 13:12:04 +01:00
Nicolas Grekas
b2afc3286e [Bridge/PhpUnit] Allow PHP 5.3.3 for testing with Symfony 2.3 2015-11-09 13:11:16 +01:00
Nicolas Grekas
b1ad6232b7 Merge branch '2.8'
* 2.8:
  [Bridge\PhpUnit] Add extra clock-mocked namespaces in phpunit.xml.dist
  [DependencyInjection] Autowing: exclude abstract definitons
  [DependencyInjection] Autowiring: support parent/decorators
  [FrameworkBundle] Autowiring support for debug:container
  Fixing bad type-hint auto-wiring bug
  [Yaml] deprecate unquoted indicator characters
  added a micro kernel
  Re-adding the ability to add a resource to the RouteCollectionBuilder
  [DependencyInjection] Add autowiring support to dumpers
  ldap_set_option should be called with a valid link identifier
  [FrameworkBundle][Form] Better exception message for private form tagged services

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.md
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.md
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.xml
	src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
2015-11-09 11:46:27 +01:00
Nicolas Grekas
94ce455dc1 feature #16502 [Bridge\PhpUnit] Add extra clock-mocked namespaces in phpunit.xml.dist (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[Bridge\PhpUnit] Add extra clock-mocked namespaces in phpunit.xml.dist

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

This fixes the currently failing tests on travis by:
- checking for class existence before checking for groups, recursively now, when loading `@group time-sensitive` annotations
- allow specifying extra clock-mocked namespaces in phpunit.xml files, required e.g. when HttpKernel is tested standalone and requires clock-mocks to be enabled for the HttpFoundation namespace.

Commits
-------

cd36c07 [Bridge\PhpUnit] Add extra clock-mocked namespaces in phpunit.xml.dist
2015-11-09 11:30:40 +01:00
Nicolas Grekas
cd36c07629 [Bridge\PhpUnit] Add extra clock-mocked namespaces in phpunit.xml.dist 2015-11-09 11:00:06 +01:00
WouterJ
55f59d55a2 Renamed key to secret 2015-11-07 18:34:16 +01:00
Fabien Potencier
6d46a186a6 bug #16292 fix race condition at mkdir (#16258) (ewgRa)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16292).

Discussion
----------

fix race condition at mkdir (#16258)

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

Commits
-------

2c2836c fix race condition at mkdir (#16258)
2015-11-07 09:38:45 +01:00
Evgeniy Sokolov
2c2836c599 fix race condition at mkdir (#16258) 2015-11-07 09:38:45 +01:00
Fabien Potencier
515007e941 bug #16469 [DependencyInjection] [FrameworkBundle] Enhance autowiring DX (dunglas)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] [FrameworkBundle] Enhance autowiring DX

| 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

* Dump autowiring data when using the container
* Add autowiring data to the `debug:container` command

Commits
-------

9c3b910 [FrameworkBundle] Autowiring support for debug:container
18913e1 [DependencyInjection] Add autowiring support to dumpers
2015-11-07 09:30:54 +01:00
Fabien Potencier
da95b53604 bug #15945 [Form] trigger deprecation warning when using empty_value (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] trigger deprecation warning when using empty_value

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

The `empty_value` option is deprecated in the `choice`, `date`, and
`time` form types. Therefore, a deprecation warning must be triggered
when the users configures a value for this option.

The `datetime` form type does not need to be updated as it passes
configured values to the `date` and `time` form types which trigger
deprecation warnings anyway.

Commits
-------

405d4a8 trigger deprecation warning when using empty_value
2015-11-07 09:26:45 +01:00
Fabien Potencier
aacbcef537 bug #16384 [FrameworkBundle] JsonDescriptor - encode container params only once (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] JsonDescriptor - encode container params only once

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

Commits
-------

dd9d076 JsonDescriptor - encode container params only once
2015-11-07 09:20:26 +01:00
Fabien Potencier
0e66da8abb feature #16464 [DependencyInjection] Fix some edge cases with autowiring (dunglas)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Fix some edge cases with autowiring

| 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

Enhance the autowiring system:

- Works with parent definitions and decorator
- Always exclude parent definitions

It allows to autowire major services of the standard edition (tested with Swift Mailer, Monolog, Doctrine and Twig).

Commits
-------

faefc60 [DependencyInjection] Autowing: exclude abstract definitons
71d502a [DependencyInjection] Autowiring: support parent/decorators
2015-11-07 09:14:48 +01:00
Fabien Potencier
9093f1f564 minor #16482 [Bridge] [PhpUnit] fixes documentation markup. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[Bridge] [PhpUnit] fixes documentation markup.

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

Commits
-------

9e41d27 [Bridge] [PhpUnit] fixes documentation markup.
2015-11-07 09:12:54 +01:00
Fabien Potencier
479a42d91b minor #16475 [FrameworkBundle] Fix tests on Windows (nicolas-grekas)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[FrameworkBundle] Fix tests on Windows

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

This PR fixes tests on appveyor by reverting a change made here:
https://github.com/symfony/symfony/pull/13121/files#diff-0e52187cbf1067a310538287da74ddb5

Commits
-------

53f4fd5 [FwB] Fix tests on Windows
2015-11-07 09:10:14 +01:00
Tobias Schultze
f75f44b7c5 bug #16480 [VarDumper] Fix PHP7 type-hints compat (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Fix PHP7 type-hints compat

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

Commits
-------

edd5633 [VarDumper] Fix PHP7 type-hints compat
2015-11-06 18:48:55 +01:00
Nicolas Grekas
edd5633374 [VarDumper] Fix PHP7 type-hints compat 2015-11-06 15:49:25 +01:00
Kévin Dunglas
faefc6074f [DependencyInjection] Autowing: exclude abstract definitons 2015-11-06 14:16:58 +01:00