From 21576fce48bae72a419a6834381f0ca009556d45 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Wed, 16 Dec 2015 10:54:17 -0500 Subject: [PATCH] Marking new service has private, then adding a workaround for the integration test --- Resources/config/parser.xml | 2 +- Tests/Parser/ParserManagerTest.php | 3 ++- Tests/fixtures/app/ServiceHelper.php | 23 +++++++++++++++++++++++ Tests/fixtures/app/TestKernel.php | 6 +++++- Twig/Extension/MarkdownTwigExtension.php | 2 +- 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 Tests/fixtures/app/ServiceHelper.php diff --git a/Resources/config/parser.xml b/Resources/config/parser.xml index f94c532..2295392 100644 --- a/Resources/config/parser.xml +++ b/Resources/config/parser.xml @@ -21,6 +21,6 @@ - + diff --git a/Tests/Parser/ParserManagerTest.php b/Tests/Parser/ParserManagerTest.php index 21f81bf..5aa4024 100644 --- a/Tests/Parser/ParserManagerTest.php +++ b/Tests/Parser/ParserManagerTest.php @@ -15,8 +15,9 @@ class ParserManagerTest extends \PHPUnit_Framework_TestCase $kernel->boot(); $container = $kernel->getContainer(); + $serviceHelper = $container->get('knp.markdown.test.service_helper'); /** @var ParserManager $parserManager */ - $parserManager = $container->get('markdown.parser.parser_manager'); + $parserManager = $serviceHelper->getParserManager(); $actual = $parserManager->transform('*hi*'); $this->assertEquals("

hi

\n", $actual, 'There is a default parser'); diff --git a/Tests/fixtures/app/ServiceHelper.php b/Tests/fixtures/app/ServiceHelper.php new file mode 100644 index 0000000..a0e1fae --- /dev/null +++ b/Tests/fixtures/app/ServiceHelper.php @@ -0,0 +1,23 @@ +parserManager = $parserManager; + } + + public function getParserManager() + { + return $this->parserManager; + } +} diff --git a/Tests/fixtures/app/TestKernel.php b/Tests/fixtures/app/TestKernel.php index 13b4653..3003dda 100644 --- a/Tests/fixtures/app/TestKernel.php +++ b/Tests/fixtures/app/TestKernel.php @@ -6,7 +6,7 @@ use Knp\Bundle\MarkdownBundle\KnpMarkdownBundle; use Symfony\Bundle\FrameworkBundle\FrameworkBundle; use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\HttpKernel\Bundle\BundleInterface; +use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\HttpKernel\Kernel; class TestKernel extends Kernel @@ -25,6 +25,10 @@ class TestKernel extends Kernel $c->loadFromExtension('framework', array( 'secret' => 'MarkdownTesting' )); + + // add a service to help access private services for integration tests + $c->register('knp.markdown.test.service_helper', 'Knp\Bundle\MarkdownBundle\Tests\fixtures\app\ServiceHelper') + ->addArgument(new Reference('markdown.parser.parser_manager')); }); } } \ No newline at end of file diff --git a/Twig/Extension/MarkdownTwigExtension.php b/Twig/Extension/MarkdownTwigExtension.php index 0460612..c19a73a 100644 --- a/Twig/Extension/MarkdownTwigExtension.php +++ b/Twig/Extension/MarkdownTwigExtension.php @@ -6,7 +6,7 @@ use Knp\Bundle\MarkdownBundle\Parser\ParserManager; class MarkdownTwigExtension extends \Twig_Extension { - protected $parserManager; + private $parserManager; public function __construct(ParserManager $parserManager) {