Commit Graph

20319 Commits

Author SHA1 Message Date
Fabien Potencier
6cd873447d Merge branch '2.3' into 2.6
* 2.3:
  replaced the last remaining is_integer() call
  [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
  [Validator] Added missing galician (gl) translations
  [travis] Tests Security sub-components
  [travis] Tests Security sub-components
  CS fixes
  [travis] test with php nightly

Conflicts:
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
2015-03-07 08:40:15 +01:00
Fabien Potencier
53570ebd61 minor #13863 [2.6] [Console] [OptionsResolver] static code analysis, code cleanup (kalessil)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #13863).

Discussion
----------

[2.6]  [Console] [OptionsResolver] static code analysis, code cleanup

| 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

Split <a href="https://github.com/symfony/symfony/pull/13813">PR 13813</a>: part 2 - targeting v2.6

Following is included (no functional changes, found with <a href="https://plugins.jetbrains.com/plugin/7622?pr=phpStorm">Php Inspections (EA Extended)</a>):
- Unset calls can be merged inspection fixes
- Alias functions usage inspection fixes

Commits
-------

1530c35 Php Inspections (EA Extended): squash all PR-13813 commits
2015-03-07 08:39:22 +01:00
Vladimir Reznichenko
1530c355d5 Php Inspections (EA Extended): squash all PR-13813 commits 2015-03-07 08:39:22 +01:00
Fabien Potencier
e64b75f7d3 replaced the last remaining is_integer() call 2015-03-07 08:38:33 +01:00
Fabien Potencier
ca0cf15360 minor #13862 [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #13862).

Discussion
----------

[2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup

| 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

Split <a href="https://github.com/symfony/symfony/pull/13813">PR 13813</a>: part 1 - targeting v2.3

Following is included (no functional changes, found with <a href="https://plugins.jetbrains.com/plugin/7622?pr=phpStorm">Php Inspections (EA Extended)</a>):
- Fixed couple of concatenation as array index warnings
- Unset calls can be merged inspection fixes
- array_search in in_array context inspection fixes
- Is null usage inspection fixes
- Prefixed increment/decrement inspection fixes
- Elvis operator can be used inspection fixes
- Alias functions usage inspection fixes
- Ternary operator simplification inspection fixes
- _ _ DIR _ _ equivalent inspection fixes

Commits
-------

f13b5f7 [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
2015-03-07 08:38:03 +01:00
Vladimir Reznichenko
f13b5f7583 [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup 2015-03-07 08:38:01 +01:00
Fabien Potencier
2f7bd7cf8c minor #13850 [FrameworkBundle] simplify dep declaration (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] simplify dep declaration

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

I'm not sure this will work, travis will tell.

Commits
-------

37035b0 [FrameworkBundle] simplify dep declaration
2015-03-07 08:34:45 +01:00
Nicolas Grekas
37035b0696 [FrameworkBundle] simplify dep declaration 2015-03-06 22:21:22 +01:00
Nicolas Grekas
76df0455c3 bug #13860 [VarDumper] Fix "next element is already occupied" (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Fix "next element is already occupied"

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

<3 PHP

Commits
-------

32a81f7 [VarDumper] Fix "next element is already occupied"
2015-03-06 17:47:51 +01:00
Nicolas Grekas
32a81f79aa [VarDumper] Fix "next element is already occupied" 2015-03-06 17:45:31 +01:00
Kévin Dunglas
0ab3bebf69 feature #13257 [Serializer] ObjectNormalizer (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] ObjectNormalizer

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

`PropertyAccessNormalizer` is a new normalizer leveraging the PropertyAccess Component. It is able to handle classes containing both public properties and properties only accessibles trough getters / setters / issers / hassers...

As it extends `AbstractNormalizer`, it supports circular reference handling, name converters and existing object population.
What do you think about making this new normalizer the default one as it's the most convenient to use and the most consistent with the behavior of other components.

#13120, #13252 and #13255 need to be merged to make this PR working.

Commits
-------

0050bbb [Serializer] Introduce ObjectNormalizer
2015-03-06 12:07:54 +01:00
Kévin Dunglas
0050bbb345 [Serializer] Introduce ObjectNormalizer 2015-03-06 11:52:53 +01:00
Kévin Dunglas
ff70902dcb feature #13795 [Serializer] Refactoring of metadata (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Refactoring of metadata

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no (the metadata system will be introduced in 2.7)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

* Add an interface for `ClassMetadata` and `ClassMetadataFactory`
* Add a new `AttributeMetadata` and the corresponding interface to ease add of future features (e.g. type support for deserialization) and to allow custom metadata implementations (e.g. description of an attribute for an hypermedia normalizer - my use case)
* Add tests for news features
* Add new tests for exsiting features

Commits
-------

8534505 [Serializer] Refactoring of metadata
2015-03-06 11:46:49 +01:00
Kévin Dunglas
8534505db5 [Serializer] Refactoring of metadata 2015-03-06 11:33:18 +01:00
Kévin Dunglas
37e0fa18c6 minor #13796 [Serializer] Replace BadMethodCallException by MappingException (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Replace BadMethodCallException by MappingException

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no (`AnnotationLoader` will be introduced in 2.7)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

469b8e7 [Serializer] Replace BadMethodCallException by UnexpectedValueException
2015-03-06 11:22:19 +01:00
Jérôme Tamarelle
e41dcb3acd [FrameworkBundle] Read config/validation/*.(xml|yml) files 2015-03-05 23:00:03 +01:00
Fabien Potencier
700447df8d bug #13806 [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty (ogizanagi)
This PR was merged into the 2.6 branch.

Discussion
----------

[TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty

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

Commits
-------

9689639 [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty
2015-03-05 17:55:29 +01:00
Nicolas Grekas
f885b9b465 Test with local components instead of waiting for the subtree-splitter when possible 2015-03-05 00:16:30 +01:00
Fabien Potencier
b001a79210 feature #13840 [WebProfilerBundle] Update ajax calls in toolbar to add the css error class (rubenrua)
This PR was merged into the 2.7 branch.

Discussion
----------

[WebProfilerBundle] Update ajax calls in toolbar to add the css error class

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

Minor change to improve the toolbar usability. The request method is red when an error response is received:

![toolbar ajax error](https://cloud.githubusercontent.com/assets/195745/6475331/2b390a26-c209-11e4-8dee-ef2e973b57c0.png)

Commits
-------

1ea0f86 [WebProfilerBundle] Update ajax calls in toolbar to add the css error class
2015-03-04 11:12:46 +01:00
Fabien Potencier
f02f3678d0 minor #13839 [Validator] Added missing galician (gl) translations (rubenrua)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13839).

Discussion
----------

[Validator] Added missing galician (gl) translations

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

Commits
-------

ec11915 [Validator] Added missing galician (gl) translations
2015-03-04 07:58:28 +01:00
Ruben Gonzalez
ec11915895 [Validator] Added missing galician (gl) translations 2015-03-04 07:58:27 +01:00
Ruben Gonzalez
1ea0f86d9a [WebProfilerBundle] Update ajax calls in toolbar to add the css error class 2015-03-04 00:30:01 +01:00
Tobias Schultze
0cead0f17a bug #13835 [PropertyAccess] stop overwriting once a reference is reached (3rd) (bananer)
This PR was squashed before being merged into the 2.6 branch (closes #13835).

Discussion
----------

[PropertyAccess] stop overwriting once a reference is reached (3rd)

I commited with a different email address in [PR 13831](https://github.com/symfony/symfony/pull/13831), so here is the third attempt. Also removed unnecessary test as suggested by @Tobion

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | [13731](https://github.com/symfony/symfony/issues/13731)
| License       | MIT
| Doc PR        | none

I added test cases for the scenario described in my issue. After looking through the PropertyAccessor source my conclusion was that there is no reason to overwrite parents of references, so I changed that. None of the previous test cases disagreed and my new tests also passed.

Or maybe I got it all wrong, I'm willing to learn.

Commits
-------

d733a88 [PropertyAccess] stop overwriting once a reference is reached (3rd)
2015-03-03 20:22:24 +01:00
Philip Frank
d733a887df [PropertyAccess] stop overwriting once a reference is reached (3rd) 2015-03-03 20:22:08 +01:00
Tobias Schultze
0e3090b19c minor #13834 [OptionsResolver] Remove Unused Variable from Foreach Cycles (vadim2404)
This PR was merged into the 2.6 branch.

Discussion
----------

[OptionsResolver] Remove Unused Variable from Foreach Cycles

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

Commits
-------

77f4dbf [OptionsResolver] Remove Unused Variable from Foreach Cycles
2015-03-03 20:15:31 +01:00
Vadim Kharitonov
77f4dbfa10 [OptionsResolver] Remove Unused Variable from Foreach Cycles 2015-03-03 17:59:03 +03:00
Nicolas Grekas
b638256ffa minor #13830 [travis] Tests Security sub-components (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Tests Security sub-components

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

Previous PR has been merged too fast :)

Commits
-------

16cdcf2 [travis] Tests Security sub-components
2015-03-03 10:01:25 +01:00
Nicolas Grekas
16cdcf2b94 [travis] Tests Security sub-components 2015-03-03 09:52:27 +01:00
Fabien Potencier
12cf04f8f3 minor #13818 [Serializer] Test that normalizers ignore non-existing attributes. (dunglas)
This PR was squashed before being merged into the 2.7 branch (closes #13818).

Discussion
----------

[Serializer] Test that normalizers ignore non-existing attributes.

| 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

Test the behavior of normalizers when an attribute doesn't exist.

Commits
-------

df0fe30 [Serializer] Test that normalizers ignore non-existing attributes.
2015-03-03 09:32:45 +01:00
Kévin Dunglas
df0fe30896 [Serializer] Test that normalizers ignore non-existing attributes. 2015-03-03 09:32:43 +01:00
Fabien Potencier
eb99c78358 bug #13814 [Twig] bootstrap_3_layout.html.twig is traitable (Dusan Kasan)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #13814).

Discussion
----------

[Twig] bootstrap_3_layout.html.twig is traitable

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

bootstrap_3_layout.html.twig is now traitable in the same way as form_table_layout.html.twig

Commits
-------

4509d36 [Twig] bootstrap_3_layout.html.twig is usable as a trait
2015-03-03 09:30:41 +01:00
Dusan Kasan
4509d36991 [Twig] bootstrap_3_layout.html.twig is usable as a trait 2015-03-03 09:30:40 +01:00
Fabien Potencier
632cc10d01 minor #13827 [Serializer] Fix ClassMetadataFactory PHPDoc (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Fix ClassMetadataFactory PHPDoc

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

0dba547 [Serializer] Fix ClassMetadataFactory PHPDoc
2015-03-03 09:28:49 +01:00
Fabien Potencier
9efec600e0 minor #13819 [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer

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

c41346b [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer
2015-03-03 09:27:38 +01:00
Fabien Potencier
c715cd660a minor #13825 [travis] Tests Security sub-components (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Tests Security sub-components

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

Commits
-------

8aef213 [travis] Tests Security sub-components
2015-03-03 09:23:50 +01:00
Nicolas Grekas
8aef213246 [travis] Tests Security sub-components 2015-03-03 09:13:47 +01:00
Kévin Dunglas
0dba547bc8 [Serializer] Fix ClassMetadataFactory PHPDoc 2015-03-02 23:09:40 +01:00
Kévin Dunglas
c491332e0f minor #13798 [Serializer] rename exception interface (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] rename exception interface

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

Commits
-------

c6bf1de [Serializer] rename exception interface
2015-03-02 22:28:43 +01:00
Fabien Potencier
eb632f3dac minor #13727 CS fixes (keradus)
This PR was squashed before being merged into the 2.3 branch (closes #13727).

Discussion
----------

CS fixes

| 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

Commits
-------

7fd6ba0 CS fixes
2015-03-02 15:15:52 +01:00
Dariusz Ruminski
7fd6ba06b1 CS fixes 2015-03-02 15:15:25 +01:00
Tobias Schultze
755ea09a44 Merge branch '2.6' into 2.7 2015-03-02 11:21:01 +01:00
Tobias Schultze
38a5ebdb05 bug #13816 [OptionsResolver] fix allowed values with null (Tobion)
This PR was merged into the 2.6 branch.

Discussion
----------

[OptionsResolver] fix allowed values with null

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

1. setNormalizers was missing deprecated annotation
2. setAllowedValues/addAllowedValues with `null` was broken because `(array) null === array()`

Commits
-------

cb37fbe [OptionsResolver] fix allowed values with null
e3e9a4d [OptionsResolver] add missing deprecated phpdoc for setNormalizers
2015-03-02 11:19:04 +01:00
Nicolas Grekas
c6bf1dec2e [Serializer] rename exception interface 2015-03-02 10:36:49 +01:00
Kévin Dunglas
c41346baef [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer 2015-03-01 18:38:38 +01:00
Tobias Schultze
cb37fbe707 [OptionsResolver] fix allowed values with null 2015-03-01 03:42:24 +01:00
Tobias Schultze
e3e9a4d269 [OptionsResolver] add missing deprecated phpdoc for setNormalizers 2015-03-01 03:08:17 +01:00
Tobias Schultze
c498389f59 feature #13809 [OptionsResolver] add missing deprecation triggers (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[OptionsResolver] add missing deprecation triggers

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

Commits
-------

9607e82 replace deprecated options resolver uses by new ones
7e9d2e6 [OptionsResolver] add missing deprecation triggers
2015-03-01 00:55:24 +01:00
Tobias Schultze
9607e82c78 replace deprecated options resolver uses by new ones 2015-02-28 13:09:24 +01:00
Tobias Schultze
7e9d2e618b [OptionsResolver] add missing deprecation triggers 2015-02-27 17:11:51 +01:00
Tobias Schultze
469e70d5be [OptionsResolver] remove duplicate deprecation text 2015-02-27 16:20:50 +01:00