You've already forked redmine-bundle
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 656deb2a26 | |||
| ecb3a36f48 | |||
| 8948ddf01b |
@@ -14,7 +14,7 @@ final class Configuration implements ConfigurationInterface
|
|||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder('magdev_redmine');
|
$treeBuilder = new TreeBuilder('magdev_redmine');
|
||||||
$rootNode = $treeBuilder->getRootNode();
|
$rootNode = $treeBuilder->getRootNode();
|
||||||
$rootNode->fixXmlConfig('connections')
|
$rootNode->fixXmlConfig('connection')
|
||||||
->children()
|
->children()
|
||||||
->arrayNode('connections')
|
->arrayNode('connections')
|
||||||
->useAttributeAsKey('name')
|
->useAttributeAsKey('name')
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ final class MagdevRedmineExtension extends Extension
|
|||||||
foreach ($config['connections'] as $name => $connection) {
|
foreach ($config['connections'] as $name => $connection) {
|
||||||
$id = sprintf('magdev.redmine.%s', $name);
|
$id = sprintf('magdev.redmine.%s', $name);
|
||||||
$container->register($id, NativeCurlClient::class)
|
$container->register($id, NativeCurlClient::class)
|
||||||
->setArguments([$connection['baseurl'], $connection['apikey']]);
|
->setArguments([$connection['url'], $connection['apikey']]);
|
||||||
$container->registerAliasForArgument($id, NativeCurlClient::class, "{$name}Client");
|
$container->registerAliasForArgument($id, NativeCurlClient::class, "{$name}Client");
|
||||||
|
|
||||||
if ($name === $config['default_connection']) {
|
if ($name === $config['default_connection']) {
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ class ConfigurationTest extends TestCase
|
|||||||
public function testConfig(array $configs): void
|
public function testConfig(array $configs): void
|
||||||
{
|
{
|
||||||
$config = (new Processor())->processConfiguration(new Configuration(), $configs);
|
$config = (new Processor())->processConfiguration(new Configuration(), $configs);
|
||||||
$this->assertSame('foo', $config['connections']['default']['token']);
|
$this->assertSame('foo', $config['connections']['default']['apikey']);
|
||||||
$this->assertSame('bar', $config['connections']['default']['baseurl']);
|
$this->assertSame('bar', $config['connections']['default']['url']);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configsProvider(): iterable
|
public function configsProvider(): iterable
|
||||||
@@ -28,8 +28,8 @@ class ConfigurationTest extends TestCase
|
|||||||
'magdev_redmine' => [
|
'magdev_redmine' => [
|
||||||
'connections' => [
|
'connections' => [
|
||||||
'default' => [
|
'default' => [
|
||||||
'token' => 'foo',
|
'apikey' => 'foo',
|
||||||
'baseurl' => 'bar'
|
'url' => 'bar'
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ namespace Magdev\RedmineBundle\Tests\DependencyInjection;
|
|||||||
|
|
||||||
use Magdev\RedmineBundle\DependencyInjection\MagdevRedmineExtension;
|
use Magdev\RedmineBundle\DependencyInjection\MagdevRedmineExtension;
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
|
use Redmine\Client\NativeCurlClient;
|
||||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -18,8 +19,8 @@ class MagdevRedmineExtensionTest extends TestCase
|
|||||||
(new MagdevRedmineExtension())->load([
|
(new MagdevRedmineExtension())->load([
|
||||||
'magdev_redmine' => [
|
'magdev_redmine' => [
|
||||||
'connections' => [
|
'connections' => [
|
||||||
'primary' => ['baseurl' => 'http://foo1', 'token' => 'bar1'],
|
'primary' => ['url' => 'http://foo1', 'apikey' => 'bar1'],
|
||||||
'secondary' => ['baseurl' => 'http://foo2', 'token' => 'bar2'],
|
'secondary' => ['url' => 'http://foo2', 'apikey' => 'bar2'],
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
], $container);
|
], $container);
|
||||||
@@ -27,11 +28,11 @@ class MagdevRedmineExtensionTest extends TestCase
|
|||||||
$this->assertTrue($container->has('magdev.redmine.primary'));
|
$this->assertTrue($container->has('magdev.redmine.primary'));
|
||||||
$this->assertTrue($container->has('magdev.redmine.secondary'));
|
$this->assertTrue($container->has('magdev.redmine.secondary'));
|
||||||
|
|
||||||
$this->assertTrue($container->hasAlias(Client::class));
|
$this->assertTrue($container->hasAlias(NativeCurlClient::class));
|
||||||
$this->assertTrue($container->hasAlias(Client::class.' $primaryClient'));
|
$this->assertTrue($container->hasAlias(NativeCurlClient::class.' $primaryClient'));
|
||||||
$this->assertTrue($container->hasAlias(Client::class.' $secondaryClient'));
|
$this->assertTrue($container->hasAlias(NativeCurlClient::class.' $secondaryClient'));
|
||||||
|
|
||||||
$this->assertInstanceOf(Client::class, $container->get('magdev.redmine.primary'));
|
$this->assertInstanceOf(NativeCurlClient::class, $container->get('magdev.redmine.primary'));
|
||||||
$this->assertInstanceOf(Client::class, $container->get('magdev.redmine.secondary'));
|
$this->assertInstanceOf(NativeCurlClient::class, $container->get('magdev.redmine.secondary'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user