diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml deleted file mode 100644 index 8bd8ffd..0000000 --- a/config/packages/doctrine.yaml +++ /dev/null @@ -1,5 +0,0 @@ -doctrine: - orm: - dql: - string_functions: - match: DoctrineExtensions\Query\Mysql\MatchAgainst diff --git a/src/DependencyInjection/PcmSearchExtension.php b/src/DependencyInjection/PcmSearchExtension.php index f9721fe..ba9215a 100644 --- a/src/DependencyInjection/PcmSearchExtension.php +++ b/src/DependencyInjection/PcmSearchExtension.php @@ -6,11 +6,28 @@ namespace Pcm\SearchBundle\DependencyInjection; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; -class PcmSearchExtension extends Extension +class PcmSearchExtension extends Extension implements PrependExtensionInterface { + public function prepend(ContainerBuilder $container) + { + $container->loadFromExtension( + 'doctrine', + [ + 'orm' => [ + 'dql' => [ + 'string_functions' => [ + 'match' => 'DoctrineExtensions\Query\Mysql\MatchAgainst' + ] + ] + ] + ] + ); + } + public function load(array $configs, ContainerBuilder $container) { $loader = new YamlFileLoader( @@ -18,6 +35,5 @@ class PcmSearchExtension extends Extension new FileLocator(__DIR__.'/../../config') ); $loader->load('services.yaml'); - $loader->load('packages/doctrine.yaml'); } }