diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Command/ExportCommandTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Command/ExportCommandTest.php index 17564941ec..17817ae7c2 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Command/ExportCommandTest.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Command/ExportCommandTest.php @@ -16,6 +16,9 @@ use Symfony\Component\Console\Helper\HelperSet; use Symfony\Component\Console\Tester\CommandTester; use Symfony\Component\HttpKernel\Profiler\Profile; +/** + * @group legacy + */ class ExportCommandTest extends \PHPUnit_Framework_TestCase { /** diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Command/ImportCommandTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Command/ImportCommandTest.php index fe3ba421ad..2c440ecc75 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Command/ImportCommandTest.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Command/ImportCommandTest.php @@ -12,9 +12,13 @@ namespace Symfony\Bundle\WebProfilerBundle\Tests\Command; use Symfony\Bundle\WebProfilerBundle\Command\ImportCommand; +use Symfony\Component\Console\Helper\HelperSet; use Symfony\Component\Console\Tester\CommandTester; use Symfony\Component\HttpKernel\Profiler\Profile; +/** + * @group legacy + */ class ImportCommandTest extends \PHPUnit_Framework_TestCase { public function testExecute() @@ -27,7 +31,14 @@ class ImportCommandTest extends \PHPUnit_Framework_TestCase $profiler->expects($this->once())->method('import')->will($this->returnValue(new Profile('TOKEN'))); + $helperSet = new HelperSet(); + $helper = $this->getMock('Symfony\Component\Console\Helper\FormatterHelper'); + $helper->expects($this->any())->method('formatSection'); + $helperSet->set($helper, 'formatter'); + $command = new ImportCommand($profiler); + $command->setHelperSet($helperSet); + $commandTester = new CommandTester($command); $commandTester->execute(array('filename' => __DIR__.'/../Fixtures/profile.data')); $this->assertRegExp('/Profile "TOKEN" has been successfully imported\./', $commandTester->getDisplay()); diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md index ad27886ac8..bab3aba490 100644 --- a/src/Symfony/Component/HttpKernel/CHANGELOG.md +++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.8.0 +----- + + * deprecated `Profiler::import` and `Profiler::export` + 2.7.0 ----- diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php index 864f624729..378bf5dac3 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php +++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php @@ -137,9 +137,13 @@ class Profiler * @param Profile $profile A Profile instance * * @return string The exported data + * + * @deprecated since Symfony 2.8, to be removed in 3.0. */ public function export(Profile $profile) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + return base64_encode(serialize($profile)); } @@ -149,9 +153,13 @@ class Profiler * @param string $data A data string as exported by the export() method * * @return Profile A Profile instance + * + * @deprecated since Symfony 2.8, to be removed in 3.0. */ public function import($data) { + @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED); + $profile = unserialize(base64_decode($data)); if ($this->storage->read($profile->getToken())) {