Skip to content

Made PHPCR initializer independent, creating all route_basepaths #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 17, 2015
Merged

Made PHPCR initializer independent, creating all route_basepaths #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cd3e6c
Made PHPCR initializer independent from Sonata-related setting, creat…
pamil Dec 3, 2015
49e6cb1
[Travis] Disabled XDebug
pamil Dec 3, 2015
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
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ matrix:

before_install:
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
- phpenv config-rm xdebug.ini || true

- composer self-update
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update

Expand Down
34 changes: 32 additions & 2 deletions DependencyInjection/CmfRoutingExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ private function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuil
if ($config['use_sonata_admin']) {
$this->loadSonataPhpcrAdmin($config, $loader, $container);
}

if ($config['enable_initializer']) {
$this->loadInitializer($config, $loader, $container);
}
}

private function loadSonataPhpcrAdmin($config, XmlFileLoader $loader, ContainerBuilder $container)
Expand All @@ -236,10 +240,36 @@ private function loadSonataPhpcrAdmin($config, XmlFileLoader $loader, ContainerB

$basePath = $config['admin_basepath'] ?: reset($config['route_basepaths']);
$container->setParameter('cmf_routing.dynamic.persistence.phpcr.admin_basepath', $basePath);
}

if ($config['enable_initializer']) {
$loader->load('initializer-phpcr.xml');
/**
* @param array $config
* @param XmlFileLoader $loader
* @param ContainerBuilder $container
*/
private function loadInitializer($config, XmlFileLoader $loader, ContainerBuilder $container)
{
$adminBasepathParameter = $this->getAlias().'.dynamic.persistence.phpcr.admin_basepath';

$initializedBasepaths = array();
if ($container->hasParameter($adminBasepathParameter)) {
$initializedBasepaths = array($container->getParameter($adminBasepathParameter));
}

if ('auto' === $config['enable_initializer'] && empty($initializedBasepaths)) {
return;
}

if (true === $config['enable_initializer'] && empty($initializedBasepaths)) {
$initializedBasepaths = $container->getParameter($this->getAlias().'.dynamic.persistence.phpcr.route_basepaths');
}

$container->setParameter(
$this->getAlias().'.dynamic.persistence.phpcr.initialized_basepaths',
$initializedBasepaths
);

$loader->load('initializer-phpcr.xml');
}

private function loadOrmProvider($config, XmlFileLoader $loader, ContainerBuilder $container, $matchImplicitLocale)
Expand Down
22 changes: 20 additions & 2 deletions DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,26 @@ private function addDynamicSection(ArrayNodeDefinition $root)
->end()
->values(array(true, false, 'auto'))
->defaultValue('auto')
->end() // use_sonata_admin
->booleanNode('enable_initializer')->defaultTrue()->end()
->end()
->enumNode('enable_initializer')
->beforeNormalization()
->ifString()
->then(function ($v) {
switch ($v) {
case 'true':
return true;

case 'false':
return false;

default:
return $v;
}
})
->end()
->values(array(true, false, 'auto'))
->defaultValue('auto')
->end()
->end()
->end() // phpcr
->arrayNode('orm')
Expand Down
4 changes: 1 addition & 3 deletions Resources/config/initializer-phpcr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@

<service id="cmf_routing.initializer" class="Doctrine\Bundle\PHPCRBundle\Initializer\GenericInitializer">
<argument>CmfRoutingBundle</argument>
<argument type="collection">
<argument>%cmf_routing.dynamic.persistence.phpcr.admin_basepath%</argument>
</argument>
<argument>%cmf_routing.dynamic.persistence.phpcr.initialized_basepaths%</argument>
<tag name="doctrine_phpcr.initializer"/>
</service>

Expand Down
49 changes: 46 additions & 3 deletions Tests/Unit/DependencyInjection/CmfRoutingExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ public function testInitializerDisabled()
'kernel.bundles',
array(
'CmfRoutingBundle' => true,
'SonataDoctrinePHPCRAdminBundle' => true,
)
);

Expand All @@ -310,7 +309,6 @@ public function testInitializerDisabled()
'persistence' => array(
'phpcr' => array(
'enabled' => true,
'use_sonata_admin' => true,
'enable_initializer' => false,
),
),
Expand All @@ -320,7 +318,7 @@ public function testInitializerDisabled()
$this->assertFalse($this->container->has('cmf_routing.initializer'));
}

public function testInitializerDisabledWithoutSonata()
public function testInitializerEnabledEvenWithoutSonata()
{
$this->load(array(
'dynamic' => array(
Expand All @@ -329,11 +327,56 @@ public function testInitializerDisabledWithoutSonata()
'phpcr' => array(
'enabled' => true,
'use_sonata_admin' => false,
'enable_initializer' => true,
),
),
),
));

$this->assertTrue($this->container->has('cmf_routing.initializer'));
}

public function testInitializerEnabledAutomaticallyIfSonataIsEnabled()
{
$this->container->setParameter(
'kernel.bundles',
array(
'CmfRoutingBundle' => true,
'SonataDoctrinePHPCRAdminBundle' => true,
)
);

$this->load(array(
'dynamic' => array(
'enabled' => true,
'persistence' => array(
'phpcr' => array(
'enabled' => true,
'use_sonata_admin' => true,
'enable_initializer' => 'auto',
),
),
),
));

$this->assertTrue($this->container->has('cmf_routing.initializer'));
}

public function testInitializerDisabledAutomaticallyIfSonataIsDisabled()
{
$this->load(array(
'dynamic' => array(
'enabled' => true,
'persistence' => array(
'phpcr' => array(
'enabled' => true,
'use_sonata_admin' => false,
'enable_initializer' => 'auto',
),
),
),
));

$this->assertFalse($this->container->has('cmf_routing.initializer'));
}
}