Commit Graph

14 Commits

Author SHA1 Message Date
Fabien Potencier
06d150a55e Merge branch '3.2'
* 3.2:
  disable global test listener when not registered
2017-03-01 17:49:24 -08:00
Fabien Potencier
b45e99f7cc Merge branch '2.8' into 3.2
* 2.8:
  disable global test listener when not registered
2017-03-01 17:46:11 -08:00
Christian Flothmann
e068661240 disable global test listener when not registered
The global test listener is always initialized to register the clock
mock and DNS mock as soon as possible. However, when the listener is
registered locally through the PHPUnit config, it will never be
registered as a listener. In thise case, the state of the local
listener must be reset to correctly report expected deprecation test
results.
2017-03-01 20:11:57 +01:00
Fabien Potencier
afff0ce43e Merge branch '3.2'
* 3.2:
  [SecurityBundle] only pass relevant user provider
  [Intl] Make tests pass after the ICU data update
  [Intl] Update ICU data to 58.2
  do not register the test listener twice
  [DependencyInjection] removed dead code.
  [Yaml] Stop replacing NULLs when merging
  [WebServerBundle] fixed html attribute escape
2017-02-27 18:34:20 -08:00
Fabien Potencier
65b7d43ac3 Merge branch '2.8' into 3.2
* 2.8:
  [SecurityBundle] only pass relevant user provider
  [Intl] Make tests pass after the ICU data update
  [Intl] Update ICU data to 58.2
  do not register the test listener twice
  [DependencyInjection] removed dead code.
  [Yaml] Stop replacing NULLs when merging
  [WebServerBundle] fixed html attribute escape
2017-02-27 18:30:50 -08:00
Christian Flothmann
cee435fefd do not register the test listener twice
If the listener is already configured through the PHPUnit config, there
is no need to also enable it explicitly in the test runner.
2017-02-27 20:09:32 +01:00
Nicolas Grekas
9ed5e8c184 Merge branch '2.8' into 3.2
* 2.8:
  fix deps
2017-02-21 17:21:09 +01:00
Nicolas Grekas
4584fad6ca fix deps 2017-02-21 17:18:52 +01:00
Nicolas Grekas
9e0745c670 [Bridge/PhpUnit] Add PHPUnit 6 support 2017-02-21 09:45:22 +01:00
Nicolas Grekas
0c1c70cb4a [Bridge/PhpUnit] Add bin/simple-phpunit wrapper (=phpunit - yaml - prophecy) 2016-09-12 17:01:49 +02:00
Nicolas Grekas
42815018ed Merge branch '2.7' into 2.8
* 2.7:
  Fix backport
  [travis] Upgrade phpunit wrapper & hirak/prestissimo
  [Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests
  [PropertyAccess] Fix isPropertyWritable not using the reflection cache
  [PropertyAccess] Backport fixes from 2.7
  [Validator] use correct term for a property in docblock (not "option")
  [Routing] small refactoring for scheme requirement
  [PropertyAccess] Remove most ref mismatches to improve perf
  [Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols
  [NumberFormatter] Fix invalid numeric literal on PHP 7
  [Process] fix docblock syntax
  Use XML_ELEMENT_NODE in nodeType check
  [PropertyAccess] Reduce overhead of UnexpectedTypeException tracking
  [PropertyAccess] Throw an UnexpectedTypeException when the type do not match
  [FrameworkBundle] Add tests for the Controller class
  [FrameworkBundle] Add tests for the Controller class
  [Process] getIncrementalOutput should work without calling getOutput

Conflicts:
	src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
	src/Symfony/Bridge/PhpUnit/TextUI/Command.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
2016-03-23 14:11:46 +01:00
Nicolas Grekas
2b3f4261d6 Fix backport 2016-03-23 13:43:53 +01:00
Nicolas Grekas
4ea9548e23 [Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests 2016-03-23 13:16:35 +01:00
Nicolas Grekas
9e2bb0082f [PhpUnit] Auto-register SymfonyTestsListener 2015-10-11 10:29:26 +02:00