Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/DependencyInjection/DoctrinePHPCRExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -35,7 +35,7 @@ final class DoctrinePHPCRExtension extends AbstractDoctrineExtension
*/
private array $sessions = [];

private XmlFileLoader $loader;
private PhpFileLoader $loader;

private bool $disableProxyWarmer = false;

Expand All @@ -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.
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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'));

Expand Down Expand Up @@ -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)) {
Expand Down
65 changes: 65 additions & 0 deletions src/Resources/config/commands.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->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');
};
65 changes: 0 additions & 65 deletions src/Resources/config/commands.xml

This file was deleted.

33 changes: 33 additions & 0 deletions src/Resources/config/jackalope.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->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);

Check failure on line 21 in src/Resources/config/jackalope.php

View workflow job for this annotation

GitHub Actions / PHPStan

Class Jackalope\RepositoryFactoryPrismic not found.

$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([
'',
'',
]);
};
51 changes: 0 additions & 51 deletions src/Resources/config/jackalope.xml

This file was deleted.

11 changes: 11 additions & 0 deletions src/Resources/config/jackalope_doctrine_dbal-commands.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();

$services->set(\Doctrine\Bundle\PHPCRBundle\OptionalCommand\InitDoctrineDbalCommand::class, \Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\InitDoctrineDbalCommand::class)

Check failure on line 9 in src/Resources/config/jackalope_doctrine_dbal-commands.php

View workflow job for this annotation

GitHub Actions / PHPStan

Class Doctrine\Bundle\PHPCRBundle\OptionalCommand\InitDoctrineDbalCommand not found.
->tag('console.command');
};
13 changes: 0 additions & 13 deletions src/Resources/config/jackalope_doctrine_dbal-commands.xml

This file was deleted.

20 changes: 20 additions & 0 deletions src/Resources/config/jackalope_doctrine_dbal.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->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'),
]);
};
25 changes: 0 additions & 25 deletions src/Resources/config/jackalope_doctrine_dbal.xml

This file was deleted.

15 changes: 15 additions & 0 deletions src/Resources/config/jackrabbit-commands.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();

$services->set(\Doctrine\Bundle\PHPCRBundle\OptionalCommand\JackrabbitCommand::class, \Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\JackrabbitCommand::class)

Check failure on line 9 in src/Resources/config/jackrabbit-commands.php

View workflow job for this annotation

GitHub Actions / PHPStan

Class Doctrine\Bundle\PHPCRBundle\OptionalCommand\JackrabbitCommand not found.
->args([
'%doctrine_phpcr.jackrabbit_jar%',
'%doctrine_phpcr.workspace_dir%',
])
->tag('console.command');
};
15 changes: 0 additions & 15 deletions src/Resources/config/jackrabbit-commands.xml

This file was deleted.

Loading
Loading