Commit Graph

2972 Commits

Author SHA1 Message Date
Fabien Potencier
c610a32b4b Merge branch '2.7' into 2.8
* 2.7:
  Fix collision between view properties and form fields
2017-12-04 10:08:18 -08:00
Yonel Ceruto
c330965cfb Fix collision between view properties and form fields 2017-12-04 09:06:01 -05:00
Yonel Ceruto
888b48a89c Fix collision between view properties and form fields 2017-12-04 08:54:58 -05:00
Nicolas Grekas
abd76ba4c9 Merge branch '3.3' into 3.4
* 3.3:
  Fail as early and noisily as possible
  [FrameworkBundle] Fix visibility of a test helper
  [link] clear the cache after linking
  [link] Prevent warnings when running link with 2.7
  [Validator] ExpressionValidator should use OBJECT_TO_STRING to allow value in message
  do not eagerly filter comment lines
  [WebProfilerBundle], [TwigBundle] Fix Profiler breaking XHTML pages (Content-Type: application/xhtml+xml)
2017-12-04 13:17:59 +01:00
Kuba Werłos
369075a282 Fix for missing whitespace control modifier in form layout 2017-12-04 13:08:37 +01:00
Nicolas Grekas
9fb6a88580 Remove rc/beta suffix from composer.json files 2017-12-03 22:15:09 +01:00
Grégoire Paris
3bdeda048b
Fail as early and noisily as possible
Today, I tried using SYMFONY_PHPUNIT_VERSION=6 because I don't really
care about the minor version. I got lots of warnings, followed by
hard-to-understand error messages. This will silence the first warning
and will throw an exception instead.
2017-12-03 00:45:47 +01:00
Julien Falque
c5af7fd938
Fix hidden currency element with Bootstrap 3 theme 2017-12-02 11:52:27 +01:00
Yonel Ceruto
8505894988 Fix collision between view properties and form fields 2017-11-30 23:33:59 -05:00
Grégoire Paris
355bbd19fa
Use a more specific file for detecting the bridge
When using bin as a Composer bin-dir, this will break because both
composer.json and bin/simple-phpunit will exist relatively to the
current directory. This change checks for a non-binary file specific to
the bridge that will not have this issue.
Fixes #25228
2017-11-30 20:42:05 +01:00
Nicolas Grekas
4b38150de9 Merge branch '3.3' into 3.4
* 3.3:
  Display a nice error message if the form/serializer component is missing.
  Force phpunit-bridge update (bis)
  [Bridge/PhpUnit] Fix disabling global state preservation
2017-11-22 12:41:29 +01:00
Nicolas Grekas
fe328345d7 [Bridge/PhpUnit] Fix disabling global state preservation 2017-11-22 10:24:01 +01:00
Nicolas Grekas
154b004bf1 Merge branch '3.3' into 3.4
* 3.3:
  [Bridge/PhpUnit] Fix blacklist
  Force phpunit-bridge update
  Update github PR template
2017-11-22 09:56:07 +01:00
Nicolas Grekas
4efb4db705 [Bridge/PhpUnit] Fix blacklist 2017-11-22 09:55:42 +01:00
Nicolas Grekas
125934a7e8 Merge branch '3.3' into 3.4
* 3.3:
  [Bridge\PhpUnit] Turn "preserveGlobalState" to false by default, revert "Blacklist" removal
2017-11-22 09:29:50 +01:00
Nicolas Grekas
e233ba3a3f [Bridge\PhpUnit] Turn "preserveGlobalState" to false by default, revert "Blacklist" removal
This reverts commit 0577d20ade.
2017-11-22 08:56:40 +01:00
Mathieu Lechat
a27f9591f5 Let getFlashes starts the session 2017-11-21 16:16:53 +01:00
Nicolas Grekas
2c2044b34f Merge branch '3.3' into 3.4
* 3.3:
  [HttpFoundation] Fix bad merge in NativeSessionStorage
  Bump phpunit-bridge requirement to 3.4|4.0
  [Bridge/PhpUnit] Remove trailing "\n" from ClockMock::microtime(false)
  [Form] Rename `FormConfigBuilder::$nativeRequestProcessor` private variable to `::$nativeRequestHandler`
  Add a "link" script to ease debugging Flex apps
  [Form] Add phpdoc to `RequestHandlerInterface::isFileUpload()` method
2017-11-21 10:59:09 +01:00
Nicolas Grekas
1a1079d7c4 Merge branch '2.8' into 3.3
* 2.8:
  [HttpFoundation] Fix bad merge in NativeSessionStorage
  Bump phpunit-bridge requirement to 3.4|4.0
  [Bridge/PhpUnit] Remove trailing "\n" from ClockMock::microtime(false)
  [Form] Rename `FormConfigBuilder::$nativeRequestProcessor` private variable to `::$nativeRequestHandler`
  Add a "link" script to ease debugging Flex apps
  [Form] Add phpdoc to `RequestHandlerInterface::isFileUpload()` method
2017-11-21 10:58:54 +01:00
Guillaume Aveline
5ddb121723 [Bridge/PhpUnit] Remove trailing "\n" from ClockMock::microtime(false) 2017-11-21 10:19:30 +01:00
Nicolas Grekas
bd4fe8d86f [Bridge/PhpUnit] fix installation path 2017-11-21 09:49:35 +01:00
Nicolas Grekas
b40c84dcf8 [Bridge/PhpUnit] move .phpunit/ out of phpunit-bridge/ 2017-11-20 23:31:51 +01:00
Nicolas Grekas
038c671c33 [Bridge/PhpUnit] Sync the bridge version installed in vendor/ and in phpunit clone 2017-11-20 20:24:15 +01:00
Dany Maillard
aca0ddd9d6 Add suggestions 2017-11-20 22:55:12 +10:00
Nicolas Grekas
4baf9688a9 Merge branch '3.3' into 3.4
* 3.3:
  [Bridge/PhpUnit] Fix compat with phpunit 4.8 & bridge <=3.3.13
  Remove function_exists(__phpunit_run_isolated_test) checks
2017-11-19 22:09:36 +02:00
Nicolas Grekas
0187e9b340 [Bridge/PhpUnit] Fix compat with phpunit 4.8 & bridge <=3.3.13 2017-11-19 22:09:29 +02:00
Nicolas Grekas
eb92d7ca07 bug #25014 Move deprecation under use statements (greg0ire)
This PR was squashed before being merged into the 3.4 branch (closes #25014).

Discussion
----------

Move deprecation under use statements

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

Commits
-------

0a5b016 Move deprecation under use statements
2017-11-19 20:59:05 +02:00
Grégoire Paris
0a5b016427 Move deprecation under use statements 2017-11-19 20:59:03 +02:00
Nicolas Grekas
e40905a343 Merge branch '3.3' into 3.4
* 3.3:
  [Bridge\PhpUnit] Disable broken auto-require mechanism of phpunit
  [SecurityBundle] Fix syntax error in test
  [Console] Remove remaining dead code
  bumped Symfony version to 3.3.14
  bumped Symfony version to 2.8.32
  bumped Symfony version to 2.7.39
  updated VERSION for 3.3.13
  updated CHANGELOG for 3.3.13
  updated VERSION for 2.8.31
  updated CHANGELOG for 2.8.31
  updated VERSION for 2.7.38
  updated CHANGELOG for 2.7.38
  Replace array|\Traversable by iterable
  Fix ambiguous pattern
2017-11-19 20:41:20 +02:00
Nicolas Grekas
0577d20ade [Bridge\PhpUnit] Disable broken auto-require mechanism of phpunit 2017-11-19 19:07:02 +02:00
Nicolas Grekas
abe3404a5b [Bridge\PhpUnit] Use phpdbg instead of xdebug in tests 2017-11-12 20:29:19 +01:00
Nicolas Grekas
2b62887f06 Merge branch '3.3' into 3.4
* 3.3:
  [Console] Fix traversable autocomplete values
  [ExpressionLanguage] Fix PhpDoc type-hints on Token value
  bumped Symfony version to 3.3.12
  updated VERSION for 3.3.11
  updated CHANGELOG for 3.3.11
  bumped Symfony version to 2.8.30
  updated VERSION for 2.8.29
  updated CHANGELOG for 2.8.29
  bumped Symfony version to 2.7.37
  updated VERSION for 2.7.36
  update CONTRIBUTORS for 2.7.36
  updated CHANGELOG for 2.7.36
2017-11-12 17:41:51 +01:00
Fabien Potencier
6ab9129693 bug #24874 [TwigBridge] Fixed the .form-check-input class in the bs4 templates (vudaltsov)
This PR was squashed before being merged into the 3.4 branch (closes #24874).

Discussion
----------

[TwigBridge] Fixed the .form-check-input class in the bs4 templates

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

If I am not mistaken, the `form-check-input` class should always be present in inputs of checkboxes and radios

Commits
-------

95a90e4231 [TwigBridge] Fixed the .form-check-input class in the bs4 templates
2017-11-12 08:19:44 -08:00
Valentin
95a90e4231 [TwigBridge] Fixed the .form-check-input class in the bs4 templates 2017-11-12 08:19:42 -08:00
Fabien Potencier
11aff9a071 Merge branch '3.3' into 3.4
* 3.3:
  [Intl] Update ICU data to 60.1
  [YAML] Allow to parse custom tags when linting yaml files
  [HttpKernel][Debug] Remove noise from stack frames of deprecations
  [Validator] Fix Costa Rica IBAN format
  [Bridge/ProxyManager] Remove direct reference to value holder property
  [Validator] Add Belarus IBAN format
  [FrameworkBundle] Specifically inject the debug dispatcher in the collector
  [WebserverBundle] fixed the bug that caused that the webserver would …
  update the pull request template
  [Stopwatch] minor fix
2017-11-10 11:03:56 -08:00
Fabien Potencier
e7201245cd Merge branch '2.8' into 3.3
* 2.8:
  [Intl] Update ICU data to 60.1
  [Validator] Fix Costa Rica IBAN format
  [Bridge/ProxyManager] Remove direct reference to value holder property
  [Validator] Add Belarus IBAN format
  [FrameworkBundle] Specifically inject the debug dispatcher in the collector
  update the pull request template
  [Stopwatch] minor fix
2017-11-10 11:02:53 -08:00
Fabien Potencier
e6087d6307 Merge branch '2.7' into 2.8
* 2.7:
  [Intl] Update ICU data to 60.1
  [Validator] Fix Costa Rica IBAN format
  [Bridge/ProxyManager] Remove direct reference to value holder property
  [Validator] Add Belarus IBAN format
  [FrameworkBundle] Specifically inject the debug dispatcher in the collector
  update the pull request template
  [Stopwatch] minor fix
2017-11-10 10:59:36 -08:00
Nicolas Grekas
af9d6446ea [Bridge/ProxyManager] Remove direct reference to value holder property 2017-11-10 14:01:38 +01:00
Fabien Potencier
deb499ebaf bug #24837 [TwigBridge] [Bootstrap 4] Fix validation error design for expanded choiceType (ostrolucky)
This PR was merged into the 3.4 branch.

Discussion
----------

[TwigBridge] [Bootstrap 4] Fix validation error design for expanded choiceType

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

Unfortunately I didn't test https://github.com/symfony/symfony/pull/24802 with expanded option set to true, sorry about that. Without this fix, it applies form error style twice.

Before:
![screenshot from 2017-11-06 10 31 55](https://user-images.githubusercontent.com/496233/32434235-c13c02f8-c2dd-11e7-97da-6bfa312c5825.png)

After:
![screenshot from 2017-11-06 10 32 40](https://user-images.githubusercontent.com/496233/32434252-d30c2224-c2dd-11e7-86d6-fd06af3ef753.png)

Commits
-------

39083a2067 [TwigBridge] [Bootstrap 4] Fix validation error design for expanded choiceType
2017-11-09 11:24:47 -08:00
Gabriel Ostrolucký
39083a2067 [TwigBridge] [Bootstrap 4] Fix validation error design for expanded choiceType 2017-11-09 20:22:51 +01:00
Nicolas Grekas
3fc766ff4b [Bridge\Twig] Lazy-load deps 2017-11-07 18:37:38 +01:00
Nicolas Grekas
82ce33d5eb [3.4] Remove useless docblocks 2017-11-07 15:28:09 +01:00
Nicolas Grekas
629895c3ef Merge branch '3.3' into 3.4
* 3.3:
  [3.3] More docblock fixes
  [2.7] More docblock fixes
2017-11-07 15:20:24 +01:00
Nicolas Grekas
7b6cabad22 [3.3] More docblock fixes 2017-11-07 15:16:22 +01:00
Nicolas Grekas
69b48d0122 bug #24851 [TwigBridge] Fix BC break due required twig environment (ro0NL)
This PR was squashed before being merged into the 3.4 branch (closes #24851).

Discussion
----------

[TwigBridge] Fix BC break due required twig environment

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes/no
| Fixed tickets | https://github.com/symfony/symfony/pull/24236#discussion_r149241720
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

See https://github.com/ezsystems/ezplatform-design-engine/pull/12 + https://github.com/silexphp/Silex-WebProfiler/pull/126 + https://github.com/bolt/bolt/pull/7154

Sorry for that :)

cc @fabpot

Commits
-------

243e4b2 [TwigBridge] Fix BC break due required twig environment
2017-11-07 14:35:34 +01:00
Roland Franssen
243e4b2e2f [TwigBridge] Fix BC break due required twig environment 2017-11-07 14:35:31 +01:00
Nicolas Grekas
c4ae73939e Merge branch '3.3' into 3.4
* 3.3:
  Random fixes
  Docblock fixes
  [HttpKernel] Enhance deprecation message
  [SecurityBundle] Fix the datacollector to properly support decision.object being null
2017-11-07 13:10:25 +01:00
Nicolas Grekas
39a5801fc9 Merge branch '2.8' into 3.3
* 2.8:
  Docblock fixes
2017-11-07 12:58:40 +01:00
Nicolas Grekas
96dcb10a80 Merge branch '2.7' into 2.8
* 2.7:
  Docblock fixes
2017-11-07 12:56:23 +01:00
Nicolas Grekas
b56bfe7d8a Docblock fixes 2017-11-07 12:54:30 +01:00
Nicolas Grekas
73982760f7 Merge branch '3.3' into 3.4
* 3.3:
  [Serializer] Fix extra attributes when no group specified
  [Intl] Make intl-data tests pass and save language aliases again
  [Console] Fix CommandTester::setInputs() docblock
  [Serializer] readd default argument value
  [VarDumper] fix trailling comma when dumping an exception
  Remove useless docblocks
  [FrameworkBundle] Fix docblocks
  [PropertyInfo] Remove useless docblocks
2017-11-05 17:10:10 +01:00
Nicolas Grekas
b354d6ca84 Merge branch '2.8' into 3.3
* 2.8:
  [Intl] Make intl-data tests pass and save language aliases again
  Remove useless docblocks
  [PropertyInfo] Remove useless docblocks
2017-11-05 16:47:03 +01:00
Nicolas Grekas
9bc9474ff0 Merge branch '2.7' into 2.8
* 2.7:
  [Intl] Make intl-data tests pass and save language aliases again
  Remove useless docblocks
2017-11-05 16:25:56 +01:00
Gabriel Ostrolucký
5810983e30 Fix displaying errors for bootstrap 4 2017-11-04 14:34:38 +01:00
Grégoire Pineau
25e0117152 [PhpUnitBridge] Fixed fatal error in CoverageListener when something goes wrong in Test::setUpBeforeClass 2017-11-03 11:03:57 +01:00
Fabien Potencier
5c46e393c7 Merge branch '3.3' into 3.4
* 3.3:
  removed extra whitespace
  Removes \n or space when / are empty
  [HttpFoundation] add Early Hints in Reponse to fix test
  Throwing exception if redis and predis unavailable
2017-10-31 08:19:40 -07:00
Fabien Potencier
30f3b91cad removed extra whitespace 2017-10-31 08:12:41 -07:00
Kirk Madera
0d8edaec79 Removes \n or space when / are empty 2017-10-31 08:11:27 -07:00
Fabien Potencier
2280f844bf fixed tests 2017-10-30 14:07:44 -07:00
Fabien Potencier
dbf544487f fixed CS 2017-10-30 12:08:07 -07:00
Arkadius Stefanski
f84749f745 [Bridge\Twig] fix bootstrap checkbox_row to render properly & remove spaceless 2017-10-30 12:07:24 -07:00
Fabien Potencier
856f21abba bug #24703 [TwigBridge] Bootstrap 4 form theme fixes (vudaltsov)
This PR was squashed before being merged into the 3.4 branch (closes #24703).

Discussion
----------

[TwigBridge] Bootstrap 4 form theme fixes

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

Some fixes for compound forms and their labels.

1. Do not add `.form-control-label` and `.col-form-legend` at the same time. It's enough to have only one of them.
1. Use legends instead of labels for compound fields. I think it makes more sense to have nested `fieldsets` than `labels` without `for` in a compound form. An example of nested fieldsets is given at the bottom of [this page](https://dev.w3.org/html5/spec-preview/the-fieldset-element.html).

Commits
-------

e55c67ad17 [TwigBridge] Bootstrap 4 form theme fixes
2017-10-29 14:03:05 -07:00
Valentin Udaltsov
e55c67ad17 [TwigBridge] Bootstrap 4 form theme fixes 2017-10-29 14:03:02 -07:00
Nicolas Grekas
2443511324 Remove useless docblocks 2017-10-29 10:49:53 +01:00
Fabien Potencier
98dae3edb1 bug #24710 [TwigBridge] Fix template paths in profiler (ro0NL)
This PR was merged into the 3.4 branch.

Discussion
----------

[TwigBridge] Fix template paths in profiler

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes/no
| Fixed tickets | #24540
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

Fixes the profiler being unavailable with non filesystem templates.

![image](https://user-images.githubusercontent.com/1047696/32117680-87866354-bb4f-11e7-9cb9-428ad6751a1e.png)

Commits
-------

c9174dff7c [TwigBridge] Fix template paths in profiler
2017-10-28 15:07:58 -07: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
Alex Pott
e7da1606f0 Ensure DeprecationErrorHandler::collectDeprecations() is triggered 2017-10-28 18:21:46 +02:00
Arkadius Stefanski
8ac8f9d2a8 [TwigBridge] Re-add Bootstrap 3 Checkbox Layout 2017-10-27 20:50:34 +02:00
Roland Franssen
c9174dff7c [TwigBridge] Fix template paths in profiler 2017-10-27 19:44:44 +02: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
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
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
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
c98db6ae2e Merge branch '3.3' into 3.4
* 3.3:
  Fix isolated error handling
2017-10-25 10:01:59 +02:00
Alex Pott
b1a22059e7 Fix isolated error handling 2017-10-25 10:00:59 +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
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
Nicolas Grekas
fd225b0719 Minor docblock cleanup 2017-10-24 16:20:57 +02:00
Nicolas Grekas
1e1b37753c Merge branch '3.3' into 3.4
* 3.3:
  [DI] minor docblock fixes
2017-10-24 16:12:06 +02:00
Nicolas Grekas
7fb9f614ee Merge branch '2.8' into 3.3
* 2.8:
  [DI] minor docblock fixes
2017-10-24 16:05:06 +02:00
Nicolas Grekas
2b95ba3299 Merge branch '2.7' into 2.8
* 2.7:
  [DI] minor docblock fixes
2017-10-24 15:48:52 +02:00
Nicolas Grekas
cb5e7912c7 Merge branch '3.3' into 3.4
* 3.3:
  [2.8] Fix some docblocks
  Escape trailing \ in QuestionHelper autocompletion
  [FrameworkBundle][Serializer] Remove outdated condition
  Add "doctrine/annotations" to top-level composer.json
  Fix phpdoc inconsistencies, simplify no-op sprintf.
  Remove inapplicable phpdoc comment
  nit: Fix phpdoc inconsistency and unreachable statement
  Prefer line formatter on missing cli dumper
  [DI] Enhance service locator error message
2017-10-24 14:44:53 +02:00
Nicolas Grekas
2dc8534f13 bug #24598 Prefer line formatter on missing cli dumper (greg0ire)
This PR was merged into the 3.3 branch.

Discussion
----------

Prefer line formatter on missing cli dumper

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none, but closes https://github.com/symfony/recipes/pull/145
| License       | MIT
| Doc PR        | n/a

The console formatter does a better job, unless the VarDumper component
is missing, in which case the LineFormatter should be preferred.

Commits
-------

574f9f5 Prefer line formatter on missing cli dumper
2017-10-24 14:19:44 +02:00
Nicolas Grekas
0c9edaf336 [DI] minor docblock fixes 2017-10-24 13:40:19 +02:00
Tyson Andre
c9ddd68ea6 Fix phpdoc inconsistencies, simplify no-op sprintf.
(detected by static analysis)
2017-10-21 13:27:13 -07:00
Lesnykh Ilia
c8012f0448
Remove redundant sprintf arguments. 2017-10-20 12:44:28 +03:00
Christian Flothmann
da617e8624 fix deprecation triggering test detection 2017-10-20 11:26:45 +02:00
Grégoire Paris
574f9f5273
Prefer line formatter on missing cli dumper
The console formatter does a better job, unless the VarDumper component
is missing, in which case you will not see the "context" or "extra" keys
and the LineFormatter should be preferred.
2017-10-17 19:49:08 +02:00
Nicolas Grekas
42390a2b00 Merge branch '3.3' into 3.4
* 3.3:
  Fix phpunit bridge (ter)
2017-10-13 18:56:07 +02:00