Commit Graph

303 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Alex Pott
e7da1606f0 Ensure DeprecationErrorHandler::collectDeprecations() is triggered 2017-10-28 18:21:46 +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
Christian Flothmann
da617e8624 fix deprecation triggering test detection 2017-10-20 11:26:45 +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
Nicolas Grekas
a522f5e855 Fix phpunit bridge (ter) 2017-10-13 18:55:35 +02:00
Nicolas Grekas
0454396746 Merge branch '3.3' into 3.4
* 3.3:
  Fix phpunit bridge (bis)
2017-10-13 18:49:51 +02:00
Nicolas Grekas
9de153b330 Fix phpunit bridge (bis) 2017-10-13 18:49:40 +02:00
Nicolas Grekas
ed5f884ec6 Merge branch '3.3' into 3.4
* 3.3:
  Fix phpunit bridge
2017-10-13 18:40:10 +02:00
Nicolas Grekas
7ba7550dfb Fix phpunit bridge 2017-10-13 18:39:56 +02:00
Nicolas Grekas
3f0a3f58a6 Merge branch '3.3' into 3.4
* 3.3:
  fix serialized deprecations handling
2017-10-13 16:15:09 +02:00
Christian Flothmann
2f5a0bd72f fix serialized deprecations handling 2017-10-13 16:13:33 +02:00
Nicolas Grekas
2c18da709f Merge branch '3.3' into 3.4
* 3.3:
  [BrowserKit] Handle deprecations triggered in insulated requests
  [Bridge\PhpUnit] Handle deprecations triggered in separate processes
  [Validator] added magic method __isset()  to File Constraint class
  [DI] Fix possible incorrect php-code when dumped strings contains newlines
  [Translation] minor: remove unused variable in test
  never match invalid IP addresses
2017-10-13 15:33:47 +02:00
Paul Mitchum
ff379efb59 [Bridge\PhpUnit] Handle deprecations triggered in separate processes 2017-10-13 15:20:39 +02:00
Nicolas Grekas
e2418975e1 Merge branch '3.3' into 3.4
* 3.3:
  bug #24499 [Bridge\PhpUnit] Fix infinite loop when running isolated method (bis) (nicolas-grekas)
2017-10-09 17:30:26 +02:00
Nicolas Grekas
9b6b3c0304 bug #24499 [Bridge\PhpUnit] Fix infinite loop when running isolated method (bis) (nicolas-grekas)
This PR was merged into the 4.0-dev branch.

Discussion
----------

[Bridge\PhpUnit] Fix infinite loop when running isolated method (bis)

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

The blacklisting system is a bit rigid, so let's work around it.

Commits
-------

9d9d596 [Bridge\PhpUnit] Fix infinite loop when running isolated method (bis)
2017-10-09 17:29:37 +02:00
Nicolas Grekas
92f621fcf7 Merge branch '3.3' into 3.4
* 3.3:
  [Bridge\PhpUnit] Fix infinite loop when running isolated method
  remove unused fixtures file
  parse references on merge keys with objects
2017-10-09 16:52:13 +02:00