Skip to content
Merged
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
8 changes: 6 additions & 2 deletions Service/ConfigurationManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,17 @@ public function addConfiguration($name, Configuration $configuration)
*
* @return null|Configuration
*/
public function getConfiguration($name = 'default')
public function getConfiguration($name = null)
{
if (empty($name)) {
return $this->getConfiguration('default');
}

if (isset($this->configuration[$name])) {
return $this->configuration[$name];
}

if ($name === 'default' || empty($name)) {
if ($name === 'default') {
$name = $this->getFirstName();
if (isset($this->configuration[$name])) {
return $this->configuration[$name];
Expand Down
6 changes: 3 additions & 3 deletions Tests/Unit/Model/ConfigurationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
{
public function testAccessors()
{
$key2Function = $this->getDefaultData();
$key2Function = self::getDefaultData();
$conf = new Configuration($key2Function);

foreach ($key2Function as $key => $value) {
Expand All @@ -31,7 +31,7 @@ public function testAccessors()

public function testGetPathsToTranslationFiles()
{
$data = $this->getDefaultData();
$data = self::getDefaultData();
$data['external_translations_dirs'] = ['foo', 'bar'];
$data['output_dir'] = 'biz';

Expand All @@ -43,7 +43,7 @@ public function testGetPathsToTranslationFiles()
/**
* @return array
*/
private function getDefaultData()
public static function getDefaultData()
{
return [
'name' => 'getName',
Expand Down
97 changes: 97 additions & 0 deletions Tests/Unit/Service/ConfigurationManagerTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?php

/*
* This file is part of the PHP Translation package.
*
* (c) PHP Translation team <tobias.nyholm@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Translation\Bundle\Tests\Unit\Service;

use Translation\Bundle\Model\Configuration;
use Translation\Bundle\Service\ConfigurationManager;
use Translation\Bundle\Tests\Unit\Model\ConfigurationTest;

class ConfigurationManagerTest extends \PHPUnit_Framework_TestCase
{
public function testGetConfigurationFirst()
{
$manager = new ConfigurationManager();
$correctConfiguration = $this->createConfiguration(['name' => 'correct']);

$manager->addConfiguration('foo', $correctConfiguration);
$manager->addConfiguration('bar', $this->createConfiguration());

$this->assertEquals($correctConfiguration, $manager->getConfiguration());
$this->assertEquals($correctConfiguration, $manager->getConfiguration('default'));
}

public function testGetConfigurationDefault()
{
$manager = new ConfigurationManager();
$correctConfiguration = $this->createConfiguration(['name' => 'correct']);

$manager->addConfiguration('bar', $this->createConfiguration());
$manager->addConfiguration('default', $correctConfiguration);

$this->assertEquals($correctConfiguration, $manager->getConfiguration());
$this->assertEquals($correctConfiguration, $manager->getConfiguration('default'));
$this->assertEquals($correctConfiguration, $manager->getConfiguration(''));
$this->assertEquals($correctConfiguration, $manager->getConfiguration(null));
}

public function testGetConfigurationMissing()
{
$manager = new ConfigurationManager();
$correctConfiguration = $this->createConfiguration(['name' => 'correct']);

$manager->addConfiguration('bar', $this->createConfiguration());
$manager->addConfiguration('default', $correctConfiguration);

$this->assertNull($manager->getConfiguration('missing'));
}

public function testFirstName()
{
$manager = new ConfigurationManager();
$manager->addConfiguration('foo', $this->createConfiguration());
$manager->addConfiguration('bar', $this->createConfiguration());

$this->assertEquals('foo', $manager->getFirstName());
}

public function testFirstNameEmpty()
{
$manager = new ConfigurationManager();

$this->assertNull($manager->getFirstName());
}

public function testGetNames()
{
$manager = new ConfigurationManager();
$manager->addConfiguration('foo', $this->createConfiguration());
$manager->addConfiguration('bar', $this->createConfiguration());

$names = $manager->getNames();
$this->assertEquals(['foo', 'bar'], $names);
}

public function testGetNamesEmpty()
{
$manager = new ConfigurationManager();

$names = $manager->getNames();
$this->assertEquals([], $names);
}

private function createConfiguration($data = [])
{
$default = ConfigurationTest::getDefaultData();

return new Configuration(array_merge($default, $data));
}
}