diff --git a/src/DependencyInjection/DoctrinePHPCRExtension.php b/src/DependencyInjection/DoctrinePHPCRExtension.php index 1ce9eb75..568b62fa 100644 --- a/src/DependencyInjection/DoctrinePHPCRExtension.php +++ b/src/DependencyInjection/DoctrinePHPCRExtension.php @@ -19,7 +19,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; -use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; +use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; use Symfony\Component\DependencyInjection\Reference; /** @@ -35,7 +35,7 @@ final class DoctrinePHPCRExtension extends AbstractDoctrineExtension */ private array $sessions = []; - private XmlFileLoader $loader; + private PhpFileLoader $loader; private bool $disableProxyWarmer = false; @@ -51,15 +51,15 @@ public function load(array $configs, ContainerBuilder $container): void $processor = new Processor(); $configuration = new Configuration(); $config = $processor->processConfiguration($configuration, $configs); - $this->loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $this->loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); - $this->loader->load('phpcr.xml'); - $this->loader->load('commands.xml'); + $this->loader->load('phpcr.php'); + $this->loader->load('commands.php'); if (class_exists(BaseJackrabbitCommand::class)) { - $this->loader->load('jackrabbit-commands.xml'); + $this->loader->load('jackrabbit-commands.php'); } if (class_exists(BaseInitDoctrineDbalCommand::class)) { - $this->loader->load('jackalope_doctrine_dbal-commands.xml'); + $this->loader->load('jackalope_doctrine_dbal-commands.php'); } // default values in case no odm is configured. the manager registry needs these variables to be defined. @@ -130,7 +130,7 @@ private function sessionLoad(array $config, ContainerBuilder $container): void case 'doctrinedbal': case 'jackrabbit': if (empty($loaded['jackalope'])) { - $this->loader->load('jackalope.xml'); + $this->loader->load('jackalope.php'); $loaded['jackalope'] = true; } $this->loadJackalopeSession($session, $container, $type); @@ -173,7 +173,7 @@ private function loadJackalopeSession(array $session, ContainerBuilder $containe ; if (!$this->dbalSchemaListenerLoaded) { - $this->loader->load('jackalope_doctrine_dbal.xml'); + $this->loader->load('jackalope_doctrine_dbal.php'); $this->dbalSchemaListenerLoaded = true; } @@ -352,7 +352,7 @@ private function buildCredentials(ContainerBuilder $container, string $serviceNa private function loadOdm(array $config, ContainerBuilder $container): void { - $this->loader->load('odm.xml'); + $this->loader->load('odm.php'); $this->loadOdmLocales($config, $container); $config['document_managers'] = $this->fixManagersAutoMappings($config['document_managers'], $container->getParameter('kernel.bundles')); @@ -401,7 +401,7 @@ private function loadOdmLocales(array $config, ContainerBuilder $container): voi } if (!empty($config['locales'])) { - $this->loader->load('odm_multilang.xml'); + $this->loader->load('odm_multilang.php'); foreach ($config['locales'] as $locale => $fallbacks) { if (\in_array($locale, $fallbacks)) { diff --git a/src/Resources/config/commands.php b/src/Resources/config/commands.php new file mode 100644 index 00000000..4a519e7a --- /dev/null +++ b/src/Resources/config/commands.php @@ -0,0 +1,65 @@ +services(); + $parameters = $container->parameters(); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\WorkspaceQueryCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\WorkspaceQueryCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\MigratorMigrateCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\MigratorMigrateCommand::class) + ->args([service('service_container')]) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\NodeDumpCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\NodeDumpCommand::class) + ->args([ + service('doctrine_phpcr.console_dumper'), + '%doctrine_phpcr.dump_max_line_length%', + ]) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\NodeMoveCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\NodeMoveCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\NodeRemoveCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\NodeRemoveCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\NodesUpdateCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\NodesUpdateCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\NodeTouchCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\NodeTouchCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\NodeTypeListCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\NodeTypeListCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\NodeTypeRegisterCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\NodeTypeRegisterCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\PhpcrShellCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\PhpcrShellCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\RepositoryInitCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\RepositoryInitCommand::class) + ->args([service('doctrine_phpcr.initializer_manager')]) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\WorkspaceCreateCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\WorkspaceCreateCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\WorkspaceDeleteCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\WorkspaceDeleteCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\WorkspaceExportCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\WorkspaceExportCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\WorkspaceImportCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\WorkspaceImportCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\WorkspaceListCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\WorkspaceListCommand::class) + ->tag('console.command'); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\WorkspacePurgeCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\WorkspacePurgeCommand::class) + ->tag('console.command'); +}; diff --git a/src/Resources/config/commands.xml b/src/Resources/config/commands.xml deleted file mode 100644 index b90b39a9..00000000 --- a/src/Resources/config/commands.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - %doctrine_phpcr.dump_max_line_length% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Resources/config/jackalope.php b/src/Resources/config/jackalope.php new file mode 100644 index 00000000..391110f6 --- /dev/null +++ b/src/Resources/config/jackalope.php @@ -0,0 +1,33 @@ +services(); + $parameters = $container->parameters(); + + $services->set('doctrine_phpcr.jackalope.repository.factory.service.jackrabbit', \Jackalope\RepositoryFactoryJackrabbit::class); + + $services->set('doctrine_phpcr.jackalope.repository.factory.jackrabbit', \Jackalope\Repository::class) + ->args([[]]) + ->factory([service('doctrine_phpcr.jackalope.repository.factory.service.jackrabbit'), 'getRepository']); + + $services->set('doctrine_phpcr.jackalope.repository.factory.service.doctrinedbal', \Jackalope\RepositoryFactoryDoctrineDBAL::class); + + $services->set('doctrine_phpcr.jackalope.repository.factory.doctrinedbal', \Jackalope\Repository::class) + ->args([[]]) + ->factory([service('doctrine_phpcr.jackalope.repository.factory.service.doctrinedbal'), 'getRepository']); + + $services->set('doctrine_phpcr.jackalope.repository.factory.service.prismic', \Jackalope\RepositoryFactoryPrismic::class); + + $services->set('doctrine_phpcr.jackalope.repository.factory.prismic', \Jackalope\Repository::class) + ->args([[]]) + ->factory([service('doctrine_phpcr.jackalope.repository.factory.service.prismic'), 'getRepository']); + + $services->set('doctrine_phpcr.jackalope.session', \Jackalope\Session::class) + ->abstract() + ->args([ + '', + '', + ]); +}; diff --git a/src/Resources/config/jackalope.xml b/src/Resources/config/jackalope.xml deleted file mode 100644 index fc60aead..00000000 --- a/src/Resources/config/jackalope.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Resources/config/jackalope_doctrine_dbal-commands.php b/src/Resources/config/jackalope_doctrine_dbal-commands.php new file mode 100644 index 00000000..5bfd9430 --- /dev/null +++ b/src/Resources/config/jackalope_doctrine_dbal-commands.php @@ -0,0 +1,11 @@ +services(); + $parameters = $container->parameters(); + + $services->set(\Doctrine\Bundle\PHPCRBundle\OptionalCommand\InitDoctrineDbalCommand::class, \Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\InitDoctrineDbalCommand::class) + ->tag('console.command'); +}; diff --git a/src/Resources/config/jackalope_doctrine_dbal-commands.xml b/src/Resources/config/jackalope_doctrine_dbal-commands.xml deleted file mode 100644 index e031e966..00000000 --- a/src/Resources/config/jackalope_doctrine_dbal-commands.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/src/Resources/config/jackalope_doctrine_dbal.php b/src/Resources/config/jackalope_doctrine_dbal.php new file mode 100644 index 00000000..3abd647e --- /dev/null +++ b/src/Resources/config/jackalope_doctrine_dbal.php @@ -0,0 +1,20 @@ +services(); + $parameters = $container->parameters(); + + $services->set('doctrine_phpcr.jackalope_doctrine_dbal.schema', \Jackalope\Transport\DoctrineDBAL\RepositorySchema::class) + ->args([ + [], + service('doctrine_phpcr.jackalope_doctrine_dbal.default_connection'), + ]) + ->lazy(true); + + $services->set('doctrine_phpcr.jackalope_doctrine_dbal.schema_listener', \Doctrine\Bundle\PHPCRBundle\EventListener\JackalopeDoctrineDbalSchemaListener::class) + ->args([ + service('doctrine_phpcr.jackalope_doctrine_dbal.schema'), + ]); +}; diff --git a/src/Resources/config/jackalope_doctrine_dbal.xml b/src/Resources/config/jackalope_doctrine_dbal.xml deleted file mode 100644 index 08f6994f..00000000 --- a/src/Resources/config/jackalope_doctrine_dbal.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/Resources/config/jackrabbit-commands.php b/src/Resources/config/jackrabbit-commands.php new file mode 100644 index 00000000..22ee7e34 --- /dev/null +++ b/src/Resources/config/jackrabbit-commands.php @@ -0,0 +1,15 @@ +services(); + $parameters = $container->parameters(); + + $services->set(\Doctrine\Bundle\PHPCRBundle\OptionalCommand\JackrabbitCommand::class, \Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\JackrabbitCommand::class) + ->args([ + '%doctrine_phpcr.jackrabbit_jar%', + '%doctrine_phpcr.workspace_dir%', + ]) + ->tag('console.command'); +}; diff --git a/src/Resources/config/jackrabbit-commands.xml b/src/Resources/config/jackrabbit-commands.xml deleted file mode 100644 index 820799bf..00000000 --- a/src/Resources/config/jackrabbit-commands.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - %doctrine_phpcr.jackrabbit_jar% - %doctrine_phpcr.workspace_dir% - - - - - diff --git a/src/Resources/config/odm.php b/src/Resources/config/odm.php new file mode 100644 index 00000000..a26ba133 --- /dev/null +++ b/src/Resources/config/odm.php @@ -0,0 +1,75 @@ +services(); + $parameters = $container->parameters(); + $parameters->set('doctrine_phpcr.odm.cache.array.class', \Doctrine\Common\Cache\ArrayCache::class); + $parameters->set('doctrine_phpcr.odm.cache.apc.class', \Doctrine\Common\Cache\ApcCache::class); + $parameters->set('doctrine_phpcr.odm.cache.memcache.class', \Doctrine\Common\Cache\MemcacheCache::class); + $parameters->set('doctrine_phpcr.odm.cache.memcache_host', 'localhost'); + $parameters->set('doctrine_phpcr.odm.cache.memcache_port', 11211); + $parameters->set('doctrine_phpcr.odm.cache.memcache_instance.class', 'Memcache'); + $parameters->set('doctrine_phpcr.odm.cache.memcached.class', \Doctrine\Common\Cache\MemcachedCache::class); + $parameters->set('doctrine_phpcr.odm.cache.memcached_host', 'localhost'); + $parameters->set('doctrine_phpcr.odm.cache.memcached_port', 11211); + $parameters->set('doctrine_phpcr.odm.cache.memcached_instance.class', 'Memcached'); + $parameters->set('doctrine_phpcr.odm.cache.xcache.class', \Doctrine\Common\Cache\XcacheCache::class); + $parameters->set('doctrine_phpcr.odm.metadata.xml.class', \Doctrine\Bundle\PHPCRBundle\Mapping\Driver\XmlDriver::class); + $parameters->set('doctrine_phpcr.odm.metadata.yml.class', \Doctrine\Bundle\PHPCRBundle\Mapping\Driver\YamlDriver::class); + $parameters->set('doctrine_phpcr.odm.metadata.php.class', \Doctrine\Persistence\Mapping\Driver\StaticPHPDriver::class); + $parameters->set('doctrine_phpcr.odm.metadata.driver_chain.class', \Doctrine\Persistence\Mapping\Driver\MappingDriverChain::class); + $parameters->set('doctrine_phpcr.odm.metadata.attribute.class', \Doctrine\ODM\PHPCR\Mapping\Driver\AttributeDriver::class); + + $services->set('doctrine_phpcr.odm.proxy_cache_warmer', \Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer::class) + ->private() + ->args([service('doctrine_phpcr')]) + ->tag('kernel.cache_warmer'); + + $services->set('doctrine_phpcr.odm.unique_node_type_cache_warmer', \Doctrine\Bundle\PHPCRBundle\CacheWarmer\UniqueNodeTypeCacheWarmer::class) + ->private() + ->args([service('doctrine_phpcr')]) + ->tag('kernel.cache_warmer'); + + $services->alias('doctrine_phpcr.odm.metadata.attribute_reader', 'attribute_reader') + ->private(); + + $services->set('doctrine_phpcr.odm.configuration', \Doctrine\ODM\PHPCR\Configuration::class) + ->private() + ->abstract(); + + $services->set('doctrine_phpcr.odm.document_manager.abstract', \Doctrine\ODM\PHPCR\DocumentManager::class) + ->public() + ->abstract(); + + $services->set('form.type.phpcr.document', \Doctrine\Bundle\PHPCRBundle\Form\Type\DocumentType::class) + ->args([service('doctrine_phpcr')]) + ->tag('form.type', ['alias' => 'phpcr_document']); + + $services->set('doctrine_phpcr.odm.form.type.path', \Doctrine\Bundle\PHPCRBundle\Form\Type\PathType::class) + ->args([service('doctrine_phpcr')]) + ->tag('form.type', ['alias' => 'phpcr_odm_path']); + + $services->set('form.type_guesser.doctrine_phpcr', \Doctrine\Bundle\PHPCRBundle\Form\PhpcrOdmTypeGuesser::class) + ->args([ + service('doctrine_phpcr'), + '%doctrine_phpcr.form.type_guess%', + ]) + ->tag('form.type_guesser'); + + $services->set('doctrine_phpcr.odm.validator.valid_phpcr_odm', \Doctrine\Bundle\PHPCRBundle\Validator\Constraints\ValidPhpcrOdmValidator::class) + ->args([service('doctrine_phpcr')]) + ->tag('validator.constraint_validator', ['alias' => 'doctrine_phpcr.odm.validator.valid_phpcr_odm']); + + $services->set('doctrine_phpcr.odm.translation.strategy.attribute', \Doctrine\ODM\PHPCR\Translation\TranslationStrategy\AttributeTranslationStrategy::class) + ->args(['']) + ->call('setPrefix', ['%doctrine_phpcr.odm.namespaces.translation.alias%']); + + $services->set('doctrine_phpcr.odm.translation.strategy.child', \Doctrine\ODM\PHPCR\Translation\TranslationStrategy\ChildTranslationStrategy::class) + ->args(['']); + + $services->set(\Doctrine\Bundle\PHPCRBundle\Command\LoadFixtureCommand::class, \Doctrine\Bundle\PHPCRBundle\OptionalCommand\ODM\LoadFixtureCommand::class) + ->args([service('doctrine_phpcr.initializer_manager')]) + ->tag('console.command'); +}; diff --git a/src/Resources/config/odm.xml b/src/Resources/config/odm.xml deleted file mode 100644 index e230d86e..00000000 --- a/src/Resources/config/odm.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - Doctrine\Common\Cache\ArrayCache - Doctrine\Common\Cache\ApcCache - Doctrine\Common\Cache\MemcacheCache - localhost - 11211 - Memcache - Doctrine\Common\Cache\MemcachedCache - localhost - 11211 - Memcached - Doctrine\Common\Cache\XcacheCache - Doctrine\Bundle\PHPCRBundle\Mapping\Driver\XmlDriver - Doctrine\Bundle\PHPCRBundle\Mapping\Driver\YamlDriver - Doctrine\Persistence\Mapping\Driver\StaticPHPDriver - Doctrine\Persistence\Mapping\Driver\MappingDriverChain - Doctrine\ODM\PHPCR\Mapping\Driver\AttributeDriver - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %doctrine_phpcr.form.type_guess% - - - - - - - - - - - - %doctrine_phpcr.odm.namespaces.translation.alias% - - - - - - - - - - - - - - diff --git a/src/Resources/config/odm_multilang.php b/src/Resources/config/odm_multilang.php new file mode 100644 index 00000000..19f6e797 --- /dev/null +++ b/src/Resources/config/odm_multilang.php @@ -0,0 +1,22 @@ +services(); + $parameters = $container->parameters(); + + $services->set('doctrine_phpcr.odm.locale_chooser', \Doctrine\ODM\PHPCR\Translation\LocaleChooser\LocaleChooser::class) + ->args([ + '%doctrine_phpcr.odm.locales%', + '%doctrine_phpcr.odm.default_locale%', + ]); + + $services->set('doctrine_phpcr.odm.locale_listener', \Doctrine\Bundle\PHPCRBundle\EventListener\LocaleListener::class) + ->args([ + service('doctrine_phpcr.odm.locale_chooser'), + '%doctrine_phpcr.odm.allowed_locales%', + '%doctrine_phpcr.odm.locale_fallback%', + ]) + ->tag('kernel.event_subscriber'); +}; diff --git a/src/Resources/config/odm_multilang.xml b/src/Resources/config/odm_multilang.xml deleted file mode 100644 index 53e6d9eb..00000000 --- a/src/Resources/config/odm_multilang.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - %doctrine_phpcr.odm.locales% - %doctrine_phpcr.odm.default_locale% - - - - - - %doctrine_phpcr.odm.allowed_locales% - %doctrine_phpcr.odm.locale_fallback% - - - - diff --git a/src/Resources/config/phpcr.php b/src/Resources/config/phpcr.php new file mode 100644 index 00000000..c23f5f93 --- /dev/null +++ b/src/Resources/config/phpcr.php @@ -0,0 +1,65 @@ +services(); + $parameters = $container->parameters(); + + $services->set('doctrine_phpcr.session.event_manager', \Symfony\Bridge\Doctrine\ContainerAwareEventManager::class) + ->private() + ->abstract() + ->args([service('service_container')]); + + $services->set('doctrine_phpcr.logger.chain', \Jackalope\Transport\Logging\LoggerChain::class) + ->private() + ->abstract() + ->call('addLogger', [service('doctrine_phpcr.logger')]); + + $services->set('doctrine_phpcr.logger.profiling', \Jackalope\Transport\Logging\DebugStack::class) + ->private() + ->abstract(); + + $services->set('doctrine_phpcr.logger.stop_watch', \Doctrine\Bundle\PHPCRBundle\DataCollector\StopWatchLogger::class) + ->private() + ->abstract() + ->args([service('debug.stopwatch')->nullOnInvalid()]); + + $services->set('doctrine_phpcr.logger', \Jackalope\Transport\Logging\Psr3Logger::class) + ->private() + ->args([service('logger')->nullOnInvalid()]) + ->tag('monolog.logger', ['channel' => 'doctrine_phpcr']); + + $services->set('doctrine_phpcr.data_collector', \Doctrine\Bundle\PHPCRBundle\DataCollector\PHPCRDataCollector::class) + ->private() + ->args([service('doctrine_phpcr')]) + ->tag('data_collector', ['template' => '@DoctrinePHPCR/Collector/phpcr', 'id' => 'phpcr', 'priority' => 247]); + + $services->set('doctrine_phpcr.credentials', \PHPCR\SimpleCredentials::class) + ->private() + ->args([ + '', + '', + ]); + + $services->set('doctrine_phpcr', \Doctrine\Bundle\PHPCRBundle\ManagerRegistry::class) + ->public() + ->args([ + service('service_container'), + '%doctrine_phpcr.sessions%', + '%doctrine_phpcr.odm.document_managers%', + '%doctrine_phpcr.default_session%', + '%doctrine_phpcr.odm.default_document_manager%', + \Doctrine\Common\Proxy\Proxy::class, + ]); + + $services->set('form.type.phpcr.reference', \Doctrine\Bundle\PHPCRBundle\Form\Type\PHPCRReferenceType::class) + ->args([service('doctrine_phpcr.session')->nullOnInvalid()]) + ->tag('form.type', ['alias' => 'phpcr_reference']); + + $services->set('doctrine_phpcr.console_dumper', \PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper::class); + + $services->set('doctrine_phpcr.initializer_manager', \Doctrine\Bundle\PHPCRBundle\Initializer\InitializerManager::class) + ->public() + ->args([service('doctrine_phpcr')]); +}; diff --git a/src/Resources/config/phpcr.xml b/src/Resources/config/phpcr.xml deleted file mode 100644 index 60c12c91..00000000 --- a/src/Resources/config/phpcr.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %doctrine_phpcr.sessions% - %doctrine_phpcr.odm.document_managers% - %doctrine_phpcr.default_session% - %doctrine_phpcr.odm.default_document_manager% - Doctrine\Common\Proxy\Proxy - - - - - - - - - - - - - - - - diff --git a/tests/Fixtures/App/config/routes/web_profiler_sf8.yaml b/tests/Fixtures/App/config/routes/web_profiler_sf8.yaml new file mode 100644 index 00000000..f64ec5bd --- /dev/null +++ b/tests/Fixtures/App/config/routes/web_profiler_sf8.yaml @@ -0,0 +1,7 @@ +web_profiler_wdt: + resource: '@WebProfilerBundle/Resources/config/routing/wdt.php' + prefix: /_wdt + +web_profiler_profiler: + resource: '@WebProfilerBundle/Resources/config/routing/profiler.php' + prefix: /_profiler diff --git a/tests/Fixtures/App/config/routing.php b/tests/Fixtures/App/config/routing.php index 3d19578b..960d6715 100644 --- a/tests/Fixtures/App/config/routing.php +++ b/tests/Fixtures/App/config/routing.php @@ -5,11 +5,15 @@ $collection = new RouteCollection(); $collection->addCollection( - $loader->import(__DIR__.'/routes/web_profiler.yaml') + $loader->import( + \file_exists(__DIR__.'/../../../../vendor/symfony/web-profiler-bundle/Resources/config/routing/wdt.php') + ? __DIR__.'/routes/web_profiler_sf8.yaml' + : __DIR__.'/routes/web_profiler.yaml' + ), ); $collection->addCollection( - $loader->import(__DIR__.'/routes/routes.yaml') + $loader->import(__DIR__.'/routes/routes.yaml'), ); return $collection;