Skip to content

Commit

Permalink
Merge pull request #7 from cleverage/fix-extension
Browse files Browse the repository at this point in the history
fix extension
  • Loading branch information
plesigne authored Dec 3, 2020
2 parents 19b022a + e165795 commit 4897e0a
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 4 deletions.
9 changes: 8 additions & 1 deletion DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@ public function __construct(array $bundles)
public function getConfigTreeBuilder()
{
$treeBuilder = new TreeBuilder('cleverage_settings');
$rootNode = $treeBuilder->getRootNode();
//$rootNode = $treeBuilder->getRootNode();

if (method_exists($treeBuilder, 'getRootNode')) {
$rootNode = $treeBuilder->getRootNode();
} else {
// BC layer for symfony/config 4.1 and older
$rootNode = $treeBuilder->root('cleverage_settings');
}

$rootNode
->addDefaultsIfNotSet()
Expand Down
5 changes: 5 additions & 0 deletions DependencyInjection/EzplatformSettingsExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,9 @@ public function getConfiguration(array $config, ContainerBuilder $container)

return new Configuration(array_keys($bundles));
}

public function getAlias()
{
return 'cleverage_settings';
}
}
12 changes: 11 additions & 1 deletion SettingsBundle.php → EzplatformSettingsBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

namespace Ezplatform\SettingsBundle;

use Ezplatform\SettingsBundle\DependencyInjection\EzplatformSettingsExtension;
use Ezplatform\SettingsBundle\DependencyInjection\Security\PolicyProvider;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Bundle\Bundle;

class SettingsBundle extends Bundle
class EzplatformSettingsBundle extends Bundle
{

/**
Expand All @@ -24,4 +25,13 @@ public function build(ContainerBuilder $container)
$eZExtension->addPolicyProvider(new PolicyProvider());
}

public function getContainerExtension()
{
if (null === $this->extension) {
$this->extension = new EzplatformSettingsExtension();
}

return $this->extension;
}

}
10 changes: 10 additions & 0 deletions Resources/schema/create-3.3.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
CREATE TABLE `cleverage_settings` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`identifier` varchar(255) NOT NULL DEFAULT '',
`value` TEXT NOT NULL,
`updatedAt` DATETIME NOT NULL,
`updatedBy` TEXT NOT NULL,
`scope` varchar(255) NOT NULL DEFAULT 'default',
PRIMARY KEY (`id`),
UNIQUE KEY `identifier_scope` (`identifier`,`scope`)
) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
4 changes: 2 additions & 2 deletions Resources/schema/udpate-2.5-3.0.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ALTER TABLE cleverage_settings
ALTER TABLE masev_settings
ADD updatedAt DATETIME;

ALTER TABLE cleverage_settings
ALTER TABLE masev_settings
ADD updatedBy VARCHAR(100);

0 comments on commit 4897e0a

Please sign in to comment.