Commit Graph

26308 Commits

Author SHA1 Message Date
Nicolas Grekas 98303d34a1 Merge branch '3.0' into 3.1
* 3.0:
  [travis] Don't use parallel on HHVM
  [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows
  Skip some tests on HHVM due to a PHPunit bug
  Use the Trusty Travis infrastructure for HHVM builds
  Add 3.1 to  PR template branch row, remove 2.3
  Improve memory efficiency
  document method name changes in Voter class

Conflicts:
	.travis.yml
2016-06-03 13:12:53 +02:00
Nicolas Grekas ef078ca41c Merge branch '2.8' into 3.0
* 2.8:
  [travis] Don't use parallel on HHVM
  [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows
  Skip some tests on HHVM due to a PHPunit bug
  Use the Trusty Travis infrastructure for HHVM builds
  Add 3.1 to  PR template branch row, remove 2.3
  Improve memory efficiency
  document method name changes in Voter class

Conflicts:
	.travis.yml
	UPGRADE-3.0.md
	src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php
2016-06-03 13:11:05 +02:00
Nicolas Grekas 5a560f1d12 Merge branch '2.7' into 2.8
* 2.7:
  [travis] Don't use parallel on HHVM
  [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows
  Skip some tests on HHVM due to a PHPunit bug
  Use the Trusty Travis infrastructure for HHVM builds
  Add 3.1 to  PR template branch row, remove 2.3
  Improve memory efficiency
2016-06-03 13:06:57 +02:00
Nicolas Grekas e1b7bd2d67 minor #18945 [Security] LdapUserProvider: add missing argument type doc (xabbuh)
This PR was merged into the 3.1 branch.

Discussion
----------

[Security] LdapUserProvider: add missing argument type doc

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

Commits
-------

bff9c36 LdapUserProvider: add missing argument type doc
2016-06-03 13:02:38 +02:00
Nicolas Grekas a004fc7526 minor #18932 Improve memory efficiency (Dword123)
This PR was merged into the 2.7 branch.

Discussion
----------

Improve memory efficiency

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

This avoids concatenating `$message` and `PHP_EOL` (if necessary) as a new value, greatly improving memory efficiency for large `$message`s.

Commits
-------

c1df9f2 Improve memory efficiency
2016-06-03 13:01:18 +02:00
Nicolas Grekas 9d79a401a4 minor #18962 [travis] Don't use parallel on HHVM (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[travis] Don't use parallel on HHVM

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

Targeting a speedup of the HHVM matrix line especially.

Commits
-------

346149e [travis] Don't use parallel on HHVM
2016-06-03 12:56:46 +02:00
Nicolas Grekas 346149e7c8 [travis] Don't use parallel on HHVM 2016-06-03 12:05:53 +02:00
Fabien Potencier 22aa620e80 bug #18954 [3.1][HttpKernel] Fix RequestDataCollector starting the session (romainneutron)
This PR was merged into the 3.1 branch.

Discussion
----------

[3.1][HttpKernel] Fix RequestDataCollector starting the session

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

The RequestDataCollector starts a non-started session on kernel response. This produces bug #18951
I'm not sure if this is the right fix, let's discuss it.

Commits
-------

ab62dcf [HttpKernel] Fix RequestDataCollector starting the session
2016-06-03 10:45:02 +02:00
Romain Neutron ab62dcf3f4 [HttpKernel] Fix RequestDataCollector starting the session 2016-06-03 10:33:12 +02:00
Nicolas Grekas c4149a40fb minor #18947 Run an uptodate version of HHVM on Travis (stof)
This PR was merged into the 2.7 branch.

Discussion
----------

Run an uptodate version of HHVM on Travis

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

Using the Trusty infrastructure allows running an uptodate version of HHVM rather than running the latest version supporting Precise, which is very old.
It relies on an undocumented feature of the Travis config file, namely the fact that ``matrix.include`` actually allows to overwrite everything from the config file (it is merged with the main config), even though the Travis linter complains about it. I think it is fine to use this and to replace it with an official approach once there is one.

Refs #18922

Commits
-------

e6956c9 Skip some tests on HHVM due to a PHPunit bug
e041da0 Use the Trusty Travis infrastructure for HHVM builds
2016-06-03 10:03:59 +02:00
Nicolas Grekas 553855b931 minor #18960 [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows

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

As in e.g. https://ci.appveyor.com/project/fabpot/symfony/build/1.0.9382#L1505

Commits
-------

574f4e4 [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows
2016-06-03 10:03:11 +02:00
Nicolas Grekas 574f4e4147 [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows 2016-06-03 09:48:37 +02:00
Fabien Potencier eced97bf51 minor #18939 [FrameworkBundle] Skip redis cache pools test on failed connection (chalasr)
This PR was squashed before being merged into the 3.1 branch (closes #18939).

Discussion
----------

[FrameworkBundle] Skip redis cache pools test on failed connection

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

Actually, running the FrameworkBundle tests suit leads to a failure that says:

> 1) Symfony\Bundle\FrameworkBundle\Tests\Functional\CachePoolsTest::testRedisCachePools
Symfony\Component\Cache\Exception\InvalidArgumentException: Redis connection failed: redis://localhost
[...]
[...]/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php:59
[...]/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php:30

So I propose to catch this specific exception in case of redis is not (locally) supported, in order to be sure that tests stay green.

Commits
-------

0d349dd [FrameworkBundle] Skip redis cache pools test on failed connection
2016-06-03 07:29:17 +02:00
Robin Chalas 0d349dd496 [FrameworkBundle] Skip redis cache pools test on failed connection 2016-06-03 07:29:16 +02:00
Fabien Potencier 60b83dc2fe bug #18949 [3.1][Security] Fix DebugAccessDecisionManager when object is not a scalar (romainneutron)
This PR was merged into the 3.1 branch.

Discussion
----------

[3.1][Security] Fix DebugAccessDecisionManager when object is not a scalar

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

Commits
-------

ff2d189 [Security] Fix DebugAccessDecisionManager when object is not a scalar
2016-06-03 07:23:02 +02:00
Fabien Potencier af6ada5df8 bug #18959 [WebProfilerBundle] Fixed forwarded request data in templates (HeahDude)
This PR was merged into the 3.1 branch.

Discussion
----------

[WebProfilerBundle] Fixed forwarded request data in templates

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/silexphp/Silex-WebProfiler/issues/92
| License       | MIT
| Doc PR        | ~

Fixes a bug occurring  when the `FrameworkBundle` is not part of the dependencies (i.e using Silex).

Commits
-------

078c8b6 Fixed forwarded request data in templates
2016-06-03 07:16:26 +02:00
Jules Pietri 078c8b6b8a Fixed forwarded request data in templates 2016-06-03 02:46:43 +02:00
Romain Neutron ff2d189f34 [Security] Fix DebugAccessDecisionManager when object is not a scalar 2016-06-02 16:45:44 +02:00
Christophe Coevoet e6956c9bfc Skip some tests on HHVM due to a PHPunit bug 2016-06-02 11:40:24 +02:00
Christophe Coevoet e041da09e4 Use the Trusty Travis infrastructure for HHVM builds
This allows running an uptodate version of HHVM rather than running the
latest version supporting Precise, which is very old.
2016-06-02 11:40:24 +02:00
Christian Flothmann bff9c3631d LdapUserProvider: add missing argument type doc 2016-06-01 23:24:55 +02:00
Fabien Potencier d1b0301c71 bug #18943 [Ldap][Security] The Ldap user provider abstract service now has the correct number of arguments (csarrazi)
This PR was merged into the 3.1 branch.

Discussion
----------

[Ldap][Security] The Ldap user provider abstract service now has the correct number of arguments

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

Commits
-------

58996ac Fixed issue with missing argument in the abstract service definition for the ldap user provider
2016-06-01 21:56:09 +02:00
Fabien Potencier e5ffcb2ada minor #18942 Add 3.1 to PR template branch row and remove 2.3 (chalasr)
This PR was merged into the 2.7 branch.

Discussion
----------

Add 3.1 to PR template branch row and remove 2.3

| 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        | n/a

Commits
-------

71dcaa1 Add 3.1 to  PR template branch row, remove 2.3
2016-06-01 21:54:39 +02:00
Charles Sarrazin 58996ac0bf Fixed issue with missing argument in the abstract service definition for the ldap user provider 2016-06-01 21:35:13 +02:00
Robin Chalas 71dcaa14c9 Add 3.1 to PR template branch row, remove 2.3 2016-06-01 21:19:49 +02:00
Dword123 c1df9f210e Improve memory efficiency
This avoids concatenating `$message` and `PHP_EOL` (if necessary) as a new value, greatly improving memory efficiency for large `$message`s.
2016-06-01 13:20:21 +02:00
Fabien Potencier c7f1f7810c bug #18925 [Console] Fix BC break introduced by #18101 (dunglas)
This PR was squashed before being merged into the 3.1 branch (closes #18925).

Discussion
----------

[Console] Fix BC break introduced by #18101

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no
| Fixed tickets | https://github.com/symfony/symfony/pull/18101#issuecomment-222736460
| License       | MIT
| Doc PR        | n/a

* [x] Fix tests

Commits
-------

7a5a139 [Console] Fix BC break introduced by #18101
2016-06-01 08:04:30 +02:00
Kévin Dunglas 7a5a139135 [Console] Fix BC break introduced by #18101 2016-06-01 08:04:28 +02:00
Fabien Potencier 44f5283a21 minor #18928 add missing hint for vote() argument type (xabbuh)
This PR was merged into the 3.1 branch.

Discussion
----------

add missing hint for vote() argument type

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

This somehow got lost when the `3.0` branch was merged up.

Commits
-------

d14f0bf add missing hint for vote() argument type
2016-06-01 07:48:53 +02:00
Fabien Potencier a9bce60ce3 minor #18927 document method name changes in Voter class (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

document method name changes in Voter class

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

Commits
-------

c0b9e99 document method name changes in Voter class
2016-06-01 07:45:39 +02:00
Christian Flothmann c0b9e9950a document method name changes in Voter class 2016-05-31 21:33:24 +02:00
Christian Flothmann d14f0bf71f add missing hint for vote() argument type 2016-05-31 21:27:35 +02:00
Christophe Coevoet 691f19ff34 minor #18914 [#18838] add a test to avoid regressions (xabbuh)
This PR was merged into the 3.1 branch.

Discussion
----------

[#18838] add a test to avoid regressions

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

Commits
-------

240cf0a [#18838] add a test to avoid regressions
2016-05-30 10:42:44 +02:00
Christian Flothmann 240cf0aaa8 [#18838] add a test to avoid regressions 2016-05-30 10:23:04 +02:00
Fabien Potencier 76e30a9881 bumped Symfony version to 3.1.1 2016-05-30 09:57:32 +02:00
Fabien Potencier e71d4713c5 Merge pull request #18913 from fabpot/release-3.1.0
released v3.1.0
2016-05-30 09:24:54 +02:00
Fabien Potencier e62f832521 updated VERSION for 3.1.0 2016-05-30 09:24:26 +02:00
Fabien Potencier 3dce1d40d5 updated CHANGELOG for 3.1.0 2016-05-30 09:24:18 +02:00
Fabien Potencier 73ca90db53 Merge branch '3.0' into 3.1
* 3.0:
  [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:58:39 +02:00
Fabien Potencier 7b7c9b86a1 Merge branch '2.8' into 3.0
* 2.8:
  [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:58:27 +02:00
Fabien Potencier e617502ba2 Merge branch '2.7' into 2.8
* 2.7:
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:57:11 +02:00
Fabien Potencier 00763f6e41 Merge branch '2.3' into 2.7
* 2.3:
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:56:59 +02:00
Fabien Potencier dfc0c815e8 bug #18889 [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments (chalasr)
This PR was merged into the 2.8 branch.

Discussion
----------

[Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments

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

Pointed in https://github.com/symfony/symfony/issues/18564#issuecomment-210861051.

Very-long-line comment:
```php
SymfonyStyle::comment('Lorem ipsum ...');
```

Before:
![](http://image.prntscr.com/image/9190081d7fd740a89d17a7247dbbb244.png)

After:
![](http://image.prntscr.com/image/109c8c19c1574172bc22199ac90b6dd6.png)

Multi-line comment:
```php
SymfonyStyle::comment(['Lorem ipsum...', 'Lorem ipsum...']);
```

Before:
![](http://image.prntscr.com/image/24228f7e89e647b3a5d66fd83c7216cd.png)

After:
![](http://image.prntscr.com/image/fe9320369fad45acab92564f0e5de344.png)

Commits
-------

1c94fea [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
2016-05-30 08:56:30 +02:00
Robin Chalas 1c94fea42f [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
CS Fixes

Add tests

Add docblock

Fix side effect on FrameworkBundle tests

Remove useless '\n' from TextDescriptor since comments are block
2016-05-29 20:12:27 +02:00
Fabien Potencier ab621ee574 bug #18907 [Routing] Fix the annotation loader taking a class constant as a beginning of a class name (jakzal, nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] Fix the annotation loader taking a class constant as a beginning of a class name

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

Code copy/pasted from ClassMapGenerator.php

Commits
-------

8d4f35d [Routing] Finish annotation loader taking a class constant as a beginning of a class name
43c7f9b [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-29 18:07:21 +02:00
Nicolas Grekas 8d4f35d12c [Routing] Finish annotation loader taking a class constant as a beginning of a class name 2016-05-29 12:13:06 +02:00
Nicolas Grekas 8c65c0e6ec Merge branch '3.0' into 3.1
* 3.0:
  [PropertyAccess] Fix for PHP 7.0.7
2016-05-29 11:50:31 +02:00
Nicolas Grekas 0929c7b91c Merge branch '2.8' into 3.0
* 2.8:
  [PropertyAccess] Fix for PHP 7.0.7
2016-05-29 11:50:11 +02:00
Nicolas Grekas 56b5f4196b Merge branch '2.7' into 2.8
* 2.7:
  [PropertyAccess] Fix for PHP 7.0.7
2016-05-29 11:49:47 +02:00
Nicolas Grekas a350459d70 Merge branch '2.3' into 2.7
* 2.3:
  [PropertyAccess] Fix for PHP 7.0.7

Conflicts:
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2016-05-29 11:49:32 +02:00