From df9bb2674e838fe69afb820348bfd1581607267f Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 13 Jan 2015 13:58:22 +0100 Subject: [PATCH] [Debug] fix test --- src/Symfony/Bundle/DebugBundle/Resources/meta/LICENSE | 2 +- .../HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php | 4 ++-- src/Symfony/Component/VarDumper/LICENSE | 2 +- src/Symfony/Component/VarDumper/Tests/CliDumperTest.php | 3 ++- src/Symfony/Component/VarDumper/composer.json | 4 ++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bundle/DebugBundle/Resources/meta/LICENSE b/src/Symfony/Bundle/DebugBundle/Resources/meta/LICENSE index 43028bc600..ef1cde91a6 100644 --- a/src/Symfony/Bundle/DebugBundle/Resources/meta/LICENSE +++ b/src/Symfony/Bundle/DebugBundle/Resources/meta/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2015 Fabien Potencier +Copyright (c) 2014-2015 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php index b3209c213b..dd9a134bd8 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php @@ -49,8 +49,8 @@ class DumpDataCollectorTest extends \PHPUnit_Framework_TestCase ); $this->assertSame($xDump, $dump); - $this->assertStringStartsWith( - 'a:1:{i:0;a:5:{s:4:"data";O:39:"Symfony\Component\VarDumper\Cloner\Data":4:{s:45:"Symfony\Component\VarDumper\Cloner\Datadata";a:1:{i:0;a:1:{i:0;i:123;}}s:49:"Symfony\Component\VarDumper\Cloner\DatamaxDepth";i:20;s:57:"Symfony\Component\VarDumper\Cloner\DatamaxItemsPerDepth";i:-1;s:54:"Symfony\Component\VarDumper\Cloner\DatauseRefHandles";i:-1;}s:4:"name";s:25:"DumpDataCollectorTest.php";s:4:"file";s:', + $this->assertStringMatchesFormat( + 'a:1:{i:0;a:5:{s:4:"data";O:39:"Symfony\Component\VarDumper\Cloner\Data":4:{s:45:"Symfony\Component\VarDumper\Cloner\Datadata";a:1:{i:0;a:1:{i:0;i:123;}}s:49:"Symfony\Component\VarDumper\Cloner\DatamaxDepth";i:%i;s:57:"Symfony\Component\VarDumper\Cloner\DatamaxItemsPerDepth";i:%i;s:54:"Symfony\Component\VarDumper\Cloner\DatauseRefHandles";i:%i;}s:4:"name";s:25:"DumpDataCollectorTest.php";s:4:"file";s:%a', str_replace("\0", '', $collector->serialize()) ); diff --git a/src/Symfony/Component/VarDumper/LICENSE b/src/Symfony/Component/VarDumper/LICENSE index 43028bc600..ef1cde91a6 100644 --- a/src/Symfony/Component/VarDumper/LICENSE +++ b/src/Symfony/Component/VarDumper/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2015 Fabien Potencier +Copyright (c) 2014-2015 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php index d67c7ab1e3..bba30256b4 100644 --- a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php +++ b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php @@ -132,7 +132,7 @@ EOTXT $this->assertSame( << array:1 [ 0 => &1 array:1 [ 0 => &1 array:1 [&1] @@ -143,6 +143,7 @@ array:2 [ "GLOBALS" => &2 array:1 [&2] ] ] + 2 => &2 array:1 [&2] ] EOTXT diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json index 4a22fc2098..cf4752bb1e 100644 --- a/src/Symfony/Component/VarDumper/composer.json +++ b/src/Symfony/Component/VarDumper/composer.json @@ -9,6 +9,10 @@ { "name": "Nicolas Grekas", "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" } ], "require": {