Commit Graph

22482 Commits

Author SHA1 Message Date
Fabien Potencier
dd9de5be75 bug #16144 [Security] don't allow to install the split Security packages (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] don't allow to install the split Security packages

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

Currently, you would be able to install the Security component fromm
Symfony 2.3 together with one of the split packages from a higher
Symfony vesion like this:

```json
{
    "require": {
        "symfony/symfony": "2.3.*",
        "symfony/security-core": "~2.7"
    }
}
```

However, you will end up with classes being present twice.

This must be reverted after merging up in the `2.7` branch.

Commits
-------

0d14064 don't allow to install the split Security packages
2015-10-27 18:53:37 -07:00
Nicolas Grekas
e6c89f15e4 Use mb_detect_encoding with $strict = true 2015-10-28 00:14:24 +01:00
Christian Flothmann
0d140642e0 don't allow to install the split Security packages
Currently, you would be able to install the Security component fromm
Symfony 2.3 together with one of the split packages from a higher
Symfony vesion like this:

```json
{
    "require": {
        "symfony/symfony": "2.3.*",
        "symfony/security-core": "~2.7"
    }
}
```

However, you will end up with classes being present twice.

This must be reverted after merging up in the `2.7` branch.
2015-10-27 21:57:16 +01:00
Fabien Potencier
07439f41c7 bumped Symfony version to 2.7.7 2015-10-27 13:02:17 -07:00
Fabien Potencier
66b2e9662c Merge pull request #16357 from fabpot/release-2.7.6
released v2.7.6
2015-10-27 20:07:24 +01:00
Fabien Potencier
88db7c059e updated VERSION for 2.7.6 2015-10-27 12:07:21 -07:00
Fabien Potencier
71d9fdc1f8 updated CHANGELOG for 2.7.6 2015-10-27 12:07:14 -07:00
Fabien Potencier
acf9d7e65c bumped Symfony version to 2.3.35 2015-10-27 11:54:58 -07:00
Fabien Potencier
d1d97bc91c Merge pull request #16356 from fabpot/release-2.3.34
released v2.3.34
2015-10-27 18:11:03 +01:00
Fabien Potencier
3a8e49d840 updated VERSION for 2.3.34 2015-10-27 09:29:44 -07:00
Fabien Potencier
e94dedb81d update CONTRIBUTORS for 2.3.34 2015-10-27 09:29:43 -07:00
Fabien Potencier
2de47709c1 updated CHANGELOG for 2.3.34 2015-10-27 09:29:35 -07:00
Fabien Potencier
ced865deb1 Merge branch '2.3' into 2.7
* 2.3:
  fixed YAML files missing quotes when a string starts with @
  [Routing] mark internal classes
  [Translation][Csv file] remove unnecessary statements, for better readability.
  [Form] remove validation of FormRegistry::getType as FormRegistry::hasType does not validate either
2015-10-27 08:38:06 -07:00
Fabien Potencier
95ff0bc5fd minor #16353 fixed YAML files missing quotes when a string starts with @ (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed YAML files missing quotes when a string starts with @

| 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

Commits
-------

e36fea8 fixed YAML files missing quotes when a string starts with @
2015-10-27 08:33:53 -07:00
Nicolas Grekas
437e268036 [travis] Fail early when an invalid composer.json is found 2015-10-27 16:22:59 +01:00
Fabien Potencier
e8ba93b0d2 minor #16320 [Translation][Csv loader] remove unnecessary statements, for better readability. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translation][Csv loader] remove unnecessary statements, for better readability.

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

Commits
-------

47b8c3e [Translation][Csv file] remove unnecessary statements, for better readability.
2015-10-27 08:09:41 -07:00
Fabien Potencier
f042197e10 bug #16338 [VarDumper] Fix anonymous class dumping (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Fix anonymous class dumping

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

Follows a comment from @stof

Commits
-------

65da4d5 [VarDumper] Fix anonymous class dumping
2015-10-27 08:06:34 -07:00
Fabien Potencier
e36fea8a63 fixed YAML files missing quotes when a string starts with @ 2015-10-26 13:58:42 +01:00
Nicolas Grekas
65da4d5104 [VarDumper] Fix anonymous class dumping 2015-10-25 18:17:38 +01:00
Fabien Potencier
2d588710ff minor #16309 [Form] remove type check in FormRegistry::getType (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] remove type check in FormRegistry::getType

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

remove validation of `FormRegistry::getType` as `FormRegistry::hasType` does not validate either. So `hasType` currently triggers a PHP warning with a wrong argument.
also developers do not work with the registry directly anyway but through the factory. and the factory already validates the value. So this validation is useless in reality.

Commits
-------

d37b9e6 [Form] remove validation of FormRegistry::getType as FormRegistry::hasType does not validate either
2015-10-25 17:34:32 +01:00
Fabien Potencier
ef242afedc minor #16329 [Routing] mark internal classes (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] mark internal classes

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

These classes are an implementation detail of the PhpMatcherDumper that should not be relied upon.

Commits
-------

f1d3e87 [Routing] mark internal classes
2015-10-25 17:28:48 +01:00
Fabien Potencier
1bdd127938 fixed Twig deprecation notices 2015-10-24 22:26:02 +02:00
Nicolas Grekas
6227409060 Merge branch '2.3' into 2.7
* 2.3:
  [travis] Reduce composer.json merge conflicts on per-components tests
2015-10-24 17:20:18 +02:00
Nicolas Grekas
7456a8a112 minor #16327 [travis] Reduce composer.json merge conflicts on per-components tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Reduce composer.json merge conflicts on per-components tests

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

json_decoding then re-encoding doesn't preserve the exact structure and leads to merge conflicts when testing deps=2.8. Simpler by-replace injection works better here. This fixes the issue happening on master right now.

Commits
-------

425eb8c [travis] Reduce composer.json merge conflicts on per-components tests
2015-10-24 17:19:59 +02:00
Tobias Schultze
f1d3e87a12 [Routing] mark internal classes 2015-10-24 14:07:54 +02:00
Nicolas Grekas
425eb8c5b7 [travis] Reduce composer.json merge conflicts on per-components tests 2015-10-23 18:38:57 +02:00
Nicolas Grekas
86b99ab64a Merge branch '2.3' into 2.7
* 2.3:
  [DoctrineBridge] Fix required guess of boolean fields
  [DI] don't use array_map to resolve services
  Remove dead code in the PropertyPath constructor
  [Process] Inherit env vars by default in PhpProcess
  [HttpFoundation] Fixes /0 subnet handling in IpUtils
  [Form] Simplify DateTimeToStringTransformer Avoid unneeded catch and re-throw of the same exception.
  [HttpKernel] Remove a duplicate test for the EsiFragmentRenderer

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2015-10-23 16:47:27 +02:00
Tobias Schultze
297a017f2e bug #16288 [Process] Inherit env vars by default in PhpProcess (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Inherit env vars by default in PhpProcess

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

This is the cause of our failures on Windows, where the SYSTEMROOT env var is mandatory for mcrypt_create_iv to work.
I don't know why the browserkit client is run with no env inheritance and this looks like a bug.
Same for PhpProcess emptying the env by default, this looks like a bug, esp. since the parent `Process` class defaults to inheriting the env.
Tests are not broken by this change.

Commits
-------

ab8cc29 [Process] Inherit env vars by default in PhpProcess
2015-10-23 14:28:10 +02:00
Abdellatif Ait boudad
47b8c3ef3e [Translation][Csv file] remove unnecessary statements, for better readability. 2015-10-23 09:44:09 +00:00
Fabien Potencier
73d9dab69f bug #16302 [DoctrineBridge] Fix required guess of boolean fields (enumag)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16302).

Discussion
----------

[DoctrineBridge] Fix required guess of boolean fields

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

Commits
-------

b21d498 [DoctrineBridge] Fix required guess of boolean fields
2015-10-23 09:39:54 +02:00
Jáchym Toušek
b21d498fd3 [DoctrineBridge] Fix required guess of boolean fields 2015-10-23 09:39:54 +02:00
Tobias Schultze
d0e88caacb minor #16310 Remove dead code in the PropertyPath constructor (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Remove dead code in the PropertyPath constructor

| 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

Custom singulars have been removed from the component before merging it in Symfony, but the code parsing them was only removed partially.

Commits
-------

ad4d0eb Remove dead code in the PropertyPath constructor
2015-10-22 22:30:16 +02:00
Tobias Schultze
8403028a16 bug #16298 Changed one console output style to avoid visual issues (javiereguiluz)
This PR was merged into the 2.7 branch.

Discussion
----------

Changed one console output style to avoid visual issues

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

Read [this comment](https://github.com/symfony/symfony/issues/16257#issuecomment-149205104) for the rationale behind this change.

Commits
-------

3c4e458 Changed one console output style to avoid visual issues
2015-10-22 22:26:31 +02:00
Tobias Schultze
594d8be44b minor #16315 [DI] don't use array_map to resolve services (hadriengem)
This PR was merged into the 2.3 branch.

Discussion
----------

[DI] don't use array_map to resolve services

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

Commits
-------

0249f2f [DI] don't use array_map to resolve services
2015-10-22 22:22:48 +02:00
hadriengem
0249f2f295 [DI] don't use array_map to resolve services 2015-10-22 17:08:54 +02:00
Christophe Coevoet
ad4d0eb79a Remove dead code in the PropertyPath constructor
Custom singulars have been removed from the component before merging it
in Symfony, but the code parsing them was only removed partially.
2015-10-22 09:58:49 +02:00
Tobias Schultze
d37b9e699d [Form] remove validation of FormRegistry::getType as FormRegistry::hasType does not validate either
also developers do not work with the registry directly anyway but through the factory. and the factory already validates the value.
2015-10-22 02:46:43 +02:00
Nicolas Grekas
ab8cc29814 [Process] Inherit env vars by default in PhpProcess 2015-10-20 18:32:03 +02:00
Javier Eguiluz
3c4e45826c Changed one console output style to avoid visual issues 2015-10-20 16:38:46 +02:00
Fabien Potencier
f5f69a3d19 bug #16291 [VarDumper] Fix return type and anonymous classes dumping (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Fix return type and anonymous classes dumping

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

I missed that `getReturnType` returns a `ReflectionType` instance that should be casted to string.

Commits
-------

b42b03a [VarDumper] Fix return type and anonymous classes dumping
2015-10-20 08:11:23 +02:00
Nicolas Grekas
b42b03a62b [VarDumper] Fix return type and anonymous classes dumping 2015-10-19 20:09:55 +02:00
Fabien Potencier
613910bc9f bug #16177 [HttpFoundation] Fixes /0 subnet handling in IpUtils (ultrafez)
This PR was squashed before being merged into the 2.3 branch (closes #16177).

Discussion
----------

[HttpFoundation] Fixes /0 subnet handling in IpUtils

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

Fixes bug #16055. For IP addresses with CIDR subnet length 0, the IP address must be valid - IPs with subnet masks greater than zero are implicitly validated due to the use of `ip2long` and `substr_compare` (although it's not particularly robust - there could be some future work to improve this here).

Commits
-------

d9ac571 [HttpFoundation] Fixes /0 subnet handling in IpUtils
2015-10-19 13:54:32 +02:00
Alex Silcock
d9ac57123d [HttpFoundation] Fixes /0 subnet handling in IpUtils 2015-10-19 13:54:29 +02:00
Fabien Potencier
66c99a0b95 minor #16238 [Form] Remove unneeded catch and re-throw in DateTimeToStringTransformer (MisatoTremor)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16238).

Discussion
----------

[Form] Remove unneeded catch and re-throw in DateTimeToStringTransformer

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

Also fixed PHPDoc param for ``transform``.

Commits
-------

2c9b283 [Form] Simplify DateTimeToStringTransformer Avoid unneeded catch and re-throw of the same exception.
2015-10-19 13:40:25 +02:00
Steffen Roßkamp
2c9b283e01 [Form] Simplify DateTimeToStringTransformer
Avoid unneeded catch and re-throw of the same exception.
2015-10-19 13:40:24 +02:00
Fabien Potencier
c94f18693e minor #16281 [HttpKernel] Remove a duplicate test for the EsiFragmentRenderer (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Remove a duplicate test for the EsiFragmentRenderer

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

Since the request was made a required argument to the `render()` method in #6829, this [test became a duplicate](23f51450bd/src/Symfony/Component/HttpKernel/Tests/RenderingStrategy/EsiRenderingStrategyTest.php (L28-L38)) of `testRenderFallbackToInlineStrategyIfEsiNotSupported()`.

Commits
-------

44d57a3 [HttpKernel] Remove a duplicate test for the EsiFragmentRenderer
2015-10-19 11:31:14 +02:00
Jakub Zalas
44d57a340f [HttpKernel] Remove a duplicate test for the EsiFragmentRenderer
Since the request was made a required argument to the `render()` method in #6829, this test became a duplicate of `testRenderFallbackToInlineStrategyIfEsiNotSupported()`.
2015-10-18 21:45:35 +01:00
Tobias Schultze
80182faf0f [Routing] use constant in a test that is new in 2.7 2015-10-18 22:32:44 +02:00
Fabien Potencier
fa6c58c90d Merge branch '2.3' into 2.7
* 2.3:
  [Routing] use constants in tests
  [Validator] Allow an empty path in a URL with only a fragment or a query
  [HttpFoundation] Fix some typo in the Request doc
  fixed CS
  Added separated handling of root paths
2015-10-18 22:23:18 +02:00
Fabien Potencier
2f205d47a6 minor #16277 [Routing] use constants in tests (Tobion)
This PR was squashed before being merged into the 2.3 branch (closes #16277).

Discussion
----------

[Routing] use constants in tests

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

Use constants in tests instead of hardcoded values in preparation for #16276

Commits
-------

608c8d2 [Routing] use constants in tests
2015-10-18 22:22:26 +02:00