Commit Graph

23344 Commits

Author SHA1 Message Date
Nicolas Grekas
f863e6af9a Fix merge 2015-10-24 17:25:13 +02:00
Nicolas Grekas
3e923d0726 Merge branch '2.8'
* 2.8:
  remove wrong api tag that was introduced
  [travis] Reduce composer.json merge conflicts on per-components tests
2015-10-24 17:21:06 +02:00
Nicolas Grekas
3e38e64113 Merge branch '2.7' into 2.8
* 2.7:
  [travis] Reduce composer.json merge conflicts on per-components tests
2015-10-24 17:20:42 +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
4c824cd481 remove wrong api tag that was introduced 2015-10-23 22:50:51 +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
48b25f5251 Merge branch '2.8'
* 2.8:
  Fix the FrameworkBundle dependencies
  [DoctrineBridge] Fix required guess of boolean fields
  [DI] don't use array_map to resolve services
  Remove dead code in the PropertyPath constructor
  [EventDispatcher] fix docblock
  [Process] Inherit env vars by default in PhpProcess
  Changed one console output style to avoid visual issues
  [VarDumper] Fix return type and anonymous classes dumping
  [FrameworkBundle] PropertyInfo support
  [HttpFoundation] Fixes /0 subnet handling in IpUtils
  [Form] Simplify DateTimeToStringTransformer Avoid unneeded catch and re-throw of the same exception.
  [Minor] [Serializer] Removed second license header
  [TwigBundle] added a Twig templates warmer when templating is disabled
  [HttpKernel] Remove a duplicate test for the EsiFragmentRenderer
  [Templating] deprecate low-level RouterHelper::generate method as it's cumbersome to use constants in templates
  [Templating] introduce path and url methods in php templates to be in line with twig templates
  [Routing] deprecate the old url generator reference type values
  [Routing] use constant in a test that is new in 2.7
  [FrameworkBundle] Add a new ClassCache cache warmer
  [Validator] Add expressionLanguage to ExpressionValidator constructor

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/BrowserKit/composer.json
	src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
	src/Symfony/Component/EventDispatcher/EventDispatcher.php
2015-10-23 17:08:51 +02:00
Nicolas Grekas
dee62e7916 Merge branch '2.7' into 2.8
* 2.7:
  [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
  Changed one console output style to avoid visual issues
  [VarDumper] Fix return type and anonymous classes dumping
  [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/BrowserKit/composer.json
	src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
2015-10-23 16:52:08 +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
3bdcfb9538 feature #16301 [EventDispatcher] add method getListenerPriority() to interface (xabbuh)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[EventDispatcher] add method getListenerPriority() to interface

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

Commits
-------

f8019c8 add method getListenerPriority() to interface
2015-10-23 15:29:52 +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
Tobias Schultze
b8e7bb534d bug #16321 Fix the FrameworkBundle dependencies (stof)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix the FrameworkBundle dependencies

| 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

Due to the new ClassCacheCacheWarmer, the ClassLoader component is now a
required dependency of the bundle.

See the current test failures for component builds (TwigBundle and SecurityBundle tests are triggering fatal errors because of the missing class)

Commits
-------

02584c2 Fix the FrameworkBundle dependencies
2015-10-23 14:26:17 +02:00
Christophe Coevoet
02584c26bf Fix the FrameworkBundle dependencies
Due to the new ClassCacheCacheWarmer, the ClassLoader component is now a
required dependency of the bundle.
2015-10-23 12:11:50 +02: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
Fabien Potencier
47b64c2fea minor #16308 [Form] remove obsolete private method in factory (Tobion)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Form] remove obsolete private method in factory

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

This method is not used anymore in 3.0

Commits
-------

6efcd8b [Form] remove obsolete private method in factory
2015-10-23 09:33:01 +02:00
Tobias Schultze
2de220ad57 minor #16300 [EventDispatcher] fix docblock (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[EventDispatcher] fix docblock

| Q             | A
| ------------- | ---
| Fixed tickets | https://github.com/symfony/symfony/pull/16198#discussion_r41857529
| License       | MIT

Commits
-------

6e515fb [EventDispatcher] fix docblock
2015-10-22 22:57:41 +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
6efcd8b2ba [Form] remove obsolete private method in factory 2015-10-22 01:41:35 +02:00
Christian Flothmann
f8019c80b4 add method getListenerPriority() to interface 2015-10-20 19:32:54 +02:00
Christian Flothmann
6e515fbc21 [EventDispatcher] fix docblock 2015-10-20 19:27:01 +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
Fabien Potencier
99de3fd49d feature #12119 [Console] Add progress indicator helper (kbond)
This PR was squashed before being merged into the 3.0-dev branch (closes #12119).

Discussion
----------

[Console] Add progress indicator helper

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

This is an alternative to the `ProgressBar` helper *without a max* inspired by the `npm` cli.  You can use the `ProgressBar` but IMO it doesn't look great or fallback nicely in non-ansi environments.

A lot of work needs to be done still but thought I would get some comments on this idea.

##### Example code

```php
$progress = new ProgressIndicator($output);
$progress->start('Starting...');

for ($i = 0; $i < 100; $i++) {
    usleep(25000);
    $progress->advance();

    switch ($i) {
        case 20:
            $progress->setMessage('Just started...');
            break;
        case 50:
            $progress->setMessage('Half way...');
            break;
        case 90:
            $progress->setMessage('Almost Done...');
            break;
    }
}

$progress->finish('Done.');
```

##### Screenshot

![output](https://cloud.githubusercontent.com/assets/127811/4511167/95302026-4b31-11e4-824e-5cb26f96e4cb.gif)

Commits
-------

abf389c [Console] Add progress indicator helper
2015-10-19 23:13:46 +02:00
Kevin Bond
abf389cd2d [Console] Add progress indicator helper 2015-10-19 23:13:41 +02:00
Nicolas Grekas
b42b03a62b [VarDumper] Fix return type and anonymous classes dumping 2015-10-19 20:09:55 +02:00
Fabien Potencier
87f83f7824 feature #15966 [FrameworkBundle] PropertyInfo support (dunglas)
This PR was squashed before being merged into the 2.8 branch (closes #15966).

Discussion
----------

[FrameworkBundle] PropertyInfo support

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

Commits
-------

f84a92a [FrameworkBundle] PropertyInfo support
2015-10-19 14:05:34 +02:00
Kévin Dunglas
f84a92a601 [FrameworkBundle] PropertyInfo support 2015-10-19 14:05:32 +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
cb273537ee feature #16161 [Validator] Add expressionLanguage to ExpressionValidator constructor (enumag)
This PR was merged into the 2.8 branch.

Discussion
----------

[Validator] Add expressionLanguage to ExpressionValidator constructor

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

Commits
-------

4ad1e20 [Validator] Add expressionLanguage to ExpressionValidator constructor
2015-10-19 13:49:28 +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
43026f9846 feature #16263 [FrameworkBundle] Add a new ClassCache cache warmer (tucksaun)
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle] Add a new ClassCache cache warmer

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

This new cache warmer allows to remove the known slowness of the first hit of a Symfony application (even when cache has been warmed up). This also allows to make a Symfony application runnable on a read-only filesystem (like in a Docker container for example)

Commits
-------

b570d6c [FrameworkBundle] Add a new ClassCache cache warmer
2015-10-19 11:59:50 +02:00
Fabien Potencier
b9c0fe4ca3 minor #16284 [Minor] [Serializer] Removed second license header (derrabus)
This PR was merged into the 2.8 branch.

Discussion
----------

[Minor] [Serializer] Removed second license header

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

PR #15918 added a second license header to the `ArrayDenormalizer` file. One license header is probably enough.

Commits
-------

dee3be3 [Minor] [Serializer] Removed second license header
2015-10-19 11:53:21 +02:00
Fabien Potencier
4618f0b3cf feature #16271 [TwigBundle] added a Twig templates warmer when templating is disabled (fabpot)
This PR was merged into the 2.8 branch.

Discussion
----------

[TwigBundle] added a Twig templates warmer when templating is disabled

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

When disabling the templating component, Twig templates are not warmed up as the warmer depends on the template finder which needs the templating component. This PR adds a new cache warmer that covers this case.

see #16262

Commits
-------

bd3701b [TwigBundle] added a Twig templates warmer when templating is disabled
2015-10-19 11:51:31 +02:00
Alexander M. Turek
dee3be3198 [Minor] [Serializer] Removed second license header
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none

PR #15918 added a second license header to the `ArrayDenormalizer` file. One license header is probably enough.
2015-10-19 11:36:16 +02:00
Fabien Potencier
bd3701b30f [TwigBundle] added a Twig templates warmer when templating is disabled 2015-10-19 11:33:50 +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
Fabien Potencier
17053705b4 feature #16276 Unify URL generator reference type + make linking in php templates consistent with twig (Tobion)
This PR was merged into the 2.8 branch.

Discussion
----------

Unify URL generator reference type + make linking in php templates consistent with twig

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

Please see ticket.
Please merge #16277 first. I will then rebase this to make tests pass.

Commits
-------

388fa43 [Templating] deprecate low-level RouterHelper::generate method as it's cumbersome to use constants in templates
97d6828 [Templating] introduce path and url methods in php templates to be in line with twig templates
912fc4d [Routing] deprecate the old url generator reference type values
2015-10-19 11:30:00 +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
388fa43f42 [Templating] deprecate low-level RouterHelper::generate method as it's cumbersome to use constants in templates 2015-10-18 22:34:17 +02:00
Tobias Schultze
97d6828b51 [Templating] introduce path and url methods in php templates to be in line with twig templates 2015-10-18 22:34:16 +02:00
Tobias Schultze
912fc4de8f [Routing] deprecate the old url generator reference type values 2015-10-18 22:34:15 +02:00