Merge branch '2.8'

* 2.8:
  [VarDumper] Ingore PHPUnit and Prophecy object when they are nested
  [2.8] Fix lowest deps

Conflicts:
	.travis.yml
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
This commit is contained in:
Nicolas Grekas 2015-07-02 17:20:21 +02:00
commit 8279d11ba9
3 changed files with 6 additions and 1 deletions

View File

@ -13,7 +13,7 @@ matrix:
- php: 5.5.9
- php: 5.5
- php: 5.6
- php: 5.5.9
- php: 5.6
env: deps=low
- php: 5.6
env: deps=2.8

View File

@ -23,6 +23,7 @@
"require-dev": {
"symfony/phpunit-bridge": "~2.8|~3.0",
"symfony/browser-kit": "~2.8|~3.0",
"symfony/config": "~2.8|~3.0",
"symfony/console": "~2.8|~3.0",
"symfony/css-selector": "~2.8|~3.0",
"symfony/dependency-injection": "~2.8|~3.0",

View File

@ -69,6 +69,10 @@ abstract class AbstractCloner implements ClonerInterface
'Symfony\Component\DependencyInjection\ContainerInterface' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
'Symfony\Component\VarDumper\Exception\ThrowingCasterException' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castThrowingCasterException',
'PHPUnit_Framework_MockObject_MockObject' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
'Prophecy\Prophecy\ProphecySubjectInterface' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
'Mockery\MockInterface' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
'PDO' => 'Symfony\Component\VarDumper\Caster\PdoCaster::castPdo',
'PDOStatement' => 'Symfony\Component\VarDumper\Caster\PdoCaster::castPdoStatement',