Commit Graph

13657 Commits

Author SHA1 Message Date
Fabien Potencier
ef08c07329 Merge branch '2.7' into 2.8
* 2.7:
  fixed CS
  [DomCrawler] Dont use LIBXML_PARSEHUGE by default
  [Filesystem] Reduce complexity of ->remove()
  added tests for non-trusted proxies
  add 'guid' to list of exception to filter out
  Ensure backend slashes for symlinks on Windows systems
  [Filesystem] Try to delete broken symlinks
  fixed tests
  [FrameworkBundle] Test that ObjectNormalizer is registered
2016-03-02 16:25:29 +01:00
Fabien Potencier
29c616274c fixed CS 2016-03-02 16:25:21 +01:00
Fabien Potencier
0544b1f594 Merge branch '2.3' into 2.7
* 2.3:
  [DomCrawler] Dont use LIBXML_PARSEHUGE by default
  [Filesystem] Reduce complexity of ->remove()
  added tests for non-trusted proxies
  add 'guid' to list of exception to filter out
  Ensure backend slashes for symlinks on Windows systems
  [Filesystem] Try to delete broken symlinks
2016-03-02 16:25:10 +01:00
Fabien Potencier
5b577ddd19 bug #17986 [DomCrawler] Dont use LIBXML_PARSEHUGE by default (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] Dont use LIBXML_PARSEHUGE by default

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

Because of http://symfony.com/blog/security-release-symfony-2-0-17-released

Commits
-------

fda32f8 [DomCrawler] Dont use LIBXML_PARSEHUGE by default
2016-03-02 16:22:15 +01:00
Nicolas Grekas
fda32f8c43 [DomCrawler] Dont use LIBXML_PARSEHUGE by default 2016-03-02 15:53:47 +01:00
Fabien Potencier
9a4bf1e099 minor #17985 [Filesystem] Reduce complexity of ->remove() (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Filesystem] Reduce complexity of ->remove()

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

Commits
-------

065acb7 [Filesystem] Reduce complexity of ->remove()
2016-03-02 15:50:41 +01:00
Nicolas Grekas
065acb7fa8 [Filesystem] Reduce complexity of ->remove() 2016-03-02 15:47:46 +01:00
ged15
e0e82bb318 added tests for non-trusted proxies 2016-03-02 15:42:41 +01:00
Nicole Cordes
d897956362 Ensure backend slashes for symlinks on Windows systems
Resolves: #17614
2016-03-02 14:40:59 +01:00
Nicole Cordes
8442ab1b99 [Filesystem] Try to delete broken symlinks
If you delete the target of a symlink (at least on Windows systems) you
don't get the kind of the target anymore (obviously). Therefore it might
happen that a broken symlink to a directory should be removed with
unlink() which fails. This patch adds another check for a broken symlink
and tries to remove with rmdir() before throwing an exception. It helps
to clean up test folders on Windows systems (so already proofed by the
existing tests).
2016-03-02 14:09:33 +01:00
Fabien Potencier
fdabbaa24f Merge branch '2.7' into 2.8
* 2.7:
  [Form] [ChoiceType] Prefer placeholder to empty_value
  Add missing RFC comment
  ensure dump indentation to be greather than zero
2016-03-02 11:10:16 +01:00
Fabien Potencier
54bca3f891 Merge branch '2.3' into 2.7
* 2.3:
  Add missing RFC comment
  ensure dump indentation to be greather than zero
2016-03-02 11:10:06 +01:00
Fabien Potencier
81b59b9eca bug #17978 [Yaml] ensure dump indentation to be greather than zero (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] ensure dump indentation to be greather than zero

| Q             | A
| ------------- | ---
| Branch        | 2.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/17943#issuecomment-190881815, #17977
| License       | MIT
| Doc PR        |

Commits
-------

3464282 ensure dump indentation to be greather than zero
2016-03-02 11:08:25 +01:00
Fabien Potencier
d6a189b405 bug #16886 [Form] [ChoiceType] Prefer placeholder to empty_value (boite)
This PR was squashed before being merged into the 2.7 branch (closes #16886).

Discussion
----------

[Form] [ChoiceType] Prefer placeholder to empty_value

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

Prefer an explicitly set `placeholder` option (i.e. `false` or a non-empty
string) to an `empty_value` option when both are set.

The fix is to change the behaviour in the placeholder normalizer in
ChoiceType::configureOptions so that the value of the `empty_value` option is
used for placeholder only when the value of `placeholder` is null or an empty
string.

Commits
-------

a4d4c8a [Form] [ChoiceType] Prefer placeholder to empty_value
2016-03-02 10:54:50 +01:00
boite
a4d4c8aa0f [Form] [ChoiceType] Prefer placeholder to empty_value 2016-03-02 10:54:49 +01:00
Diego Saint Esteben
79013072f3 Add missing RFC comment 2016-03-01 21:02:26 -03:00
Christian Flothmann
3464282bd1 ensure dump indentation to be greather than zero 2016-03-01 21:23:51 +01:00
Fabien Potencier
96aaf4f42e Merge branch '2.7' into 2.8
* 2.7:
  [From] minor fix tests added by #17798 for bootstrap theme
2016-03-01 18:37:11 +01:00
Fabien Potencier
7c3e4cf181 minor #17973 [From] minor fix tests added by #17798 for bootstrap theme (HeahDude)
This PR was merged into the 2.7 branch.

Discussion
----------

[From] minor fix tests added by #17798 for bootstrap theme

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

Commits
-------

ee5b119 [From] minor fix tests added by #17798 for bootstrap theme
2016-03-01 18:36:56 +01:00
Fabien Potencier
70bb9bb27f Merge branch '2.7' into 2.8
* 2.7:
  fix debug toolbar rendering by removing inadvertently added links
  simplified code
  Allow variadic controller parameters to be resolved.
2016-03-01 18:35:28 +01:00
Fabien Potencier
c6b68924a0 Merge branch '2.3' into 2.7
* 2.3:
  fix debug toolbar rendering by removing inadvertently added links
  simplified code
  Allow variadic controller parameters to be resolved.
2016-03-01 18:34:38 +01:00
Jules Pietri
fb233e2513 [Form] minor fix tests of Bootstrap layout 2016-03-01 14:56:55 +01:00
Jules Pietri
ee5b119ac6 [From] minor fix tests added by #17798 for bootstrap theme 2016-03-01 14:36:27 +01:00
Fabien Potencier
bedcb151b8 simplified code 2016-03-01 12:09:54 +01:00
Albin Kerouaton
f39afc85db Allow variadic controller parameters to be resolved. 2016-03-01 12:09:54 +01:00
Fabien Potencier
eab5d30b1e bug #17876 [DependencyInjection] Fixing autowiring bug when some args are set (weaverryan)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Fixing autowiring bug when some args are set

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

This fixes #17724 & #17878.

**#17724**

I've set this against the 2.8 branch because imo it's a bug fix. The [test](https://github.com/symfony/symfony/compare/2.8...weaverryan:auto-wiring-individuals?expand=1#diff-d124c3d39cd5f7c732fb3d3be7a8cb42R298) illustrates the bug - having *some* arguments set beforehand caused auto-wired arguments to be set on the wrong index.

**#17878**

I've also included this fix just to get all the weird ordering problems taken care of at once. I don't think this is a behavior change - autowiring with scalars only worked previously if the argument was optional (still works now) or if you specified that argument explicitly (still works). Otherwise, your argument ordering would have gotten messed up.

Commits
-------

260731b minor changes
865f202 [#17878] Fixing a bug where scalar values caused invalid ordering
cf692a6 [#17724] Fixing autowiring bug where if some args are set, new ones are put in the wrong spot
2016-03-01 11:17:55 +01:00
Fabien Potencier
1a77a44d8f Merge branch '2.7' into 2.8
* 2.7:
  Improved Bootstrap form theme for hidden fields
  bumped Symfony version to 2.7.11
  updated VERSION for 2.7.10
  updated CHANGELOG for 2.7.10
2016-03-01 08:29:35 +01:00
Fabien Potencier
df4cc40082 bug #17568 Improved Bootstrap form theme for hidden fields (javiereguiluz)
This PR was squashed before being merged into the 2.7 branch (closes #17568).

Discussion
----------

Improved Bootstrap form theme for hidden fields

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

Commits
-------

ba5d7f9 Improved Bootstrap form theme for hidden fields
2016-03-01 08:14:37 +01:00
Javier Eguiluz
ba5d7f99e9 Improved Bootstrap form theme for hidden fields 2016-03-01 08:14:36 +01:00
Ryan Weaver
260731b806 minor changes 2016-02-28 19:33:45 -05:00
Ryan Weaver
865f2029fd [#17878] Fixing a bug where scalar values caused invalid ordering 2016-02-28 19:31:09 -05:00
Ryan Weaver
cf692a6bd8 [#17724] Fixing autowiring bug where if some args are set, new ones are put in the wrong spot 2016-02-28 19:31:09 -05:00
Fabien Potencier
aadaeecb47 bumped Symfony version to 2.8.4 2016-02-28 22:27:55 +01:00
Fabien Potencier
9f5c8ea99d updated VERSION for 2.8.3 2016-02-28 22:06:17 +01:00
Fabien Potencier
cc198dfff1 bumped Symfony version to 2.7.11 2016-02-28 22:00:57 +01:00
Fabien Potencier
e23be1c90c updated VERSION for 2.7.10 2016-02-28 21:37:08 +01:00
Fabien Potencier
baf35cf3c0 bumped Symfony version to 2.3.39 2016-02-28 20:26:02 +01:00
Fabien Potencier
84203be720 updated VERSION for 2.3.38 2016-02-28 19:24:04 +01:00
Fabien Potencier
4b3a534f3e Merge branch '2.7' into 2.8
* 2.7:
  fixed tests
2016-02-28 17:34:46 +01:00
Fabien Potencier
2fc80cce12 fixed tests 2016-02-28 17:34:40 +01:00
Fabien Potencier
caf2871b87 Merge branch '2.7' into 2.8
* 2.7:
  #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features
  Fix bug when using an private aliased factory service
  ChoiceFormField of type "select" could be "disabled"
  Update contributing docs
  [Console] Fix escaping of trailing backslashes
  Fix constraint validator alias being required
  [ci] clone with depth=1 to kill push-forced PRs
  Add check on If-Range header
2016-02-28 17:20:50 +01:00
Fabien Potencier
51a71ab74a Merge branch '2.3' into 2.7
* 2.3:
  #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features
  Fix bug when using an private aliased factory service
  ChoiceFormField of type "select" could be "disabled"
  Update contributing docs
  [Console] Fix escaping of trailing backslashes
  Fix constraint validator alias being required
  [ci] clone with depth=1 to kill push-forced PRs
  Add check on If-Range header
2016-02-28 17:19:47 +01:00
WouterJ
de406c0e38 Fix bug when using an private aliased factory service 2016-02-28 16:06:53 +01:00
Jules Pietri
feed60785e [Form] fix FQCN in tests added by #17798 2016-02-28 16:05:09 +01:00
Fabien Potencier
82eb951186 Merge branch '2.7' into 2.8
* 2.7:
  bug #17798 [Form] allow `choice_label` option to be `false`
2016-02-28 15:59:45 +01:00
Jules Pietri
017e1d9e6e bug #17798 [Form] allow choice_label option to be false
When `ChoiceType`is expanded, `choice_label` option can be `false`
or return `false` for one or more choices by a callable.
2016-02-26 16:42:52 +01:00
Fabien Potencier
cc9f6b0a95 minor #17900 [DependencyInjection] Simplified code in AutowirePass (hason)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Simplified code in AutowirePass

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

Commits
-------

ce0357e [DependencyInjection] Simplified code in AutowirePass
2016-02-26 07:30:51 +01:00
Jules Pietri
acdd7db377 [Form] fix tests added by #17760 with FQCN 2016-02-26 07:14:25 +01:00
Fabien Potencier
e899fa3f10 Merge branch '2.7' into 2.8
* 2.7:
  [Security] added some tests
2016-02-26 07:05:14 +01:00
Fabien Potencier
7aec568c05 [Security] added some tests 2016-02-26 07:03:43 +01:00