Commit Graph

33225 Commits

Author SHA1 Message Date
Nicolas Grekas
1e7d4877b7 Minor fix in UPGRADE files 2017-10-28 18:56:07 +02:00
Nicolas Grekas
c7e59b3a5b Merge branch '3.3' into 3.4
* 3.3:
  Ensure DeprecationErrorHandler::collectDeprecations() is triggered
  [FrameworkBundle] Allow to disable assets via framework:assets xml configuration
  fixed $_ENV/$_SERVER precedence in test framework
  [HttpFoundation] Fix FileBag issue with associative arrays
  [DI] Throw when a service name or an alias contains dynamic values (prevent an infinite loop)
  fix the phpdoc that is not really inherited from response
  Minor docblock cleanup
  Remove redundant sprintf arguments.
2017-10-28 18:49:05 +02:00
Nicolas Grekas
e7b555e2c9 Merge branch '2.8' into 3.3
* 2.8:
  [HttpFoundation] Fix FileBag issue with associative arrays
  fix the phpdoc that is not really inherited from response
  Minor docblock cleanup
  Remove redundant sprintf arguments.
2017-10-28 18:47:30 +02:00
Nicolas Grekas
865622e630 Merge branch '2.7' into 2.8
* 2.7:
  [HttpFoundation] Fix FileBag issue with associative arrays
  fix the phpdoc that is not really inherited from response
  Minor docblock cleanup
  Remove redundant sprintf arguments.
2017-10-28 18:44:51 +02:00
Nicolas Grekas
e80cf9cade bug #24706 [DependencyInjection] Add the possibility to disable assets via xml (renatomefi)
This PR was merged into the 3.3 branch.

Discussion
----------

[DependencyInjection] Add the possibility to disable assets via xml

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

- When trying to disable the assets using xml configuration I realized it wasn't possible, this patch fixes and tests it
- Also added extra tests since the assets being disabled was being tested on both php and yaml Extension tests

Commits
-------

8579e24 [FrameworkBundle] Allow to disable assets via framework:assets xml configuration
2017-10-28 18:26:49 +02:00
Nicolas Grekas
91d2690e48 bug #24696 Ensure DeprecationErrorHandler::collectDeprecations() is triggered (alexpott)
This PR was squashed before being merged into the 3.3 branch (closes #24696).

Discussion
----------

Ensure DeprecationErrorHandler::collectDeprecations() is triggered

Ensure DeprecationErrorHandler::collectDeprecations() is triggered if SYMFONY_DEPRECATIONS_SERIALIZE is set

| Q             | A
| ------------- | ---
| Branch?       | 3.3 <!-- see comment below -->
| Bug fix?      | yes
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

<!--
- Bug fixes must be submitted against the lowest branch where they apply
  (lowest branches are regularly merged to upper ones so they get the fixes too).
- Features and deprecations must be submitted against the 3.4,
  legacy code removals go to the master branch.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

Drupal doesn't use src/Symfony/Bridge/PhpUnit/bin/simple-phpunit but would like to use the deprecation collection features of src/Symfony/Bridge/PhpUnit. The checks in src/Symfony/Bridge/PhpUnit/bootstrap.php mean that this is difficult because they rely on simple-phpunit - but I'm not sure that that is necessary.

The problem is even in isolated tests we have PHPUNIT_COMPOSER_INSTALL set because we use a custom phpunit config file.

Commits
-------

e7da160 Ensure DeprecationErrorHandler::collectDeprecations() is triggered
2017-10-28 18:21:53 +02:00
Alex Pott
e7da1606f0 Ensure DeprecationErrorHandler::collectDeprecations() is triggered 2017-10-28 18:21:46 +02:00
Nicolas Grekas
7f746bd621 minor #24701 Config: mark builder property deprecated (bburnichon)
This PR was squashed before being merged into the 3.4 branch (closes #24701).

Discussion
----------

Config: mark builder property deprecated

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

`builder` protected property is not used at all in class. Mark as deprecated to enable removing asap. This is to avoid keeping dead code up to symfony `5.0` and still having this dead code in the `4.4` LTS version

Commits
-------

206fb74 Config: mark builder property deprecated
2017-10-28 18:10:23 +02:00
Benoît Burnichon
206fb74381 Config: mark builder property deprecated 2017-10-28 18:10:19 +02:00
Nicolas Grekas
002b3f2c3e bug #24711 [TwigBridge] Re-add Bootstrap 3 Checkbox Layout (arkste)
This PR was merged into the 3.4 branch.

Discussion
----------

[TwigBridge] Re-add Bootstrap 3 Checkbox Layout

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

Commits
-------

8ac8f9d [TwigBridge] Re-add Bootstrap 3 Checkbox Layout
2017-10-28 18:05:54 +02:00
Nicolas Grekas
b5023ec22b bug #24713 [FrameworkBundle] fix CachePoolPrunerPass to use correct command service id (kbond)
This PR was merged into the 3.4 branch.

Discussion
----------

[FrameworkBundle] fix CachePoolPrunerPass to use correct command service id

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

https://github.com/symfony/symfony/pull/23624 broke https://github.com/symfony/symfony/pull/23451.

Commits
-------

14c62da fix CachePoolPrunerPass to use correct command service id
2017-10-28 18:01:28 +02:00
Kevin Bond
14c62dad5f
fix CachePoolPrunerPass to use correct command service id 2017-10-27 16:39:37 -04:00
Arkadius Stefanski
8ac8f9d2a8 [TwigBridge] Re-add Bootstrap 3 Checkbox Layout 2017-10-27 20:50:34 +02:00
Renato Mendes Figueiredo
8579e24750 [FrameworkBundle] Allow to disable assets via framework:assets xml configuration 2017-10-27 15:49:29 +02:00
Fabien Potencier
4910ac6fe9 bug #24686 Fix $_ENV/$_SERVER precedence in test framework (fabpot)
This PR was merged into the 3.3 branch.

Discussion
----------

Fix $_ENV/$_SERVER precedence in test framework

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

When defining env vars values in `phpunit.xml.dist`, we are using `<env ...>`. PHPUnit registers those env vars in `$_ENV`, but not in `$_SERVER`. This means that those values might not be used by Symfony if env vars defined in `.env` are automatically registered (which is my case).

In any case, I think it makes sense to make `$_ENV` take precedence as this is how we register them in `phpunit.xml.dist`.

Commits
-------

6ed9919d24 fixed $_ENV/$_SERVER precedence in test framework
2017-10-26 09:22:06 -07:00
Tobias Schultze
85551141a5 minor #24613 Remove redundant sprintf argument. (Aliance)
This PR was merged into the 2.7 branch.

Discussion
----------

Remove redundant sprintf argument.

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

cc @fabpot @ogizanagi

Commits
-------

c8012f0448 Remove redundant sprintf arguments.
2017-10-26 16:04:37 +02:00
Tobias Schultze
fdac9e3911 bug #24691 [HttpFoundation] Fix caching of session-enabled pages (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[HttpFoundation] Fix caching of session-enabled pages

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

Commits
-------

572e02cec5 [HttpFoundation] Fix caching of session-enabled pages
2017-10-26 12:26:53 +02:00
Fabien Potencier
6ed9919d24 fixed $_ENV/$_SERVER precedence in test framework 2017-10-25 18:38:07 -07:00
Fabien Potencier
d744027357 bug #24606 [HttpFoundation] Fix FileBag issue with associative arrays (enumag)
This PR was squashed before being merged into the 2.7 branch (closes #24606).

Discussion
----------

[HttpFoundation] Fix FileBag issue with associative arrays

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

Commits
-------

8ea2860996 [HttpFoundation] Fix FileBag issue with associative arrays
2017-10-25 18:19:06 -07:00
Jáchym Toušek
8ea2860996 [HttpFoundation] Fix FileBag issue with associative arrays 2017-10-25 18:19:04 -07:00
Fabien Potencier
6cf3d5681a bug #24673 [DI] Throw when a service name or an alias contains dynamic values (prevent an infinite loop) (dunglas)
This PR was squashed before being merged into the 3.3 branch (closes #24673).

Discussion
----------

[DI] Throw when a service name or an alias contains dynamic values (prevent an infinite loop)

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

If an environment variable is used to build a service name (like in [this snippet](4b3d1abfe5/src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php (L471))), an infinite loop occurs.

It's common to build dynamic service names (in a compiler pass), if the dynamic part comes from a parameter, this bug can occurs.

Commits
-------

14e30857ea [DI] Throw when a service name or an alias contains dynamic values (prevent an infinite loop)
2017-10-25 18:14:48 -07:00
Kévin Dunglas
14e30857ea [DI] Throw when a service name or an alias contains dynamic values (prevent an infinite loop) 2017-10-25 18:14:47 -07:00
Fabien Potencier
b0cf42b32b minor #24680 [HttpFoundation] Fix RedirectResponse factory method phpdoc (ronfroy)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpFoundation] Fix RedirectResponse factory method phpdoc

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

Fix the phpdoc of the factory method on the RedirectResponse (signatures are different between Response and RedirectResponse).

Commits
-------

7cd3049454 fix the phpdoc that is not really inherited from response
2017-10-25 11:30:31 -07:00
Fabien Potencier
e1daff4a19 bug #24684 [Security] remove invalid deprecation notice on AbstractGuardAuthenticator::supports() (kbond)
This PR was merged into the 3.4 branch.

Discussion
----------

[Security] remove invalid deprecation notice on AbstractGuardAuthenticator::supports()

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

This deprecation flag causes a false positive.

Commits
-------

5fb44e767e [Guard] remove invalid deprecation notice
2017-10-25 11:28:42 -07:00
Nicolas Grekas
78426b79d2 Merge branch '3.3' into 3.4
* 3.3:
  Revert "minor #24685 Make it easy for Drupal to use the PHPUnit bridge (alexpott)"
2017-10-25 18:54:45 +02:00
Nicolas Grekas
ea3a9a9f96 Revert "minor #24685 Make it easy for Drupal to use the PHPUnit bridge (alexpott)"
This reverts commit 41509a2dcf, reversing
changes made to 3e3e74c3fa.
2017-10-25 18:54:16 +02:00
Nicolas Grekas
572e02cec5 [HttpFoundation] Fix caching of session-enabled pages 2017-10-25 18:42:56 +02:00
Nicolas Grekas
82032814b7 Merge branch '3.3' into 3.4
* 3.3:
  Make it easy for Drupal to use the PHPUnit bridge
2017-10-25 16:41:49 +02:00
Nicolas Grekas
41509a2dcf minor #24685 Make it easy for Drupal to use the PHPUnit bridge (alexpott)
This PR was squashed before being merged into the 3.3 branch (closes #24685).

Discussion
----------

Make it easy for Drupal to use the PHPUnit bridge

| Q             | A
| ------------- | ---
| Branch?       | 3.3 <!-- see comment below -->
| Bug fix?      | no
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

<!--
- Bug fixes must be submitted against the lowest branch where they apply
  (lowest branches are regularly merged to upper ones so they get the fixes too).
- Features and deprecations must be submitted against the 3.4,
  legacy code removals go to the master branch.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

Drupal doesn't use src/Symfony/Bridge/PhpUnit/bin/simple-phpunit but would like to use the deprecation collection features of src/Symfony/Bridge/PhpUnit. The checks in src/Symfony/Bridge/PhpUnit/bootstrap.php mean that this is difficult because they rely on simple-phpunit - but I'm not sure that that is necessary.

Commits
-------

1de6bf8 Make it easy for Drupal to use the PHPUnit bridge
2017-10-25 16:41:27 +02:00
Alex Pott
1de6bf87b9 Make it easy for Drupal to use the PHPUnit bridge 2017-10-25 16:41:18 +02:00
Nicolas Grekas
ed8c731177 Merge branch '3.3' into 3.4
* 3.3:
  Fix phpunit bridge
2017-10-25 11:57:07 +02:00
Nicolas Grekas
3e3e74c3fa Fix phpunit bridge 2017-10-25 11:55:09 +02:00
Nicolas Grekas
8d179a3bdd Merge branch '3.3' into 3.4
* 3.3:
  Fix simple-phpunit
2017-10-25 11:25:19 +02:00
Nicolas Grekas
7e6e2f07e2 Fix simple-phpunit 2017-10-25 11:25:11 +02:00
Nicolas Grekas
b6a0a38c4d [VarDumper] Fix test 2017-10-25 10:48:42 +02:00
Nicolas Grekas
c98db6ae2e Merge branch '3.3' into 3.4
* 3.3:
  Fix isolated error handling
2017-10-25 10:01:59 +02:00
Nicolas Grekas
107705abd3 bug #24681 Fix isolated error handling (alexpott)
This PR was squashed before being merged into the 3.3 branch (closes #24681).

Discussion
----------

Fix isolated error handling

| Q             | A
| ------------- | ---
| Branch?       | 3.3 <!-- see comment below -->
| Bug fix?      | yes
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

<!--
- Bug fixes must be submitted against the lowest branch where they apply
  (lowest branches are regularly merged to upper ones so they get the fixes too).
- Features and deprecations must be submitted against the 3.4,
  legacy code removals go to the master branch.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

Fixes \Symfony\Bridge\PhpUnit\Tests\ProcessIsolationTest on PHP5.5 and PHP5.6 and (probably) HHVM.

Commits
-------

b1a2205 Fix isolated error handling
2017-10-25 10:01:09 +02:00
Alex Pott
b1a22059e7 Fix isolated error handling 2017-10-25 10:00:59 +02:00
Kevin Bond
5fb44e767e
[Guard] remove invalid deprecation notice 2017-10-24 15:52:50 -04:00
Rudy Onfroy
7cd3049454 fix the phpdoc that is not really inherited from response 2017-10-24 20:42:41 +02:00
Nicolas Grekas
03b01c36e4 Merge branch '3.3' into 3.4
* 3.3:
  Ensure that PHPUnit's error handler is still working in isolated tests
  Fix review points
2017-10-24 19:17:17 +02:00
Nicolas Grekas
e6d949b233 minor #24604 Fix deprecation triggering test deduction (alexpott)
This PR was merged into the 3.3 branch.

Discussion
----------

Fix deprecation triggering test deduction

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

<!--
- Bug fixes must be submitted against the lowest branch where they apply
  (lowest branches are regularly merged to upper ones so they get the fixes too).
- Features and deprecations must be submitted against the 3.4,
  legacy code removals go to the master branch.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->
This PR is just testing some additions https://github.com/symfony/symfony/pull/24597 - I want to see if the travis run is successful.

Commits
-------

5333680 Fix review points
2017-10-24 19:16:44 +02:00
Nicolas Grekas
8984260f38 bug #24575 Ensure that PHPUnit's error handler is still working in isolated tests (alexpott)
This PR was squashed before being merged into the 3.3 branch (closes #24575).

Discussion
----------

Ensure that PHPUnit's error handler is still working in isolated tests

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

<!--
- Bug fixes must be submitted against the lowest branch where they apply
  (lowest branches are regularly merged to upper ones so they get the fixes too).
- Features and deprecations must be submitted against the 3.4,
  legacy code removals go to the master branch.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

This PR fixes the \Symfony\Bridge\PhpUnit\Tests\ProcessIsolationTest and adds new coverage to ensure PHPUnit error handling works as expected. Tested with both PHPUnit 4.8.35 and 6.2.4

Commits
-------

dc7e5a3 Ensure that PHPUnit's error handler is still working in isolated tests
2017-10-24 19:15:55 +02:00
Alex Pott
dc7e5a39fa Ensure that PHPUnit's error handler is still working in isolated tests 2017-10-24 19:15:51 +02:00
Alex Pott
5333680f7d Fix review points 2017-10-24 17:40:01 +01:00
Nicolas Grekas
b7439238c9 Merge branch '3.3' into 3.4
* 3.3:
  fix deprecation triggering test detection
2017-10-24 18:03:34 +02:00
Nicolas Grekas
4365d23e38 bug #24597 [PhpUnitBridge] fix deprecation triggering test detection (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[PhpUnitBridge] fix deprecation triggering test detection

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

Commits
-------

da617e8 fix deprecation triggering test detection
2017-10-24 17:58:59 +02:00
Robin Chalas
7f9ef83020 Merge branch '3.3' into 3.4
* 3.3:
  fix merge
2017-10-24 16:40:29 +02:00
Robin Chalas
d9746d45b1 fix merge 2017-10-24 16:40:00 +02:00
Nicolas Grekas
fd225b0719 Minor docblock cleanup 2017-10-24 16:20:57 +02:00