Commit Graph

26562 Commits

Author SHA1 Message Date
Kévin Dunglas f6229c7a74
[FrameworkBundle] Remove unused variable 2016-06-07 16:56:06 +02:00
Fabien Potencier ceee6038d7 bumped Symfony version to 3.0.8 2016-06-06 19:17:28 +02:00
Fabien Potencier 272ab3327c Merge pull request #18983 from fabpot/release-3.0.7
released v3.0.7
2016-06-06 18:52:46 +02:00
Fabien Potencier fa7e94050e updated VERSION for 3.0.7 2016-06-06 18:52:35 +02:00
Fabien Potencier bde636a0dc updated CHANGELOG for 3.0.7 2016-06-06 18:52:28 +02:00
Fabien Potencier b98b214238 bumped Symfony version to 2.8.8 2016-06-06 18:48:23 +02:00
Fabien Potencier 663b2d6202 Merge pull request #18982 from fabpot/release-2.8.7
released v2.8.7
2016-06-06 18:05:37 +02:00
Fabien Potencier a888909cfc updated VERSION for 2.8.7 2016-06-06 18:05:21 +02:00
Fabien Potencier bb47dd16cb updated CHANGELOG for 2.8.7 2016-06-06 18:05:15 +02:00
Fabien Potencier b849a8637a bumped Symfony version to 2.7.15 2016-06-06 17:55:40 +02:00
Fabien Potencier fe443f4a8b Merge pull request #18981 from fabpot/release-2.7.14
released v2.7.14
2016-06-06 17:23:39 +02:00
Fabien Potencier c5a7f9fe26 updated VERSION for 2.7.14 2016-06-06 17:23:26 +02:00
Fabien Potencier c1f91f826b update CONTRIBUTORS for 2.7.14 2016-06-06 17:23:21 +02:00
Fabien Potencier e39f3463f9 updated CHANGELOG for 2.7.14 2016-06-06 17:23:15 +02:00
Fabien Potencier 1e673019cf Merge branch '3.0' into 3.1
* 3.0:
  [BrowserKit] Bump dom-crawler minimum version requirement
  Make one call to "OutputInterface::write" method per table row
  [HttpKernel] Fix context dependent test
  [Debug] Fix context dependent test
2016-06-06 17:08:54 +02:00
Fabien Potencier 75a3a79d30 Merge branch '2.8' into 3.0
* 2.8:
  [BrowserKit] Bump dom-crawler minimum version requirement
  Make one call to "OutputInterface::write" method per table row
  [HttpKernel] Fix context dependent test
  [Debug] Fix context dependent test
2016-06-06 17:08:35 +02:00
Fabien Potencier d29218f1e7 Merge branch '2.7' into 2.8
* 2.7:
  [BrowserKit] Bump dom-crawler minimum version requirement
  Make one call to "OutputInterface::write" method per table row
  [HttpKernel] Fix context dependent test
  [Debug] Fix context dependent test
2016-06-06 17:06:25 +02:00
Fabien Potencier 22ab211670 minor #18980 [BrowserKit] Bump the dom-crawler minimum version requirement (jakzal)
This PR was submitted for the 2.3 branch but it was merged into the 2.7 branch instead (closes #18980).

Discussion
----------

[BrowserKit] Bump the dom-crawler minimum version requirement

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

The BrowserKit Client will not work with DomCrawler 2.0 if the CssSelector component is not installed.

This will require an amendment when merging into the 2.8 branch. It currently uses `~2.0,>=2.0.5|~3.0.0`, while it should be `~2.1|~3.0.0`.

Commits
-------

5579d86 [BrowserKit] Bump dom-crawler minimum version requirement
2016-06-06 16:48:51 +02:00
Jakub Zalas 5579d86454 [BrowserKit] Bump dom-crawler minimum version requirement
The BrowserKit Client will not work with DomCrawler 2.0 if the CssSelector component is not installed.
2016-06-06 16:48:46 +02:00
Fabien Potencier 83e24bab6d minor #18966 [console] Improve table rendering performance (aik099)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #18966).

Discussion
----------

[console] Improve table rendering performance

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

With these improvements on my application, that is rendering table with 128 rows and 5 columns I've cut off total application runtime from **0.39s** to **0.26s**.

Commits
-------

73b812e Make one call to "OutputInterface::write" method per table row
2016-06-06 16:41:31 +02:00
Alexander Obuhovich 73b812e3a8 Make one call to "OutputInterface::write" method per table row 2016-06-06 16:41:06 +02:00
Nicolas Grekas 2e938491d6 minor #18979 [HttpKernel] Fix context dependent test (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Fix context dependent test

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

Class `Foo` exists when the ClassLoader component is tested alongside with HttpKernel

Commits
-------

065dee8 [HttpKernel] Fix context dependent test
2016-06-06 14:26:28 +02:00
Nicolas Grekas 065dee8525 [HttpKernel] Fix context dependent test 2016-06-06 14:20:11 +02:00
Nicolas Grekas 758c51dd98 minor #18978 [Debug] Fix context dependent test (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Fix context dependent test

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

Commits
-------

9fc48b8 [Debug] Fix context dependent test
2016-06-06 14:14:53 +02:00
Nicolas Grekas 9fc48b8bb2 [Debug] Fix context dependent test 2016-06-06 13:49:15 +02:00
Nicolas Grekas a249f5d582 Merge branch '3.0' into 3.1
* 3.0:
  `@throws` annotations should go after `@return`
  Fix merge
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp

Conflicts:
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2016-06-06 13:42:41 +02:00
Nicolas Grekas 0ed0e64d43 Merge branch '2.8' into 3.0
* 2.8:
  `@throws` annotations should go after `@return`
  Fix merge
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp

Conflicts:
	CHANGELOG-2.3.md
	src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
	src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
	src/Symfony/Component/Config/Loader/FileLoader.php
	src/Symfony/Component/DependencyInjection/Container.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/Finder/Expression/Expression.php
	src/Symfony/Component/Finder/Finder.php
	src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
2016-06-06 13:33:26 +02:00
Nicolas Grekas c4716d2511 Merge branch '2.7' into 2.8
* 2.7:
  `@throws` annotations should go after `@return`
  Fix merge
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
	src/Symfony/Component/Finder/Finder.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php
	src/Symfony/Component/Security/Acl/Model/AclInterface.php
	src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php
	src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2016-06-06 13:11:27 +02:00
Nicolas Grekas 10882528a8 minor #18975 `@throws` annotations should go after `@return` (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

`@throws` annotations should go after `@return`

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

Commits
-------

bf3a2c0 `@throws` annotations should go after `@return`
2016-06-06 13:06:50 +02:00
Nicolas Grekas bf3a2c0abd `@throws` annotations should go after `@return` 2016-06-06 13:03:51 +02:00
Nicolas Grekas cb850fef26 Fix merge 2016-06-06 11:00:08 +02:00
Fabien Potencier 011d2dcd26 Merge branch '2.3' into 2.7
* 2.3:
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp
2016-06-06 10:55:42 +02:00
Carsten Eilers a104c399dc Added APCU CacheProvider of doctrine/cache 1.6.x 2016-06-06 09:36:22 +02:00
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